Correction de certaines fuites mémoires, homogénéisation des codes

d'erreur.

Correction de certaines fuites mémoires, homogénéisation des codes
d'erreur.
Jean-Yves Didier
Commit 3e37b30e0411c3700d8dc1956af9e859bfc230f5 3e37b30e 1 parent 5e297b30
Showing 4 changed files with 32 additions and 101 deletions
network/arcsnetworkcomponent.cpp
network/arcsnetworkframes.cpp
network/arcsnetworkframes.h
network/arcsnetworkserver.cpp
--- a/network/arcsnetworkcomponent.cpp
View file @3e37b30
+++ b/network/arcsnetworkcomponent.cpp
View file @3e37b30
--- a/network/arcsnetworkframes.cpp
View file @3e37b30
+++ b/network/arcsnetworkframes.cpp
View file @3e37b30
@@ -45,30 +45,36 @@ QHash<int,QString> ARCS::Network::initErrors()
     res[404]="CALL_REQUEST: wrong signal name (%1)";
     res[405]="IFACE_REQUEST: time out with error '%1'";
+    res[409]="IFACE_REQUEST: network error (while writing frame): '%1'";
     res[413]="CONNECT_REQUEST: wrong destination (%1)";
     res[414]="CONNECT_REQUEST: wrong port number (%1)";
     res[415]="CONNECT_REQUEST: wrong slot name (%1)";
-    res[416]="CONNECT_REQUEST: received invalid response";
+    res[417]="CONNECT_REQUEST: network error (while connecting): '%1'";
-    res[417]="CONNECT_REQUEST: received null response";
+    res[418]="CONNECT_REQUEST: network error (while reading frame): '%1'";
-    res[418]="CONNECT_REQUEST: network error '%1'";
+    res[419]="CONNECT_REQUEST: network error (while writing frame): '%1'";
-    res[419]="CONNECT_REQUEST: network error '%1'";
     res[424]="DISCONNECT_REQUEST: wrong source name (%1)";
-    res[429]="DISCONNECT_REQUEST: network error '%1'";
+    res[427]="DISCONNECT_REQUEST: network error (while connecting): '%1'";
+    res[429]="DISCONNECT_REQUEST: network error (while writing frame): '%1'";
     res[435]="SLOT_REQUEST: wrong slot name (%1)";
-    // classification hasardeuse
+    res[437]="SLOT_REQUEST: network error (while connecting): '%1'";
-    res[439]="SLOT_REQUEST: network error '%1'";
+    res[438]="SLOT_REQUEST: network error (while reading frame): '%1'";
+    res[439]="SLOT_REQUEST: network error (while writing frame): '%1'";
     res[440]="SIGNAL_REQUEST: wrong id (%1)";
     res[441]="SIGNAL_REQUEST: wrong port number (%1)";
     res[444]="SIGNAL_REQUEST: wrong signal name (%1)";
+    res[447]="SIGNAL_REQUEST: network error (while connecting): '%1'";
     // classification hasardeuse
-    res[449]="SIGNAL_REQUEST: network error '%1'";
+    res[449]="SIGNAL_REQUEST: network error (while writing frame): '%1'";
     res[467]="IFACE_RESPONSE: received invalid response";
-    res[468]="IFACE_RESPONSE: received null response";
+    res[468]="IFACE_RESPONSE: network error (while reading frame): '%1'";
+
+    res[486]="SLOT_RESPONSE: received invalid response";
+    res[488]="SLOT_RESPONSE: network error (while reading frame): '%1'";
     ///////////////////////////////////////////////////////////////////////////
@@ -129,6 +135,7 @@ void ARCSNetworkFrame::setType(ARCSNetworkFrames t)
           break;
      case SLOT_RESPONSE:
          data = new ARCSNetworkSlotResponse(); // nouvelle trame
+         break;
      default:
           type = INVALID;
           data = 0 ;
@@ -145,10 +152,7 @@ ARCSNetworkFrame* ARCSNetworkFrame::readFrame(QIODevice* device)
      while (device->bytesAvailable() < (int)sizeof(quint32))
      {
           if (!device->waitForReadyRead(TimeOut))
-          {
-               std::cerr << "[Network] Read type - " << qPrintable(device->errorString()) << std::endl;
                return 0;
-          }
      }
      quint32 blockSize;
@@ -160,10 +164,7 @@ ARCSNetworkFrame* ARCSNetworkFrame::readFrame(QIODevice* device)
      while (device->bytesAvailable() < blockSize)
      {
           if (!device->waitForReadyRead(TimeOut))
-          {
-               std::cerr << "[Network] Read data - " << qPrintable(device->errorString()) << std::endl;
                return 0;
-          }
      }
      ARCSNetworkFrame* frame = new ARCSNetworkFrame();
@@ -172,7 +173,7 @@ ARCSNetworkFrame* ARCSNetworkFrame::readFrame(QIODevice* device)
 }
-void ARCSNetworkFrame::writeFrame(QIODevice* device)
+bool ARCSNetworkFrame::writeFrame(QIODevice* device)
 {
      QByteArray block;
@@ -185,10 +186,10 @@ void ARCSNetworkFrame::writeFrame(QIODevice* device)
      device->write(block);
-     if (!device->waitForBytesWritten(TimeOut))
+     return device->waitForBytesWritten(TimeOut);
-     {
+     /*{
           std::cerr << "[Network] Didn't wait enough to write all bytes" << std::endl;
-     }
+     }*/
 }
--- a/network/arcsnetworkframes.h
View file @3e37b30
+++ b/network/arcsnetworkframes.h
View file @3e37b30
@@ -64,7 +64,7 @@ public:
      ARCSNetworkData* getData() const { return data; }
      static ARCSNetworkFrame* readFrame(QIODevice* device);
-     void writeFrame(QIODevice* device);
+     bool writeFrame(QIODevice* device);
      static int TimeOut ;
 private:
@@ -194,14 +194,14 @@ class ARCSNetworkSlotResponse : public ARCSNetworkData
      public:
      ARCSNetworkSlotResponse() {}
-     QString getSlot() { return slotName; }
+     //QString getSlot() { return slotName; }
-     void setSlot(QString s) { slotName = s ; }
+     //void setSlot(QString s) { slotName = s ; }
      int getId() { return id; }
      void setId(int i) { id = i ;}
-     virtual void serialize(QDataStream& stream) { stream << id <<slotName ; }
+     virtual void serialize(QDataStream& stream) { stream << id /*<<slotName*/ ; }
-     virtual void deserialize(QDataStream& stream) { stream >> id >> slotName; }
+     virtual void deserialize(QDataStream& stream) { stream >> id /*>> slotName*/; }
      private:
-     QString slotName;
+     //QString slotName;
         int id;
 };
--- a/network/arcsnetworkserver.cpp
View file @3e37b30
+++ b/network/arcsnetworkserver.cpp
View file @3e37b30
@@ -24,7 +24,6 @@ void ARCSNetworkServerThread::handleRequest(QTcpSocket* socket)
 {
      ARCSNetworkFrame* request = ARCSNetworkFrame::readFrame(socket);
-     //std::cout << "Recieved request" << request->getType() << std::endl;
      if (request == 0)
      {
           ARCS::Network::logError(600);
@@ -58,7 +57,7 @@ void ARCSNetworkServerThread::handleRequest(QTcpSocket* socket)
           ;
      };
-     // 3 d�connexion
+     // 3 deconnexion
      socket->disconnectFromHost();
      delete request;
 }
@@ -81,25 +80,19 @@ void ARCSNetworkServerThread::handleConnectRequest(ARCSNetworkConnectRequest* an
      ARCSNetworkFrame request(ARCSNetworkFrame::SLOT_REQUEST);
      ((ARCSNetworkSlotRequest*)request.getData())->setSlot(ancr->getSlot());
-     //std::cout << "liste de slots reu " << qPrintable(ancr->getSlot()) << std::endl;
-     /** implementation sans aucun sens
-     if ( !(request.isValid()))
-     {
-         std::cerr <<"Erreur 436 : SLOT_REQUEST error : Trame invalide"<< std::endl;
-     }*/
      request.writeFrame(socketDest);
      ARCSNetworkFrame* response = ARCSNetworkFrame::readFrame(socketDest);
      if (response )
      {
-          if (response->getType() != ARCSNetworkFrame::CONNECT_RESPONSE)
+          if (response->getType() != ARCSNetworkFrame::SLOT_RESPONSE)
               //! \todo process if it is an error frame
-               ARCS::Network::logError(416);
+               ARCS::Network::logError(486);
           else
-               id = ((ARCSNetworkConnectResponse*)response->getData())->getId();
+               id = ((ARCSNetworkSlotResponse*)response->getData())->getId();
      }
      else
-            ARCS::Network::logError(417);
+            ARCS::Network::logError(488);
      socketDest->disconnectFromHost();
@@ -113,32 +106,16 @@ void ARCSNetworkServerThread::handleConnectRequest(ARCSNetworkConnectRequest* an
      ARCSNetworkFrame frame(ARCSNetworkFrame::ACK_RESPONSE);
      ((ARCSNetworkAckResponse*)frame.getData())->setId(id); // utilit du id ?
      frame.writeFrame(socket);
-     /** implementation sans aucun sens
-    if ((QString*)ARCSNetworkServer::getInstance()->getSignals()!=ancr->getSignal())
-     {
-          std::cerr << "Erreur 444 :SIGNAL_REQUEST error : signal name not  found  " << qPrintable(socket->errorString()) << std::endl;
-          return ;
-     }*/
-
 }
 void ARCSNetworkServerThread::handleSlotRequest(ARCSNetworkSlotRequest* ansr, QTcpSocket* socket)
 {
      int id = -1;
-     //std::cout << "[Server] Recieved a slot request on " << qPrintable(ansr->getSlot()) << std::endl;
      id = ARCSNetworkServer::getInstance()->createSignalStub(ansr->getSlot());
-     //std::cout << "liste de slots " << qPrintable(ansr->getSlot()) << std::endl;
+     ARCSNetworkFrame frame(ARCSNetworkFrame::SLOT_RESPONSE);
-     //std::cout << "le id est " << id <<std::endl;
-     ARCSNetworkFrame frame(ARCSNetworkFrame::CONNECT_RESPONSE);
-     ((ARCSNetworkConnectResponse*)frame.getData())->setId(id);
-     /** bricolage mal ralis
-      *ARCSNetworkFrame frame(ARCSNetworkFrame::SLOT_RESPONSE);
      ((ARCSNetworkSlotResponse*)frame.getData())->setId(id);
-     ((ARCSNetworkSlotResponse*)frame.getData())->setSlot(ansr->getSlot());*/
      frame.writeFrame(socket);
-    /* if (ARCSNetworkServer::getInstance()->getSlots()!=ansr->getSlot())
-         std::cerr <<"Erreur 435 : SLOT_REQUEST error : slot name is wrong: le nom du slot est erron " << std::endl;*/
 }
@@ -150,15 +127,6 @@ void ARCSNetworkServerThread::handleInterfaceRequest(QTcpSocket* socket)
      ((ARCSNetworkInterfaceResponse*)frame.getData())->setSlots(slotList);
      ((ARCSNetworkInterfaceResponse*)frame.getData())->setSignals(signalList);
      frame.writeFrame(socket);
-     /** rien  voir avec la smantique de la fonction
-     if ((ARCSNetworkServer::getInstance()->getSignals())!=signalList)
-     {
-         std ::cerr <<"Erreur XXX :SIGNAL_REQUEST error : signal name not  found"<< std::endl;
-     }
-     if ((ARCSNetworkServer::getInstance()->getSlots())!=slotList)
-     {
-         std ::cerr <<"Erreur XXX :SIGNAL_REQUEST error : signal name not  found"<< std::endl;
-     }*/
 }
@@ -168,17 +136,11 @@ void ARCSNetworkServerThread::handleDisconnectRequest(ARCSNetworkDisconnectReque
      ARCSNetworkFrame frame(ARCSNetworkFrame::CONNECT_RESPONSE);
      ((ARCSNetworkConnectResponse*)frame.getData())->setId(0);
      frame.writeFrame(socket);
-     /*if ((ARCSNetworkServer::getInstance()->getSignals())!=andr->getSignal())
-     {
-         std ::cerr <<"Erreur 424 :DISCONNECT_REQUEST error : signal name not  found"<< std::endl;
-     }*/
 }
 void ARCSNetworkServerThread::handleSignalRequest(ARCSNetworkSignalRequest* ansr, QTcpSocket* socket)
 {
-
-     //std::cout << "[Server] Recieved a signal connect on "<<
      ARCSNetworkServer::getInstance()->createSlotStub(ansr->getSignal(),
                                                       ansr->getId(),
                                                       ansr->getPort(),
@@ -186,27 +148,14 @@ void ARCSNetworkServerThread::handleSignalRequest(ARCSNetworkSignalRequest* ansr
      ARCSNetworkFrame frame(ARCSNetworkFrame::CONNECT_RESPONSE);
      ((ARCSNetworkConnectResponse*)frame.getData())->setId(0);
      frame.writeFrame(socket);
-
-    /** pourrissage en rgle de code.
-     if ((ARCSNetworkServer::getInstance()->getPort())!=ansr->getPort())
-     {
-          std::cerr <<"Erreur 441: SIGNAL _REQUEST error : port number is false"<< std::endl;
-     }
-    if ((ARCSNetworkServer::getInstance()->getSignals())!=ansr->getSignal())
-    {
-        std ::cerr <<"Erreur 444 :SIGNAL_REQUEST error : signal name not  found"<< std::endl;
-    }*/
-
 }
 void ARCSNetworkServerThread::handleCallRequest(ARCSNetworkCallRequest* ancr, QTcpSocket* socket)
 {
-     //std::cout << "[Server] Recieved a call request." << std::endl;
      ARCSNetworkServer::getInstance()->call(ancr->getId(), ancr->getParams());
      ARCSNetworkFrame frame(ARCSNetworkFrame::ACK_RESPONSE);
      ((ARCSNetworkAckResponse*)frame.getData())->setId(0); // utilit du id ?
-     //std::cout<< "Acquittement: paquets reus !" << std::endl;
      frame.writeFrame(socket);
 }
@@ -265,8 +214,6 @@ void ARCSNetworkServer::run()
 void ARCSNetworkServer::setInterface(QString name)
 {
      interface = ARCSApplicationComponent::getRunningInstance()->getContext()->getComponent(name);
-     //std::cout << "le nom du composant est "<< qPrintable(getComponent(name)) << std::endl;
-
 }
@@ -279,7 +226,6 @@ void ARCSNetworkServer::getInterface(QStringList & slotList, QStringList & signa
       }
      else
          ARCS::Network::logError(603);
-
 }
 void ARCSNetworkServer::startServer()
@@ -310,7 +256,6 @@ int ARCSNetworkServer::createSignalStub(QString s)
           id = proxySignalsMap[s];
      else
      {
-
           ARCSNetworkProxySignal* ans = new ARCSNetworkProxySignal(this);
           ans->setSignal(s);
           proxySignals.append(ans);
@@ -320,11 +265,6 @@ int ARCSNetworkServer::createSignalStub(QString s)
                ARCSAbstractComponent::connect(s,interface, s);
           else
               ARCS::Network::logError(603);
-          /** bricolage hasardeux
-          if (!interface)
-          {
-             std::cerr <<"Erreur 415 : CONNECT_REQUEST error : slot name is wrong : pas de cration de proxysignal"  << std::endl;
-          }*/
      }
      return id;
@@ -345,8 +285,6 @@ int ARCSNetworkServer::createSlotStub(QString signal, int id, quint16 port,QStri
      else
          ARCS::Network::logError(603);
-         /*std::cerr <<"Erreur 435x : SLOT_REQUEST error : slot name is wrong: pas de cration de proxyslot"  << std::endl;*/
-
      return 0;
 }
@@ -369,19 +307,11 @@ ARCSNetworkProxySignal* ARCSNetworkServer::getProxySignal(QString s)
      }
      else
      {
-         //if (proxySignalsMap.contains(s)) --> pourrissage en rgle
-         //{
           proxy = new ARCSNetworkProxySignal(this);
           proxy->setSignal(s);
           proxySignals.append(proxy);
           proxy->setId(proxySignals.count()-1);
           proxySignalsMap.insert(s, proxySignals.count()-1);
-         /** pourrissage en rgle }
-         else
-         {
-           std::cerr <<  "Erreur 435 : SLOT_REQUEST error : slot name is not found: pas de cration de proxyslot"<< std::endl;
-         }*/
-
      }
      return proxy;
 }