some unsuccessfull fixes for picloud

This commit is contained in:
Бычков Андрей
2022-11-07 17:32:10 +03:00
parent f08a07cab0
commit 93a1bf4f6d
3 changed files with 4 additions and 8 deletions

View File

@@ -45,14 +45,10 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
PICloudClient::~PICloudClient() { PICloudClient::~PICloudClient() {
//piCoutObj << "~PICloudClient()"; //piCoutObj << "~PICloudClient()";
stopAndWait(); stopAndWait();
//piCoutObj << "~PICloudClient() closed"; close();
internalDisconnect();
// stop(false);
is_deleted = true; is_deleted = true;
internalDisconnect(); internalDisconnect();
//piCoutObj << "~PICloudClient() done";
} }

View File

@@ -30,6 +30,7 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
CONNECTL(&eth, disconnected, [this](bool){ CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected"; piCoutObj << "disconnected";
eth.softStopThreadedRead(); eth.softStopThreadedRead();
eth.interrupt();
opened_ = false; opened_ = false;
ping_timer.stop(false); ping_timer.stop(false);
piMSleep(100); piMSleep(100);
@@ -129,8 +130,8 @@ PICloudServer::Client::~Client() {
is_connected = false; is_connected = false;
cond_buff.notifyOne(); cond_buff.notifyOne();
} }
stopAndWait();
close(); close();
stop();
} }
@@ -140,7 +141,6 @@ bool PICloudServer::Client::openDevice() {
bool PICloudServer::Client::closeDevice() { bool PICloudServer::Client::closeDevice() {
softStopThreadedRead();
if (is_connected) { if (is_connected) {
server->clientDisconnect(client_id); server->clientDisconnect(client_id);
is_connected = false; is_connected = false;

View File

@@ -28,7 +28,7 @@ PIString DispatcherClient::address() {
void DispatcherClient::close() { void DispatcherClient::close() {
eth->softStopThreadedRead(); eth->softStopThreadedRead();
eth->close(); eth->interrupt();
} }