some fixes for picloud, but still not working correctly

libs/cloud/picloudclient.cpp

@@ -33,22 +33,22 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
 		if (is_deleted) return;
 		bool need_disconn = is_connected;
 		//piCoutObj << "eth disconnected";
-		eth.softStopThreadedRead();
+		eth.stop();
 		opened_ = false;
 		internalDisconnect();
-		if (need_disconn)
-			disconnected();
+		if (need_disconn) disconnected();
 		//piCoutObj << "eth disconnected done";
 	});
 }
 
 
 PICloudClient::~PICloudClient() {
-	//piCoutObj << "~PICloudClient()";
+	piCoutObj << "~PICloudClient() ..." << this;
+	is_deleted = true;
 	stopAndWait();
 	close();
-	is_deleted = true;
 	internalDisconnect();
+	piCoutObj << "~PICloudClient() done" << this;
 }
 
 
@@ -70,14 +70,14 @@ void PICloudClient::interrupt() {
 
 
 bool PICloudClient::openDevice() {
-	//piCoutObj << "open";// << path();
+	piCoutObj << "open";// << path();
 	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
 	if (op) {
 		mutex_connect.lock();
 		eth.startThreadedRead();
-		//piCoutObj << "connecting...";
+		piCoutObj << "connecting...";
 		bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout());
-		//piCoutObj << "conn_ok" << conn_ok << is_connected;
+		piCoutObj << "conn_ok" << conn_ok << is_connected;
 		mutex_connect.unlock();
 		if (!conn_ok) {
 			mutex_connect.lock();
@@ -105,36 +105,37 @@ bool PICloudClient::closeDevice() {
 
 
 ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) {
-	if (is_deleted) return -1;
-	//piCoutObj << "readDevice";
+	if (is_deleted || max_size <= 0) return -1;
+	piCoutObj << "readDevice ...";
 	if (!is_connected && eth.isClosed()) openDevice();
 	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff);
 	if (is_connected) {
 		if (buff.isEmpty()) {
 			sz = 0;
 		} else {
-			sz = piMini(max_size, buff.size());
+			sz = piMin<ssize_t>(max_size, buff.size_s());
 			memcpy(read_to, buff.data(), sz);
 			buff.remove(0, sz);
 		}
+		if (sz == 0) cond_buff.wait(mutex_buff);
 	}
 	mutex_buff.unlock();
 	if (!is_connected) opened_ = false;
-	//piCoutObj << "readDevice done" << sz;
+	piCoutObj << "readDevice done" << sz;
 	return sz;
 }
 
 
 ssize_t PICloudClient::writeDevice(const void * data, ssize_t size) {
 	if (is_deleted) return -1;
-//	piCoutObj << "writeDevice";
+	piCoutObj << "writeDevice" << size;
 	return tcp.sendData(PIByteArray(data, size));
 }
 
 
 void PICloudClient::internalDisconnect() {
+	piCoutObj << "internalDisconnect";
 	is_connected = false;
 	cond_buff.notifyOne();
 	cond_connect.notifyOne();
@@ -146,7 +147,7 @@ void PICloudClient::internalDisconnect() {
 void PICloudClient::_readed(PIByteArray & ba) {
 	if (is_deleted) return;
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
-	//piCoutObj << "_readed" << ba.size() << hdr.first << hdr.second;
+	piCoutObj << "_readed" << ba.size() << hdr.first << hdr.second;
 	if (hdr.second == tcp.role()) {
 		switch (hdr.first) {
 		case PICloud::TCP::Connect:
@@ -159,7 +160,7 @@ void PICloudClient::_readed(PIByteArray & ba) {
 			}
 		break;
 		case PICloud::TCP::Disconnect:
-			eth.softStopThreadedRead();
+			eth.stop();
 			opened_ = false;
 			eth.close();
 		break;
@@ -177,5 +178,5 @@ void PICloudClient::_readed(PIByteArray & ba) {
 		//piCoutObj << "readed" << ba.toHex();
 	}
 	while (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad
-	//piCoutObj << "_readed done";
+	piCoutObj << "_readed done";
 }

libs/cloud/picloudserver.cpp

@@ -26,11 +26,10 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
 	tcp.setServerName(server_name);
 	setName("cloud_server__" + server_name);
 	CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
-	CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();});
+	CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected" << &eth; tcp.sendStart();});
 	CONNECTL(&eth, disconnected, [this](bool){
-		piCoutObj << "disconnected";
-		eth.softStopThreadedRead();
-		eth.interrupt();
+		piCoutObj << "disconnected" << &eth;
+		eth.stop();
 		opened_ = false;
 		ping_timer.stop(false);
 		piMSleep(100);
@@ -42,8 +41,10 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
 
 
 PICloudServer::~PICloudServer() {
+	piCoutObj << "~PICloudServer ..." << this;
 	stopAndWait();
 	close();
+	piCoutObj << "~PICloudServer done" << this;
 }
 
 
@@ -60,7 +61,7 @@ PIVector<PICloudServer::Client *> PICloudServer::clients() const {
 
 
 bool PICloudServer::openDevice() {
-	//piCout << "PICloudServer open device" << path();
+	piCout << "PICloudServer open device" << path();
 	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
 	if (op) {
 		eth.startThreadedRead();
@@ -74,17 +75,19 @@ bool PICloudServer::openDevice() {
 
 
 bool PICloudServer::closeDevice() {
-	eth.stop();
+	piCoutObj << "closeDevice" << this;
+	eth.stopAndWait();
 	ping_timer.stop(false);
 	clients_mutex.lock();
 	for (auto c : clients_) {
+		c->stopAndWait();
 		c->close();
-		c->stop();
 	}
 	clients_mutex.unlock();
 	eth.close();
-	for (auto c : clients_)
+	for (auto c : clients_) {
 		delete c;
+	}
 	return true;
 }
 
@@ -126,12 +129,10 @@ PICloudServer::Client::Client(PICloudServer * srv, uint id) : server(srv), clien
 
 
 PICloudServer::Client::~Client() {
-	if (is_connected) {
-		is_connected = false;
-		cond_buff.notifyOne();
-	}
-	stopAndWait();
+	piCoutObj << "~PICloudServer::Client..." << this;
 	close();
+	stopAndWait();
+	piCoutObj << "~PICloudServer::Client done" << this;
 }
 
 
@@ -141,6 +142,7 @@ bool PICloudServer::Client::openDevice() {
 
 
 bool PICloudServer::Client::closeDevice() {
+	piCoutObj << "closeDevice" << this;
 	if (is_connected) {
 		server->clientDisconnect(client_id);
 		is_connected = false;
@@ -154,7 +156,6 @@ ssize_t PICloudServer::Client::readDevice(void * read_to, ssize_t max_size) {
 	if (!is_connected) return -1;
 	ssize_t sz = -1;
 	mutex_buff.lock();
-	cond_buff.wait(mutex_buff);
 	if (is_connected) {
 		if (buff.isEmpty()) {
 			sz = 0;
@@ -163,6 +164,7 @@ ssize_t PICloudServer::Client::readDevice(void * read_to, ssize_t max_size) {
 			memcpy(read_to, buff.data(), sz);
 			buff.remove(0, sz);
 		}
+		if (sz == 0) cond_buff.wait(mutex_buff);
 	}
 	mutex_buff.unlock();
 	return sz;
@@ -201,8 +203,8 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			if (oc) {
 				tcp.sendDisconnected(id);
 			} else {
-				//piCoutObj << "new Client" << id;
 				Client * c = new Client(this, id);
+				piCoutObj << "new Client" << id << c;
 				CONNECT1(void, PIObject *, c, deleted, this, clientDeleted);
 				clients_mutex.lock();
 				clients_ << c;
@@ -213,13 +215,14 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			} break;
 		case PICloud::TCP::Disconnect: {
 			uint id = tcp.parseDisconnect(ba);
-			//piCoutObj << "remove Client" << id;
+			piCoutObj << "remove Client" << id;
 			clients_mutex.lock();
 			Client * oc = index_clients.value(id, nullptr);
 			clients_mutex.unlock();
 			if (oc) {
-				oc->is_connected = false;
-				oc->close();
+				//oc->is_connected = false;
+				//oc->close();
+				delete oc;
 			}
 			} break;
 		case PICloud::TCP::Data: {
@@ -227,7 +230,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			clients_mutex.lock();
 			Client * oc = index_clients.value(d.first, nullptr);
 			clients_mutex.unlock();
-			//piCoutObj << "data for" << d.first << d.second.toHex();
+			piCoutObj << "data for" << d.first << d.second.size();
 			if (oc && !d.second.isEmpty()) oc->pushBuffer(d.second);
 			} break;
 		default: break;
@@ -238,6 +241,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
 
 void PICloudServer::clientDeleted(PIObject * o) {
 	PICloudServer::Client * c = (PICloudServer::Client*)o;
+	piCoutObj << "clientDeleted" << c;
 	clients_mutex.lock();
 	clients_.removeOne(c);
 	auto it = index_clients.makeIterator();

libs/main/io_devices/piiodevice.cpp

@@ -637,7 +637,3 @@ void PIIODevice::configureFromVariantDevice(const PIPropertyStorage & d) {
 }
 
 
-void PIIODevice::softStopThreadedRead() {
-	read_thread.stop();
-}
-

libs/main/io_devices/piiodevice.h

@@ -390,8 +390,6 @@ public:
 	//! \~russian Пишет в устройство блок памяти "mb"
 	ssize_t write(const PIMemoryBlock & mb) {return write(mb.data(), mb.size());}
 
-	void softStopThreadedRead();
-
 	EVENT_VHANDLER(void, flush) {;}
 	
 	EVENT(opened);

libs/main/io_devices/piserial.cpp

@@ -827,7 +827,7 @@ ssize_t PISerial::readDevice(void * read_to, ssize_t max_size) {
 			return 0;
 		if (err == ERROR_BAD_COMMAND || err == ERROR_ACCESS_DENIED) {
 			piCoutObj << "read error" << (PRIVATE->readed) << errorString();
-			softStopThreadedRead();
+			stop();
 			close();
 			return 0;
 		}