ready to test

2022-11-01 09:17:24 +03:00
parent 6e81a419fb
commit 591c92b4bb
10 changed files with 61 additions and 29 deletions
--- a/libs/main/io_utils/piconnection.cpp
+++ b/libs/main/io_utils/piconnection.cpp
@@ -1114,7 +1114,10 @@ PIVector<PIIODevice * > PIConnection::DevicePool::boundedDevices(const PIConnect

 PIConnection::DevicePool::DeviceData::~DeviceData() {
 	if (rthread) {
-		rthread->terminate();
+		rthread->stop();
+		rthread->interrupt();
+		if (!rthread->waitForFinish(1000))
+			rthread->terminate();
 		delete rthread;
 		rthread = nullptr;
 	}
@@ -1146,8 +1149,13 @@ void __DevicePool_threadReadDP(void * ddp) {
 	}
 	if (dev->isClosed()) {
 		if (!dev->open()) {
-			piMSleep(dev->reopenTimeout());
-			return;
+			PITimeMeasurer tm;
+			int timeout = dev->reopenTimeout();
+			while (tm.elapsed_m() < timeout) {
+				if (dd->rthread->isStopping())
+					return;
+				piMSleep(50);
+			}
 		}
 	}
 	PIByteArray ba;