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

some fixes for picloud, but still not working correctly

Browse Source
This commit is contained in:
Бычков Андрей
2022-11-08 14:43:52 +03:00
parent 36ff427e0d
commit 897f03f3d0
10 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libs/cloud/picloudserver.cpp
View File

@@ -26,11 +26,10 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
tcp.setServerName(server_name);
setName("cloud_server__" + server_name);
CONNECT1(void, PIByteArray, &streampacker, packetReceiveEvent, this, _readed);
CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected"; tcp.sendStart();});
CONNECTL(&eth, connected, [this](){opened_ = true; piCoutObj << "connected" << &eth; tcp.sendStart();});
CONNECTL(&eth, disconnected, [this](bool){
piCoutObj << "disconnected";
eth.softStopThreadedRead();
eth.interrupt();
piCoutObj << "disconnected" << &eth;
eth.stop();
opened_ = false;
ping_timer.stop(false);
piMSleep(100);
@@ -42,8 +41,10 @@ PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode)
PICloudServer::~PICloudServer() {
piCoutObj << "~PICloudServer ..." << this;
stopAndWait();
close();
piCoutObj << "~PICloudServer done" << this;
}
@@ -60,7 +61,7 @@ PIVector<PICloudServer::Client *> PICloudServer::clients() const {
bool PICloudServer::openDevice() {
//piCout << "PICloudServer open device" << path();
piCout << "PICloudServer open device" << path();
bool op = eth.connect(PIEthernet::Address::resolve(path()), false);
if (op) {
eth.startThreadedRead();
@@ -74,17 +75,19 @@ bool PICloudServer::openDevice() {
bool PICloudServer::closeDevice() {
eth.stop();
piCoutObj << "closeDevice" << this;
eth.stopAndWait();
ping_timer.stop(false);
clients_mutex.lock();
for (auto c : clients_) {
c->stopAndWait();
c->close();
c->stop();
}
clients_mutex.unlock();
eth.close();
for (auto c : clients_)
for (auto c : clients_) {
delete c;
}
return true;
}
@@ -126,12 +129,10 @@ PICloudServer::Client::Client(PICloudServer * srv, uint id) : server(srv), clien
PICloudServer::Client::~Client() {
if (is_connected) {
is_connected = false;
cond_buff.notifyOne();
}
stopAndWait();
piCoutObj << "~PICloudServer::Client..." << this;
close();
stopAndWait();
piCoutObj << "~PICloudServer::Client done" << this;
}
@@ -141,6 +142,7 @@ bool PICloudServer::Client::openDevice() {
bool PICloudServer::Client::closeDevice() {
piCoutObj << "closeDevice" << this;
if (is_connected) {
server->clientDisconnect(client_id);
is_connected = false;
@@ -154,7 +156,6 @@ ssize_t PICloudServer::Client::readDevice(void * read_to, ssize_t max_size) {
if (!is_connected) return -1;
ssize_t sz = -1;
mutex_buff.lock();
cond_buff.wait(mutex_buff);
if (is_connected) {
if (buff.isEmpty()) {
sz = 0;
@@ -163,6 +164,7 @@ ssize_t PICloudServer::Client::readDevice(void * read_to, ssize_t max_size) {
memcpy(read_to, buff.data(), sz);
buff.remove(0, sz);
}
if (sz == 0) cond_buff.wait(mutex_buff);
}
mutex_buff.unlock();
return sz;
@@ -201,8 +203,8 @@ void PICloudServer::_readed(PIByteArray & ba) {
if (oc) {
tcp.sendDisconnected(id);
} else {
//piCoutObj << "new Client" << id;
Client * c = new Client(this, id);
piCoutObj << "new Client" << id << c;
CONNECT1(void, PIObject *, c, deleted, this, clientDeleted);
clients_mutex.lock();
clients_ << c;
@@ -213,13 +215,14 @@ void PICloudServer::_readed(PIByteArray & ba) {
} break;
case PICloud::TCP::Disconnect: {
uint id = tcp.parseDisconnect(ba);
//piCoutObj << "remove Client" << id;
piCoutObj << "remove Client" << id;
clients_mutex.lock();
Client * oc = index_clients.value(id, nullptr);
clients_mutex.unlock();
if (oc) {
oc->is_connected = false;
oc->close();
//oc->is_connected = false;
//oc->close();
delete oc;
}
} break;
case PICloud::TCP::Data: {
@@ -227,7 +230,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
clients_mutex.lock();
Client * oc = index_clients.value(d.first, nullptr);
clients_mutex.unlock();
//piCoutObj << "data for" << d.first << d.second.toHex();
piCoutObj << "data for" << d.first << d.second.size();
if (oc && !d.second.isEmpty()) oc->pushBuffer(d.second);
} break;
default: break;
@@ -238,6 +241,7 @@ void PICloudServer::_readed(PIByteArray & ba) {
void PICloudServer::clientDeleted(PIObject * o) {
PICloudServer::Client * c = (PICloudServer::Client*)o;
piCoutObj << "clientDeleted" << c;
clients_mutex.lock();
clients_.removeOne(c);
auto it = index_clients.makeIterator();