Merge pull request 'cloud_debug' (#78) from cloud_debug into master

Reviewed-on: https://git.shs.tools/SHS/pip/pulls/78

libs/cloud/picloudclient.cpp

@@ -25,23 +25,35 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
 	tcp.setRole(PICloud::TCP::Client);
 	setName("cloud_client");
 	is_connected = false;
+	is_deleted = false;
+//	setReopenEnabled(false);
 	CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();});
 	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
 	CONNECTL(&eth, disconnected, [this](bool){
-//		piCoutObj << "disconnected";
+		if (is_deleted) return;
+		//piCoutObj << "eth disconnected";
+		static_cast<PIThread*>(&eth)->stop();
+		opened_ = false;
 		if (is_connected) disconnected();
 		internalDisconnect();
-		piMSleep(100);
+		//piCoutObj << "eth disconnected done";
 	});
 }
 
 
 PICloudClient::~PICloudClient() {
-	eth.close();
+	//piCoutObj << "~PICloudClient()";
+	PIThread::stop();
+	//eth.close();
 	if (is_connected) disconnected();
-	internalDisconnect();
+	is_connected = false;
 	close();
-	stop();
+	//piCoutObj << "~PICloudClient() closed";
+	internalDisconnect();
+//	stop(false);
+	is_deleted = true;
+	internalDisconnect();
+	//piCoutObj << "~PICloudClient() done";
 }
 
 
@@ -57,41 +69,44 @@ void PICloudClient::setKeepConnection(bool on) {
 
 
 bool PICloudClient::openDevice() {
-//	piCout << "PICloudClient open device" << path();
+	//piCoutObj << "open";// << path();
 	bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
 	if (op) {
-		mutex_buff.lock();
+		mutex_connect.lock();
 		eth.startThreadedRead();
-		bool conn_ok = cond_connect.waitFor(mutex_buff, (int)eth.readTimeout());
-//		piCoutObj << "conn_ok" << conn_ok;
-		mutex_buff.unlock();
+		//piCoutObj << "connecting...";
+		bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout());
+		//piCoutObj << "conn_ok" << conn_ok << is_connected;
+		mutex_connect.unlock();
 		if (!conn_ok) {
+			mutex_connect.lock();
 			eth.stop();
 			eth.close();
-			piMSleep(100);
+			mutex_connect.unlock();
 		}
-		return isConnected();
+		return is_connected;
 	} else {
-		eth.close();
+		//eth.close();
 		return false;
 	}
 }
 
 
 bool PICloudClient::closeDevice() {
-	PIThread::stop(false);
+	//PIThread::stop();
 	if (is_connected) {
 		internalDisconnect();
 	}
 	eth.stop();
-	if (eth.isOpened()) eth.close();
+	eth.close();
 	return true;
 }
 
 
 int PICloudClient::readDevice(void * read_to, int max_size) {
-//	piCoutObj << "readDevice";
-	if (!is_connected) return -1;
+	if (is_deleted) return -1;
+	//piCoutObj << "readDevice";
+	if (!is_connected && eth.isClosed()) openDevice();
 	int sz = -1;
 	mutex_buff.lock();
 	cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
@@ -101,11 +116,14 @@ int PICloudClient::readDevice(void * read_to, int max_size) {
 		buff.remove(0, sz);
 	}
 	mutex_buff.unlock();
+	if (!is_connected) opened_ = false;
+	//piCoutObj << "readDevice done" << sz;
 	return sz;
 }
 
 
 int PICloudClient::writeDevice(const void * data, int size) {
+	if (is_deleted) return -1;
 //	piCoutObj << "writeDevice";
 	return tcp.sendData(PIByteArray(data, size));
 }
@@ -119,25 +137,30 @@ void PICloudClient::internalDisconnect() {
 
 
 void PICloudClient::_readed(PIByteArray & ba) {
-	mutex_buff.lock();
+	if (is_deleted) return;
+	//piCoutObj << "_readed";
 	PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
 	if (hdr.second == tcp.role()) {
 		switch (hdr.first) {
 		case PICloud::TCP::Connect:
 			if (tcp.parseConnect(ba) == 1) {
+				mutex_connect.lock();
 				is_connected = true;
 				connected();
+				mutex_connect.unlock();
 				cond_connect.notifyOne();
 			}
 		break;
 		case PICloud::TCP::Disconnect:
-			is_connected = false;
 			static_cast<PIThread*>(&eth)->stop();
+			opened_ = false;
 			eth.close();
 		break;
 		case PICloud::TCP::Data:
 			if (is_connected) {
+				mutex_buff.lock();
 				buff.append(ba);
+				mutex_buff.unlock();
 				cond_buff.notifyOne();
 			}
 		break;
@@ -146,7 +169,7 @@ void PICloudClient::_readed(PIByteArray & ba) {
 		}
 		//piCoutObj << "readed" << ba.toHex();
 	}
-	mutex_buff.unlock();
 	while (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad
+	//piCoutObj << "_readed done";
 }
 

libs/cloud/picloudserver.cpp

@@ -26,10 +26,12 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
 	tcp.setServerName(server_name);
 	setName("cloud_server__" + server_name);
 	CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
-	CONNECTL(&eth, connected, [this](){tcp.sendStart();});
+	CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();});
 	CONNECTL(&eth, disconnected, [this](bool){
-		piCoutObj << "disconnected";
+		//piCoutObj << "disconnected";
+		static_cast<PIThread*>(&eth)->stop();
 		opened_ = false;
+		ping_timer.stop(false);
 		piMSleep(100);
 	});
 	CONNECTL(&ping_timer, tickEvent, [this] (void *, int){
@@ -57,14 +59,14 @@ 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();
 		ping_timer.start(5000);
 		return true;
 	}
-	ping_timer.stop();
+	ping_timer.stop(false);
 	eth.close();
 	return false;
 }
@@ -72,6 +74,7 @@ bool PICloudServer::openDevice() {
 
 bool PICloudServer::closeDevice() {
 	eth.stop();
+	ping_timer.stop(false);
 	clients_mutex.lock();
 	for (auto c : clients_) {
 		c->close();
@@ -87,7 +90,8 @@ bool PICloudServer::closeDevice() {
 
 int PICloudServer::readDevice(void * read_to, int max_size) {
 	//piCoutObj << "readDevice";
-	piMSleep(eth.readTimeout());
+	if (!opened_) openDevice();
+	else piMSleep(eth.readTimeout());
 	return -1;
 }
 
@@ -183,7 +187,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
 			if (oc) {
 				tcp.sendDisconnected(id);
 			} else {
-				piCoutObj << "new Client" << id;
+				//piCoutObj << "new Client" << id;
 				Client * c = new Client(this, id);
 				CONNECTU(c, deleted, this, clientDeleted);
 				clients_mutex.lock();
@@ -195,7 +199,7 @@ 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();

libs/main/cloud/picloudclient.h

@@ -60,6 +60,7 @@ private:
 	PIConditionVariable cond_buff;
 	PIConditionVariable cond_connect;
 	std::atomic_bool is_connected;
+	std::atomic_bool is_deleted;
 };
 
 #endif // PICLOUDCLIENT_H

libs/main/console/pikbdlistener.h

@@ -25,7 +25,7 @@
 
 #include "pithread.h"
 
-#define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5);
+#define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5); // TODO: rewrite with condvar
 
 
 class PIP_EXPORT PIKbdListener: public PIThread

libs/main/core/piobject.cpp

@@ -700,8 +700,7 @@ PIObject::Deleter::Deleter() {
 	stopping = started = posted = false;
 	CONNECTL(&(PRIVATE->thread), started, [this](){proc();});
 	PRIVATE->thread.startOnce();
-	while (!started)
-		piMSleep(1);
+	while (!started) piMSleep(1);
 }
 
 
@@ -710,8 +709,7 @@ PIObject::Deleter::~Deleter() {
 	stopping = true;
 	PRIVATE->cond_var.notifyAll();
 #ifndef WINDOWS
-	while (PRIVATE->thread.isRunning())
-		piMSleep(1);
+	while (PRIVATE->thread.isRunning()) piMSleep(1);
 #endif
 	deleteAll();
 	//piCout << "~Deleter ok";
@@ -774,12 +772,9 @@ void PIObject::Deleter::deleteObject(PIObject * o) {
 	//piCout << "[Deleter] delete" << (uintptr_t)o << "...";
 	if (o->isPIObject()) {
 		//piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic ...";
-		while (o->isInEvent()) {
-			piMSleep(1);
-		}
+		while (o->isInEvent()) piMSleep(1);
 		//piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic done";
-		if (o->isPIObject())
-			delete o;
+		if (o->isPIObject()) delete o;
 	}
 	//piCout << "[Deleter] delete" << (uintptr_t)o << "done";
 }

libs/main/io_devices/pibinarylog.cpp

@@ -181,7 +181,7 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
 		pausemutex.lock();
 		if (is_pause) {
 			pausemutex.unlock();
-			piMSleep(100);
+			piMSleep(100); // TODO: rewrite with condvar
 			return false;
 		} else if (pause_time > PISystemTime()) {
 			startlogtime += pause_time;
@@ -204,22 +204,22 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
 		int dtc;
 		if (is_started) {
 			if (is_pause) {
-				piMSleep(100);
+				piMSleep(100); // TODO: rewrite with condvar
 				return false;
 			}
 			if (delay > 0) {
-				cdelay = delay * play_speed;
-				dtc = int(cdelay) /100;
+				cdelay = delay * play_speed;// TODO: rewrite with condvar
+				dtc = int(cdelay) / 100;// TODO: rewrite with condvar
 				if (play_speed <= 0.) dtc = 2;
 				//piCout << play_speed << dtc;
 				for (int j=0; j<dtc; j++) {
-					cdelay = delay * play_speed;
-					dtc = int(cdelay) /100;
-					piMSleep(100);
+					cdelay = delay * play_speed;// TODO: rewrite with condvar
+					dtc = int(cdelay) / 100;// TODO: rewrite with condvar
+					piMSleep(100);// TODO: rewrite with condvar
 					if (play_speed <= 0.) {dtc = 2; j = 0;}
 					//piCout << "    " << play_speed << dtc << j;
 				}
-				cdelay = cdelay - dtc*100;
+				cdelay = cdelay - dtc*100;// TODO: rewrite with condvar
 				PISystemTime::fromMilliseconds(cdelay).sleep();
 			}
 		} else is_started = true;
@@ -228,7 +228,7 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
 	case PlayStaticDelay:
 		if (is_started) {
 			if (is_pause) {
-				piMSleep(100);
+				piMSleep(100);// TODO: rewrite with condvar
 				return false;
 			}
 			play_delay.sleep();

libs/main/io_devices/piiodevice.cpp

@@ -239,7 +239,7 @@ void PIIODevice::check_start(void * data, int delim) {
 	//cout << "check " << tread_started_ << endl;
 	if (open()) {
 		thread_started_ = true;
-		timer.stop();
+		timer.stop(false);
 	}
 }
 

main.cpp

@@ -32,8 +32,8 @@ int main(int argc, char * argv[]) {
 		piCout << "[Client] data:" << str;
 		if (str == "ping_S") c.write(PIString("pong_S").toByteArray());
 	}));
-	CONNECTL(&c, connected, ([&](){piCout << "connected";}));
-	CONNECTL(&c, disconnected, ([&](){piCout << "disconnected";}));
+	CONNECTL(&c, connected, ([](){piCout << "connected";}));
+	CONNECTL(&c, disconnected, ([](){piCout << "disconnected";}));
 	CONNECTL(&s, newConnection, ([&](PICloudServer::Client * cl){
 		piCout << "[Server] new client:" << cl;
 		clients << cl;