SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIIODevice threaded read refactoring

Browse Source
This commit is contained in:
Пелипенко Иван
2022-10-23 16:02:09 +03:00
parent e5777dde6c
commit 9438ab4e53
9 changed files with 157 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/cloud/picloudclient.cpp
View File

@@ -33,7 +33,7 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
if (is_deleted) return;
bool need_disconn = is_connected;
//piCoutObj << "eth disconnected";
static_cast<PIThread*>(&eth)->stop();
eth.stopThreadedRead();
opened_ = false;
internalDisconnect();
if (need_disconn)
@@ -45,7 +45,7 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
PICloudClient::~PICloudClient() {
//piCoutObj << "~PICloudClient()";
PIThread::stop();
softStopThreadedRead();
//eth.close();
//if (is_connected) disconnected();
close();
@@ -155,7 +155,7 @@ void PICloudClient::_readed(PIByteArray & ba) {
}
break;
case PICloud::TCP::Disconnect:
static_cast<PIThread*>(&eth)->stop();
eth.stopThreadedRead();
opened_ = false;
eth.close();
break;

4
libs/cloud/picloudserver.cpp
View File

@@ -29,7 +29,7 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();});
CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected";
static_cast<PIThread*>(&eth)->stop();
eth.stopThreadedRead();
opened_ = false;
ping_timer.stop(false);
piMSleep(100);
@@ -135,7 +135,7 @@ bool PICloudServer::Client::openDevice() {
bool PICloudServer::Client::closeDevice() {
PIThread::stop(false);
softStopThreadedRead();
if (is_connected) {
server->clientDisconnect(client_id);
is_connected = false;