piiodevice_fix #167

Merged
peri4 merged 2 commits from piiodevice_fix into master 2022-10-23 19:33:41 +03:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 359c7816bc - Show all commits

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";
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;

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";
eth.stopThreadedRead();
eth.softStopThreadedRead();
opened_ = false;
ping_timer.stop(false);
piMSleep(100);

View File

@@ -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);