picloud revert to condvars and fix

libs/cloud/picloudclient.cpp

@@ -24,16 +24,16 @@
 PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), PICloudBase() {
 	tcp.setRole(PICloud::TCP::Client);
 	setName("cloud_client");
-	is_connected = is_connecting = false;
+	is_connected = false;
 	CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();});
 	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
 	CONNECTL(&eth, disconnected, [this](bool){
-		//piCoutObj << "eth.disconnected";
-		bool ned = is_connected;
-		opened_ = is_connected = false;
-		notifyBuffer();
-		if (ned)
-			disconnected();
+//		piCoutObj << "disconnected";
+		opened_ = false;
+		is_connected = false;
+		cond_connect.notifyOne();
+		cond_buff.notifyOne();
+		piMSleep(100);
 	});
 }
 
@@ -41,10 +41,11 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
 PICloudClient::~PICloudClient() {
 	eth.close();
 	if (is_connected) {
-		disconnected();
 		is_connected = false;
+		disconnected();
+		cond_buff.notifyOne();
+		cond_connect.notifyOne();
 	}
-	notifyBuffer();
 	close();
 	stop();
 }
@@ -62,26 +63,20 @@ void PICloudClient::setKeepConnection(bool on) {
 
 
 bool PICloudClient::openDevice() {
-	if (isOpened()) return true;
+//	piCout << "PICloudClient open device" << path();
 	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
 	if (op) {
+		mutex_buff.lock();
 		eth.startThreadedRead();
-		is_connecting = true;
-		PITimeMeasurer tm;
-		while (tm.elapsed_m() < (int)eth.readTimeout()) {
-			if (isConnected()) break;
-			if (!is_connecting) return false;
-			piMSleep(PIP_MIN_MSLEEP);
-		}
-		is_connecting = false;
-		bool conn_ok = isConnected();
-		//piCoutObj << "conn_ok" << conn_ok;
+		bool conn_ok = cond_connect.waitFor(mutex_buff, (int)eth.readTimeout());
+//		piCoutObj << "conn_ok" << conn_ok;
+		mutex_buff.unlock();
 		if (!conn_ok) {
 			eth.stop();
 			eth.close();
-			//piMSleep(100);
+			piMSleep(100);
 		}
-		return conn_ok;
+		return isConnected();
 	} else {
 		eth.close();
 		return false;
@@ -90,26 +85,27 @@ bool PICloudClient::openDevice() {
 
 
 bool PICloudClient::closeDevice() {
-	eth.stop();
 	PIThread::stop(false);
-	if (is_connected)
+	if (is_connected) {
+		is_connected = false;
 		disconnected();
-	is_connected = is_connecting = false;
-	notifyBuffer();
-	waitForFinish(1000);
-	if (eth.isOpened())
-		eth.close();
+		cond_buff.notifyOne();
+		cond_connect.notifyOne();
+	}
+	eth.stop();
+	if (eth.isOpened()) eth.close();
 	return true;
 }
 
 
 int PICloudClient::readDevice(void * read_to, int max_size) {
-	//piCoutObj << "readDevice";
+//	piCoutObj << "readDevice";
 	if (!is_connected) return -1;
+	int sz = -1;
 	mutex_buff.lock();
 	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
-	int sz = piMini(max_size, buff.size());
-	if (sz > 0) {
+	if (is_connected) {
+		sz = piMini(max_size, buff.size());
 		memcpy(read_to, buff.data(), sz);
 		buff.remove(0, sz);
 	}
@@ -119,18 +115,11 @@ int PICloudClient::readDevice(void * read_to, int max_size) {
 
 
 int PICloudClient::writeDevice(const void * data, int size) {
-	//piCoutObj << "writeDevice";
+//	piCoutObj << "writeDevice";
 	return tcp.sendData(PIByteArray(data, size));
 }
 
 
-void PICloudClient::notifyBuffer() {
-	mutex_buff.lock();
-	cond_buff.notifyOne();
-	mutex_buff.unlock();
-}
-
-
 void PICloudClient::_readed(PIByteArray & ba) {
 	mutex_buff.lock();
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
@@ -140,13 +129,14 @@ void PICloudClient::_readed(PIByteArray & ba) {
 			if (tcp.parseConnect(ba) == 1) {
 				is_connected = true;
 				connected();
+				cond_connect.notifyOne();
 			}
 		break;
 		case PICloud::TCP::Disconnect:
-			//piCoutObj << "TCP::Disconnect ...";
+			is_connected = false;
 			static_cast<PIThread*>(&eth)->stop();
 			eth.close();
-			//piCoutObj << "TCP::Disconnect ok";
+			disconnected();
 		break;
 		case PICloud::TCP::Data:
 			if (is_connected) {