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

remove debug picout from cloud

Browse Source
This commit is contained in:
Бычков Андрей
2022-11-10 14:25:57 +03:00
parent 4994d0bf66
commit e6a5010023
3 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/cloud/picloudbase.cpp
View File

@@ -2,7 +2,7 @@
PICloudBase::PICloudBase() : eth(PIEthernet::TCP_Client), streampacker(&eth), tcp(&streampacker) { PICloudBase::PICloudBase() : eth(PIEthernet::TCP_Client), streampacker(&eth), tcp(&streampacker) {
//eth.setDebug(false); eth.setDebug(false);
} }

29
libs/cloud/picloudclient.cpp
View File

@@ -43,12 +43,12 @@ PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode)
PICloudClient::~PICloudClient() { PICloudClient::~PICloudClient() {
piCoutObj << "~PICloudClient() ..." << this; //piCoutObj << "~PICloudClient() ..." << this;
is_deleted = true; is_deleted = true;
stopAndWait(); stopAndWait();
close(); close();
internalDisconnect(); internalDisconnect();
piCoutObj << "~PICloudClient() done" << this; //piCoutObj << "~PICloudClient() done" << this;
} }
@@ -70,14 +70,14 @@ void PICloudClient::interrupt() {
bool PICloudClient::openDevice() { bool PICloudClient::openDevice() {
piCoutObj << "open";// << path(); //piCoutObj << "open";// << path();
bool op = eth.connect(PIEthernet::Address::resolve(path()), false); bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
if (op) { if (op) {
mutex_connect.lock(); mutex_connect.lock();
eth.startThreadedRead(); eth.startThreadedRead();
piCoutObj << "connecting..."; //piCoutObj << "connecting...";
bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout()); bool conn_ok = cond_connect.waitFor(mutex_connect, (int)eth.readTimeout());
piCoutObj << "conn_ok" << conn_ok << is_connected; //piCoutObj << "conn_ok" << conn_ok << is_connected;
mutex_connect.unlock(); mutex_connect.unlock();
if (!conn_ok) { if (!conn_ok) {
mutex_connect.lock(); mutex_connect.lock();
@@ -106,7 +106,7 @@ bool PICloudClient::closeDevice() {
ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) { ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) {
if (is_deleted || max_size <= 0) return -1; if (is_deleted || max_size <= 0) return -1;
piCoutObj << "readDevice ..."; //piCoutObj << "readDevice ...";
if (!is_connected && eth.isClosed()) openDevice(); if (!is_connected && eth.isClosed()) openDevice();
ssize_t sz = -1; ssize_t sz = -1;
mutex_buff.lock(); mutex_buff.lock();
@@ -122,20 +122,20 @@ ssize_t PICloudClient::readDevice(void * read_to, ssize_t max_size) {
} }
mutex_buff.unlock(); mutex_buff.unlock();
if (!is_connected) opened_ = false; if (!is_connected) opened_ = false;
piCoutObj << "readDevice done" << sz; //piCoutObj << "readDevice done" << sz;
return sz; return sz;
} }
ssize_t PICloudClient::writeDevice(const void * data, ssize_t size) { ssize_t PICloudClient::writeDevice(const void * data, ssize_t size) {
if (is_deleted || !is_connected) return -1; if (is_deleted || !is_connected) return -1;
piCoutObj << "writeDevice" << size; //piCoutObj << "writeDevice" << size;
return tcp.sendData(PIByteArray(data, size)); return tcp.sendData(PIByteArray(data, size));
} }
void PICloudClient::internalDisconnect() { void PICloudClient::internalDisconnect() {
piCoutObj << "internalDisconnect"; //piCoutObj << "internalDisconnect";
is_connected = false; is_connected = false;
cond_buff.notifyOne(); cond_buff.notifyOne();
cond_connect.notifyOne(); cond_connect.notifyOne();
@@ -147,7 +147,7 @@ void PICloudClient::internalDisconnect() {
void PICloudClient::_readed(PIByteArray & ba) { void PICloudClient::_readed(PIByteArray & ba) {
if (is_deleted) return; if (is_deleted) return;
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba); PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
piCoutObj << "_readed" << ba.size() << hdr.first << hdr.second; //piCoutObj << "_readed" << ba.size() << hdr.first << hdr.second;
if (hdr.second == tcp.role()) { if (hdr.second == tcp.role()) {
switch (hdr.first) { switch (hdr.first) {
case PICloud::TCP::Connect: case PICloud::TCP::Connect:
@@ -167,6 +167,11 @@ void PICloudClient::_readed(PIByteArray & ba) {
case PICloud::TCP::Data: case PICloud::TCP::Data:
if (is_connected) { if (is_connected) {
mutex_buff.lock(); mutex_buff.lock();
if (buff.size_s() > threadedReadBufferSize()) {
piCoutObj << "Error: buffer overflow, drop" << ba.size() << "bytes";
mutex_buff.unlock();
return;
}
buff.append(ba); buff.append(ba);
mutex_buff.unlock(); mutex_buff.unlock();
cond_buff.notifyOne(); cond_buff.notifyOne();
@@ -177,6 +182,6 @@ void PICloudClient::_readed(PIByteArray & ba) {
} }
//piCoutObj << "readed" << ba.toHex(); //piCoutObj << "readed" << ba.toHex();
} }
while (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad if (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad
piCoutObj << "_readed done"; //piCoutObj << "_readed done";
} }

38
libs/cloud/picloudserver.cpp
View File

@@ -28,10 +28,14 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
is_deleted = false; is_deleted = false;
eth.setReopenEnabled(false); eth.setReopenEnabled(false);
CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed); CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected" << &eth; tcp.sendStart();}); CONNECTL(&eth, connected, [this](){
opened_ = true;
//piCoutObj << "connected" << &eth;
tcp.sendStart();
});
CONNECTL(&eth, disconnected, [this](bool){ CONNECTL(&eth, disconnected, [this](bool){
if (is_deleted) return; if (is_deleted) return;
piCoutObj << "disconnected" << &eth; //piCoutObj << "disconnected" << &eth;
for (auto c : clients_) { for (auto c : clients_) {
delete c; delete c;
} }
@@ -46,13 +50,13 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
PICloudServer::~PICloudServer() { PICloudServer::~PICloudServer() {
piCoutObj << "~PICloudServer ..." << this; //piCoutObj << "~PICloudServer ..." << this;
is_deleted = true; is_deleted = true;
stop(); stop();
close(); close();
piCout << "wait"; //piCout << "wait";
waitThreadedReadFinished(); waitThreadedReadFinished();
piCoutObj << "~PICloudServer done" << this; //piCoutObj << "~PICloudServer done" << this;
} }
@@ -69,7 +73,7 @@ PIVector<PICloudServer::Client *> PICloudServer::clients() const {
bool PICloudServer::openDevice() { bool PICloudServer::openDevice() {
piCout << "PICloudServer open device" << path(); //piCout << "PICloudServer 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) {
eth.startThreadedRead(); eth.startThreadedRead();
@@ -84,7 +88,7 @@ bool PICloudServer::openDevice() {
bool PICloudServer::closeDevice() { bool PICloudServer::closeDevice() {
piCoutObj << "closeDevice" << this; //piCoutObj << "closeDevice" << this;
eth.stopAndWait(); eth.stopAndWait();
ping_timer.stop(false); ping_timer.stop(false);
eth.close(); eth.close();
@@ -135,10 +139,10 @@ PICloudServer::Client::Client(PICloudServer * srv, uint id) : server(srv), clien
PICloudServer::Client::~Client() { PICloudServer::Client::~Client() {
piCoutObj << "~PICloudServer::Client..." << this; //piCoutObj << "~PICloudServer::Client..." << this;
close(); close();
stopAndWait(); stopAndWait();
piCoutObj << "~PICloudServer::Client done" << this; //piCoutObj << "~PICloudServer::Client done" << this;
} }
@@ -148,7 +152,7 @@ bool PICloudServer::Client::openDevice() {
bool PICloudServer::Client::closeDevice() { bool PICloudServer::Client::closeDevice() {
piCoutObj << "closeDevice" << this; //piCoutObj << "closeDevice" << this;
if (is_connected) { if (is_connected) {
server->clientDisconnect(client_id); server->clientDisconnect(client_id);
is_connected = false; is_connected = false;
@@ -191,10 +195,14 @@ void PICloudServer::Client::interrupt() {
void PICloudServer::Client::pushBuffer(const PIByteArray & ba) { void PICloudServer::Client::pushBuffer(const PIByteArray & ba) {
if (!is_connected) return; if (!is_connected) return;
mutex_buff.lock(); mutex_buff.lock();
if (buff.size_s() > threadedReadBufferSize()) {
piCoutObj << "Error: buffer overflow, drop" << ba.size() << "bytes";
mutex_buff.unlock();
return;
}
buff.append(ba); buff.append(ba);
cond_buff.notifyOne(); cond_buff.notifyOne();
mutex_buff.unlock(); mutex_buff.unlock();
while (buff.size_s() > threadedReadBufferSize()) piMSleep(100); // FIXME: sleep here is bad
} }
@@ -212,7 +220,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
tcp.sendDisconnected(id); tcp.sendDisconnected(id);
} else { } else {
Client * c = new Client(this, id); Client * c = new Client(this, id);
piCoutObj << "new Client" << id << c; //piCoutObj << "new Client" << id << c;
CONNECT1(void, PIObject *, c, deleted, this, clientDeleted); CONNECT1(void, PIObject *, c, deleted, this, clientDeleted);
clients_mutex.lock(); clients_mutex.lock();
clients_ << c; clients_ << c;
@@ -223,7 +231,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
} break; } break;
case PICloud::TCP::Disconnect: { case PICloud::TCP::Disconnect: {
uint id = tcp.parseDisconnect(ba); uint id = tcp.parseDisconnect(ba);
piCoutObj << "remove Client" << id; //piCoutObj << "remove Client" << id;
clients_mutex.lock(); clients_mutex.lock();
Client * oc = index_clients.value(id, nullptr); Client * oc = index_clients.value(id, nullptr);
clients_mutex.unlock(); clients_mutex.unlock();
@@ -238,7 +246,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
clients_mutex.lock(); clients_mutex.lock();
Client * oc = index_clients.value(d.first, nullptr); Client * oc = index_clients.value(d.first, nullptr);
clients_mutex.unlock(); clients_mutex.unlock();
piCoutObj << "data for" << d.first << d.second.size(); //piCoutObj << "data for" << d.first << d.second.size();
if (oc && !d.second.isEmpty()) oc->pushBuffer(d.second); if (oc && !d.second.isEmpty()) oc->pushBuffer(d.second);
} break; } break;
default: break; default: break;
@@ -249,7 +257,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
void PICloudServer::clientDeleted(PIObject * o) { void PICloudServer::clientDeleted(PIObject * o) {
PICloudServer::Client * c = (PICloudServer::Client*)o; PICloudServer::Client * c = (PICloudServer::Client*)o;
piCoutObj << "clientDeleted" << c; //piCoutObj << "clientDeleted" << c;
clients_mutex.lock(); clients_mutex.lock();
clients_.removeOne(c); clients_.removeOne(c);
auto it = index_clients.makeIterator(); auto it = index_clients.makeIterator();