new PIClientServer::ClientBase::stopAndWait() method for blocking stop read.

PIClientServer::ClientBase::close() now non-blocking

libs/client_server/piclientserver_client.cpp

@@ -41,6 +41,7 @@ PIClientServer::Client::Client() {
 PIClientServer::Client::~Client() {
 	if (tcp) tcp->setDebug(false);
 	close();
+	stopAndWait();
 }
 
 

libs/client_server/piclientserver_client_base.cpp

@@ -27,6 +27,7 @@ PIClientServer::ClientBase::ClientBase() {}
 
 PIClientServer::ClientBase::~ClientBase() {
 	close();
+	stopAndWait();
 	if (own_tcp) piDeleteSafety(tcp);
 }
 
@@ -34,7 +35,13 @@ PIClientServer::ClientBase::~ClientBase() {
 void PIClientServer::ClientBase::close() {
 	if (!tcp) return;
 	can_write = false;
-	tcp->interrupt();
+	tcp->stop();
+	stream.clear();
+}
+
+
+void PIClientServer::ClientBase::stopAndWait() {
+	if (!tcp) return;
 	tcp->stopAndWait(10_s);
 	if (tcp->isThreadedRead()) tcp->terminateThreadedRead();
 	tcp->close();

libs/main/client_server/piclientserver_client_base.h

@@ -47,6 +47,7 @@ public:
 	const PIEthernet * getTCP() const { return tcp; }
 
 	void close();
+	void stopAndWait();
 
 	int write(const void * d, const size_t s);
 	int write(const PIByteArray & ba) { return write(ba.data(), ba.size()); }