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

picloud

Browse Source
This commit is contained in:
Пелипенко Иван
2022-10-23 18:48:28 +03:00
parent 9438ab4e53
commit 359c7816bc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/cloud/picloudclient.cpp
View File

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

2
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, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();});
CONNECTL(&eth, disconnected, [this](bool){ CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected"; piCoutObj << "disconnected";
eth.stopThreadedRead(); eth.softStopThreadedRead();
opened_ = false; opened_ = false;
ping_timer.stop(false); ping_timer.stop(false);
piMSleep(100); piMSleep(100);

4
libs/main/io_devices/piiodevice.h
View File

@@ -382,6 +382,8 @@ public:
//! \~russian Пишет в устройство блок памяти "mb" //! \~russian Пишет в устройство блок памяти "mb"
ssize_t write(const PIMemoryBlock & mb) {return write(mb.data(), mb.size());} ssize_t write(const PIMemoryBlock & mb) {return write(mb.data(), mb.size());}
void softStopThreadedRead();
EVENT_VHANDLER(void, flush) {;} EVENT_VHANDLER(void, flush) {;}
EVENT(opened); EVENT(opened);
@@ -538,8 +540,6 @@ protected:
//! \~russian Вызывается после жесткой остановки потока записи //! \~russian Вызывается после жесткой остановки потока записи
virtual void threadedWriteTerminated() {;} virtual void threadedWriteTerminated() {;}
void softStopThreadedRead();
static PIIODevice * newDeviceByPrefix(const char * prefix); static PIIODevice * newDeviceByPrefix(const char * prefix);