Revize 74adfd5f

Server cleanup

deltarobot/curvedataserver.cpp

@@ -124 +124 @@
 
 CurveDataServer::CurveDataServer() :
     _server(this),
-    _pingThread([this](){threadFunction();}),
     _sockets()
 {
     _server.listen(QHostAddress::Any, 4242);
@@ -133 +132 @@
 
 CurveDataServer::~CurveDataServer()
 {
-    _threadIsRunning = false;
-    _pingThread.join();
-
     std::lock_guard<decltype (_socketsLock)> l(_socketsLock);
     for (auto& client : _sockets)
     {
@@ -277 +273 @@
         handleVersion(client, *((uint8_t*) content));
         break;
     case 0x3005:
-        qDebug() << "Pong " << *((uint64_t*) content) << " arrived!";
         handlePong(client, (uint64_t*) content);
         break;
     case 0xF006:
@@ -317 +312 @@
 
     client.latency = time - timeSent;
     client.lastPong = time;
-    //qDebug() << "prisel pong" << number;
 }
 
 void CurveDataServer::handleEOT(Client& client, char* content, size_t contentSize)
@@ -326 +320 @@
     std::memcpy(cstrContent, content, contentSize);
     cstrContent[contentSize] = '\0';
 
-    qDebug() << "Client" << client.socket->peerName() << "disconnected:" << cstrContent;
+    qDebug() << "Client" << client.socket->peerAddress() << "disconnected:" << cstrContent;
     terminateConnection(client, "Recieved EOT from client");
 }
 
@@ -340 +334 @@
         client.socket->close();
     }
 
+    qDebug() << "Terminating connection to client" << client.socket->peerAddress() << "reason:" << reason.c_str();
     removeSocket(client.socket);
 }
 
@@ -470 +465 @@
     socket->write(message);
 }
 
-
-
 void CurveDataServer::sendMessageToAllConnected(QByteArray &message)
 {
     std::lock_guard<decltype (_socketsLock)> l(_socketsLock);
@@ -483 +476 @@
     }
 }
 
-void CurveDataServer::threadFunction()
-{
-    /*
-    while (_threadIsRunning)
-    {
-        //processPings();
-
-        // TODO tim se zpravilo varovani se socketama
-
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-    */
-}
-
 void CurveDataServer::processPings()
 {
     std::lock_guard<decltype (_socketsLock)> l(_socketsLock);
@@ -542 +521 @@
 {
     uint64_t number = (((uint64_t) rand()) << 32) + (uint64_t) rand();
 
-    //qDebug() << "posilam ping" << ((qint64) number) << ".";
-
     client.ping.emplace(std::make_pair(number, currentTimeMillis()));
-    //client.ping.insert({number, currentTimeMillis()});
 
     client.socket->write(message64(0x3004, (uint64_t) number));
 }

deltarobot/curvedataserver.h

@@ -99 +99 @@
 
     void sendMessageToAllConnected(QByteArray &message);
 
-    void threadFunction();
-
     QTcpServer _server;
-    std::thread _pingThread;
-
-    /**
-     * A flag that can be switched to `false` when the application should end, in order to gracefully stop the ping
-     * thread.
-     */
-    volatile bool _threadIsRunning = true;
 
     std::recursive_mutex _socketsLock;
     QList<Client> _sockets;