From 359c7816bc66c8b37d6b4b737646a70334e33764 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 23 Oct 2022 18:48:28 +0300 Subject: [PATCH] picloud --- libs/cloud/picloudclient.cpp | 4 ++-- libs/cloud/picloudserver.cpp | 2 +- libs/main/io_devices/piiodevice.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/cloud/picloudclient.cpp b/libs/cloud/picloudclient.cpp index cf3f0532..df32517f 100644 --- a/libs/cloud/picloudclient.cpp +++ b/libs/cloud/picloudclient.cpp @@ -33,7 +33,7 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) if (is_deleted) return; bool need_disconn = is_connected; //piCoutObj << "eth disconnected"; - eth.stopThreadedRead(); + eth.softStopThreadedRead(); opened_ = false; internalDisconnect(); if (need_disconn) @@ -155,7 +155,7 @@ void PICloudClient::_readed(PIByteArray & ba) { } break; case PICloud::TCP::Disconnect: - eth.stopThreadedRead(); + eth.softStopThreadedRead(); opened_ = false; eth.close(); break; diff --git a/libs/cloud/picloudserver.cpp b/libs/cloud/picloudserver.cpp index 74698379..bb761dad 100644 --- a/libs/cloud/picloudserver.cpp +++ b/libs/cloud/picloudserver.cpp @@ -29,7 +29,7 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode) CONNECTL(ð, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();}); CONNECTL(ð, disconnected, [this](bool){ piCoutObj << "disconnected"; - eth.stopThreadedRead(); + eth.softStopThreadedRead(); opened_ = false; ping_timer.stop(false); piMSleep(100); diff --git a/libs/main/io_devices/piiodevice.h b/libs/main/io_devices/piiodevice.h index f5f0a3cf..4e6b6bef 100644 --- a/libs/main/io_devices/piiodevice.h +++ b/libs/main/io_devices/piiodevice.h @@ -382,6 +382,8 @@ public: //! \~russian Пишет в устройство блок памяти "mb" ssize_t write(const PIMemoryBlock & mb) {return write(mb.data(), mb.size());} + void softStopThreadedRead(); + EVENT_VHANDLER(void, flush) {;} EVENT(opened); @@ -538,8 +540,6 @@ protected: //! \~russian Вызывается после жесткой остановки потока записи virtual void threadedWriteTerminated() {;} - void softStopThreadedRead(); - static PIIODevice * newDeviceByPrefix(const char * prefix);