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

PICloud connect/disconnect

Browse Source
This commit is contained in:
Бычков Андрей
2021-04-06 15:24:58 +03:00
parent fcd4e5aa71
commit be0db84147
15 changed files with 217 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/cloud/picloudbase.cpp Normal file
View File

@@ -0,0 +1,6 @@
#include "picloudbase.h"
PICloudBase::PICloudBase() : eth(PIEthernet::TCP_Client) {
}

45
libs/cloud/picloudclient.cpp
View File

@@ -21,7 +21,7 @@
#include "picloudtcp.h"
PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
PICloudClient::PICloudClient(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
tcp.setRole(PICloud::TCP::Client);
setName("cloud_client");
}
@@ -39,28 +39,49 @@ void PICloudClient::setServerName(const PIString & server_name) {
}
void PICloudClient::setKeepConnection(bool on) {
eth.setParameter(PIEthernet::KeepConnection, on);
}
bool PICloudClient::openDevice() {
piCout << "PICloudClient open device" << path();
bool op = eth.connect(path(), false);
if (op) {
CONNECTL(&eth, disconnected, [this](bool){opened_ = false;});
CONNECTL(&eth, connected, [this](){tcp.sendStart(&eth);});
CONNECTU(&eth, threadedReadEvent, this, readed);
CONNECTL(&eth, disconnected, [this](bool){
opened_ = false;
eth.close();
piCoutObj << "disconnected";// << !isOpened() << isClosed();
piMSleep(100);
});
eth.startThreadedRead();
tcp.sendStart(&eth);
return true;
} else {
eth.close();
return false;
}
eth.close();
return false;
}
bool PICloudClient::closeDevice() {
return eth.close();
eth.stop();
eth.close();
return true;
}
int PICloudClient::readDevice(void * read_to, int max_size) {
return eth.read(read_to, max_size);
piCoutObj << "readDevice";
mutex_buff.lock();
cond_buff.wait(mutex_buff, [this](){return !buff.isEmpty();});
int sz = piMini(max_size, buff.size());
memcpy(read_to, buff.data(), sz);
buff.remove(0, sz);
mutex_buff.unlock();
return sz;
}
@@ -70,5 +91,15 @@ int PICloudClient::writeDevice(const void * data, int max_size) {
void PICloudClient::readed(uchar *data, int size) {
PIByteArray ba(data, size);
mutex_buff.lock();
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
if (hdr.second == tcp.role()) {
piCoutObj << "readed" << ba.toHex();
buff.append(data, size);
cond_buff.notifyOne();
}
mutex_buff.unlock();
while (buff.size() > threadedReadBufferSize()) piMSleep(100);
}

38
libs/cloud/picloudserver.cpp
View File

@@ -20,27 +20,41 @@
#include "picloudserver.h"
PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), eth(PIEthernet::TCP_Client) {
PIString name = "cloud_server_" + PIString::fromNumber(randomi()%1000);
PICloudServer::PICloudServer(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode), PICloudBase() {
PIString name = "PCS_" + PIString::fromNumber(randomi()%1000);
tcp.setRole(PICloud::TCP::Server);
tcp.setServerName(name);
setName(name);
setName("cloud_server__" + name);
}
PICloudServer::~PICloudServer() {
for (auto & c : clients) {
c.stop();
c.close();
}
stop();
close();
}
void PICloudServer::setServerName(const PIString & server_name) {
setName("cloud_server__" + server_name);
tcp.setServerName(server_name);
}
bool PICloudServer::openDevice() {
piCout << "PICloudServer open device" << path();
bool op = eth.connect(path(), false);
if (op) {
CONNECTL(&eth, disconnected, [this](bool){opened_ = false;});
CONNECTU(&eth, threadedReadEvent, this, readed);
CONNECTL(&eth, connected, [this](){tcp.sendStart(&eth);});
CONNECTL(&eth, disconnected, [this](bool){
opened_ = false;
eth.close();
piCoutObj << "disconnected" << !isOpened() << isClosed();
});
eth.startThreadedRead();
tcp.sendStart(&eth);
return true;
@@ -51,7 +65,13 @@ bool PICloudServer::openDevice() {
bool PICloudServer::closeDevice() {
return eth.close();
eth.stop();
for (auto & c : clients) {
c.stop();
c.close();
}
eth.close();
return true;
}
@@ -71,10 +91,14 @@ PICloudServer::Client::Client(PICloudServer * srv) : server(srv) {
bool PICloudServer::Client::openDevice() {
return server;
return true;
}
void PICloudServer::readed(uchar *data, int size) {
PIByteArray ba(data, size);
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> hdr = tcp.parseHeader(ba);
if (hdr.second == tcp.role()) {
piCoutObj << "readed" << ba.toHex();
}
}

18
libs/cloud/picloudtcp.cpp
View File

@@ -53,6 +53,24 @@ void PICloud::TCP::sendStart(PIEthernet * eth) {
}
void PICloud::TCP::sendConnected(PIEthernet * eth, uint client_id) {
header.type = PICloud::TCP::Connect;
PIByteArray ba;
ba << header << client_id;
eth->send(ba);
}
void PICloud::TCP::sendData(PIEthernet * eth, const PIByteArray & data) {
header.type = PICloud::TCP::Data;
PIByteArray ba;
ba << header;
ba.append(data);
// piCout << "sendData" << ba.toHex();
eth->send(ba);
}
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> PICloud::TCP::parseHeader(PIByteArray & ba) {
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> ret;
ret.first = Invalid;

40
libs/main/cloud/picloudbase.h Normal file
View File

@@ -0,0 +1,40 @@
/*! \file picloudbase.h
* \brief PICloud Base - Base class for PICloudClient and PICloud Server
*/
/*
PIP - Platform Independent Primitives
PICloud Base - Base class for PICloudClient and PICloud Server
Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PICLOUDBASE_H
#define PICLOUDBASE_H
#include "picloudtcp.h"
#include "piethernet.h"
class PICloudBase
{
public:
PICloudBase();
protected:
PIEthernet eth;
PICloud::TCP tcp;
};
#endif // PICLOUDBASE_H

13
libs/main/cloud/picloudclient.h
View File

@@ -23,11 +23,11 @@
#ifndef PICLOUDCLIENT_H
#define PICLOUDCLIENT_H
#include "picloudtcp.h"
#include "piethernet.h"
#include "picloudbase.h"
#include "piconditionvar.h"
class PIP_CLOUD_EXPORT PICloudClient : public PIIODevice
class PIP_CLOUD_EXPORT PICloudClient : public PIIODevice, private PICloudBase
{
PIIODEVICE(PICloudClient)
public:
@@ -36,6 +36,7 @@ public:
virtual ~PICloudClient();
void setServerName(const PIString & server_name);
void setKeepConnection(bool on);
protected:
bool openDevice();
@@ -45,9 +46,9 @@ protected:
private:
EVENT_HANDLER2(void, readed, uchar * , data, int, size);
PIEthernet eth;
PICloud::TCP tcp;
PIByteArray buff;
PIMutex mutex_buff;
PIConditionVariable cond_buff;
};
#endif // PICLOUDCLIENT_H

9
libs/main/cloud/picloudserver.h
View File

@@ -23,11 +23,10 @@
#ifndef PICLOUDSERVER_H
#define PICLOUDSERVER_H
#include "picloudtcp.h"
#include "piethernet.h"
#include "picloudbase.h"
class PIP_CLOUD_EXPORT PICloudServer : public PIIODevice
class PIP_CLOUD_EXPORT PICloudServer : public PIIODevice, private PICloudBase
{
PIIODEVICE(PICloudServer)
public:
@@ -45,6 +44,8 @@ public:
PICloudServer * server;
};
void setServerName(const PIString & server_name);
EVENT1(newConnection, PICloudServer::Client * , client)
protected:
@@ -56,9 +57,7 @@ protected:
private:
EVENT_HANDLER2(void, readed, uchar * , data, int, size);
PIEthernet eth;
PIVector<Client> clients;
PICloud::TCP tcp;
};
#endif // PICLOUDSERVER_H

3
libs/main/cloud/picloudtcp.h
View File

@@ -53,9 +53,12 @@ public:
TCP();
void setRole(Role r);
Role role() const {return (Role)header.role;}
void setServerName(const PIString & server_name);
void sendStart(PIEthernet * eth);
void sendConnected(PIEthernet * eth, uint client_id);
void sendData(PIEthernet * eth, const PIByteArray & data);
PIPair<PICloud::TCP::Type, PICloud::TCP::Role> parseHeader(PIByteArray & ba);
PIByteArray parseData(PIByteArray & ba);
PIString parseConnect(PIByteArray & ba);