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

fail reconnect

Browse Source
This commit is contained in:
Бычков Андрей
2021-08-20 18:25:59 +03:00
parent 99e135caa2
commit 5cc8ef1eb0
5 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libs/cloud/picloudclient.cpp
View File

@@ -28,7 +28,9 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();}); CONNECTL(&eth, connected, [this](){opened_ = true; tcp.sendStart();});
CONNECTU(&streampacker, packetReceiveEvent, this, _readed); CONNECTU(&streampacker, packetReceiveEvent, this, _readed);
CONNECTL(&eth, disconnected, [this](bool){ CONNECTL(&eth, disconnected, [this](bool){
// piCoutObj << "disconnected"; piCoutObj << "disconnected";
static_cast<PIThread*>(&eth)->stop();
opened_ = false;
if (is_connected) disconnected(); if (is_connected) disconnected();
internalDisconnect(); internalDisconnect();
piMSleep(100); piMSleep(100);
@@ -37,11 +39,12 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
PICloudClient::~PICloudClient() { PICloudClient::~PICloudClient() {
piCoutObj << "~PICloudClient()";
PIThread::stop();
eth.close(); eth.close();
if (is_connected) disconnected();
internalDisconnect(); internalDisconnect();
close(); //close();
stop(); //stop(false);
} }
@@ -57,22 +60,23 @@ void PICloudClient::setKeepConnection(bool on) {
bool PICloudClient::openDevice() { bool PICloudClient::openDevice() {
// piCout << "PICloudClient open device" << path(); piCout << "PICloudClient open device" << path();
bool op = eth.connect(PIEthernet::Address::resolve(path()), false); bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
if (op) { if (op) {
mutex_buff.lock(); mutex_connect.lock();
eth.startThreadedRead(); eth.startThreadedRead();
bool conn_ok = cond_connect.waitFor(mutex_buff, (int)eth.readTimeout()); piCoutObj << "connecting...";
// piCoutObj << "conn_ok" << conn_ok; bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout());
mutex_buff.unlock(); piCoutObj << "conn_ok" << conn_ok;
if (!conn_ok) { if (!conn_ok) {
eth.stop(); eth.stop();
eth.close(); eth.close();
piMSleep(100); piMSleep(100);
} }
return isConnected(); mutex_connect.unlock();
return is_connected;
} else { } else {
eth.close(); //eth.close();
return false; return false;
} }
} }
@@ -84,15 +88,15 @@ bool PICloudClient::closeDevice() {
internalDisconnect(); internalDisconnect();
} }
eth.stop(); eth.stop();
if (eth.isOpened()) eth.close(); eth.close();
return true; return true;
} }
int PICloudClient::readDevice(void * read_to, int max_size) { int PICloudClient::readDevice(void * read_to, int max_size) {
// piCoutObj << "readDevice"; // piCoutObj << "readDevice";
if (!is_connected) return -1; if (!is_connected) return 0;
int sz = -1; int sz = 0;
mutex_buff.lock(); mutex_buff.lock();
cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;}); cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
if (is_connected) { if (is_connected) {
@@ -131,7 +135,6 @@ void PICloudClient::_readed(PIByteArray & ba) {
} }
break; break;
case PICloud::TCP::Disconnect: case PICloud::TCP::Disconnect:
is_connected = false;
static_cast<PIThread*>(&eth)->stop(); static_cast<PIThread*>(&eth)->stop();
eth.close(); eth.close();
break; break;

5
libs/cloud/picloudserver.cpp
View File

@@ -29,6 +29,7 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
CONNECTL(&eth, connected, [this](){tcp.sendStart();}); CONNECTL(&eth, connected, [this](){tcp.sendStart();});
CONNECTL(&eth, disconnected, [this](bool){ CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected"; piCoutObj << "disconnected";
static_cast<PIThread*>(&eth)->stop();
opened_ = false; opened_ = false;
piMSleep(100); piMSleep(100);
}); });
@@ -142,8 +143,8 @@ bool PICloudServer::Client::closeDevice() {
int PICloudServer::Client::readDevice(void * read_to, int max_size) { int PICloudServer::Client::readDevice(void * read_to, int max_size) {
if (!is_connected) return -1; if (!is_connected) return 0;
int sz = -1; int sz = 0;
mutex_buff.lock(); mutex_buff.lock();
cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;}); cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty() || !is_connected;});
if (is_connected) { if (is_connected) {

2
libs/main/console/pikbdlistener.h
View File

@@ -25,7 +25,7 @@
#include "pithread.h" #include "pithread.h"
#define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5); #define WAIT_FOR_EXIT while (!PIKbdListener::exiting) piMSleep(PIP_MIN_MSLEEP*5); // TODO: rewrite with condvar
class PIP_EXPORT PIKbdListener: public PIThread class PIP_EXPORT PIKbdListener: public PIThread

13
libs/main/core/piobject.cpp
View File

@@ -700,8 +700,7 @@ PIObject::Deleter::Deleter() {
stopping = started = posted = false; stopping = started = posted = false;
CONNECTL(&(PRIVATE->thread), started, [this](){proc();}); CONNECTL(&(PRIVATE->thread), started, [this](){proc();});
PRIVATE->thread.startOnce(); PRIVATE->thread.startOnce();
while (!started) while (!started) piMSleep(1);
piMSleep(1);
} }
@@ -710,8 +709,7 @@ PIObject::Deleter::~Deleter() {
stopping = true; stopping = true;
PRIVATE->cond_var.notifyAll(); PRIVATE->cond_var.notifyAll();
#ifndef WINDOWS #ifndef WINDOWS
while (PRIVATE->thread.isRunning()) while (PRIVATE->thread.isRunning()) piMSleep(1);
piMSleep(1);
#endif #endif
deleteAll(); deleteAll();
//piCout << "~Deleter ok"; //piCout << "~Deleter ok";
@@ -774,12 +772,9 @@ void PIObject::Deleter::deleteObject(PIObject * o) {
//piCout << "[Deleter] delete" << (uintptr_t)o << "..."; //piCout << "[Deleter] delete" << (uintptr_t)o << "...";
if (o->isPIObject()) { if (o->isPIObject()) {
//piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic ..."; //piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic ...";
while (o->isInEvent()) { while (o->isInEvent()) piMSleep(1);
piMSleep(1);
}
//piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic done"; //piCout << "[Deleter] delete" << (uintptr_t)o << "wait atomic done";
if (o->isPIObject()) if (o->isPIObject()) delete o;
delete o;
} }
//piCout << "[Deleter] delete" << (uintptr_t)o << "done"; //piCout << "[Deleter] delete" << (uintptr_t)o << "done";
} }

18
libs/main/io_devices/pibinarylog.cpp
View File

@@ -181,7 +181,7 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
pausemutex.lock(); pausemutex.lock();
if (is_pause) { if (is_pause) {
pausemutex.unlock(); pausemutex.unlock();
piMSleep(100); piMSleep(100); // TODO: rewrite with condvar
return false; return false;
} else if (pause_time > PISystemTime()) { } else if (pause_time > PISystemTime()) {
startlogtime += pause_time; startlogtime += pause_time;
@@ -204,22 +204,22 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
int dtc; int dtc;
if (is_started) { if (is_started) {
if (is_pause) { if (is_pause) {
piMSleep(100); piMSleep(100); // TODO: rewrite with condvar
return false; return false;
} }
if (delay > 0) { if (delay > 0) {
cdelay = delay * play_speed; cdelay = delay * play_speed;// TODO: rewrite with condvar
dtc = int(cdelay) /100; dtc = int(cdelay) / 100;// TODO: rewrite with condvar
if (play_speed <= 0.) dtc = 2; if (play_speed <= 0.) dtc = 2;
//piCout << play_speed << dtc; //piCout << play_speed << dtc;
for (int j=0; j<dtc; j++) { for (int j=0; j<dtc; j++) {
cdelay = delay * play_speed; cdelay = delay * play_speed;// TODO: rewrite with condvar
dtc = int(cdelay) /100; dtc = int(cdelay) / 100;// TODO: rewrite with condvar
piMSleep(100); piMSleep(100);// TODO: rewrite with condvar
if (play_speed <= 0.) {dtc = 2; j = 0;} if (play_speed <= 0.) {dtc = 2; j = 0;}
//piCout << " " << play_speed << dtc << j; //piCout << " " << play_speed << dtc << j;
} }
cdelay = cdelay - dtc*100; cdelay = cdelay - dtc*100;// TODO: rewrite with condvar
PISystemTime::fromMilliseconds(cdelay).sleep(); PISystemTime::fromMilliseconds(cdelay).sleep();
} }
} else is_started = true; } else is_started = true;
@@ -228,7 +228,7 @@ bool PIBinaryLog::threadedRead(uchar *readed, int size) {
case PlayStaticDelay: case PlayStaticDelay:
if (is_started) { if (is_started) {
if (is_pause) { if (is_pause) {
piMSleep(100); piMSleep(100);// TODO: rewrite with condvar
return false; return false;
} }
play_delay.sleep(); play_delay.sleep();