[certi-cvs] certi RTIG/RTIG_processing.cc libCERTI/Message_...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     ROUSSELOT <rousse>      08/04/03 15:21:52

Modified files:
        RTIG           : RTIG_processing.cc 
        libCERTI       : Message_R.cc Message_W.cc NetworkMessage_RW.cc 
                         SocketServer.cc SocketTCP.cc SocketUN.cc 
        libRTI         : RTIambassador.cc 

Log message:
        Many debugging trace suppressed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.58&r2=3.59
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.45&r2=3.46
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketServer.cc?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.cc?cvsroot=certi&r1=3.19&r2=3.20
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.74&r2=3.75

Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.58
retrieving revision 3.59
diff -u -b -r3.58 -r3.59
--- RTIG/RTIG_processing.cc     1 Apr 2008 13:00:47 -0000       3.58
+++ RTIG/RTIG_processing.cc     3 Apr 2008 15:21:51 -0000       3.59
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.58 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.59 2008/04/03 15:21:51 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -364,6 +364,7 @@
     try
       {
       federations.destroyFederation(num_federation);
+      // Here delete federation (num_federation) has been done
       federationHandles.free(num_federation);
       D.Out(pdInit, "Federation \"%s\" has been destroyed.", federation);
       }
@@ -1461,4 +1462,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.58 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIG_processing.cc,v 3.59 2008/04/03 15:21:51 rousse Exp $

Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/Message_R.cc       13 Mar 2008 14:39:19 -0000      3.18
+++ libCERTI/Message_R.cc       3 Apr 2008 15:21:51 -0000       3.19
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_R.cc,v 3.18 2008/03/13 14:39:19 siron Exp $
+// $Id: Message_R.cc,v 3.19 2008/04/03 15:21:51 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -52,7 +52,7 @@
 void
 Message::readBody(SocketUN *socket)
 {
-    G.Out(pdGendoc,"enter Message::readBody");
+    // G.Out(pdGendoc,"enter Message::readBody");
  
     assert(header.bodySize > 0);
 
@@ -475,7 +475,7 @@
             throw RTIinternalError("Message: Unknown Type for Body(Read).");
         }
     }
-    G.Out(pdGendoc,"exit  Message::readBody");
+    // G.Out(pdGendoc,"exit  Message::readBody");
 }
 
 // ----------------------------------------------------------------------------
@@ -485,7 +485,7 @@
 bool
 Message::readHeader(SocketUN *socket)
 {
-    G.Out(pdGendoc,"enter Message::readHeader");
+    // G.Out(pdGendoc,"enter Message::readHeader");
 
     // 1- Read Header from Socket
     socket->receive((const unsigned char *) &header, sizeof(MessageHeader));
@@ -499,7 +499,7 @@
 
     if (exception != e_NO_EXCEPTION)
         {
-        G.Out(pdGendoc,"exit  Message::readHeader carrying an exception");
+        // G.Out(pdGendoc,"exit  Message::readHeader carrying an exception");
         return true ;
         }
 
@@ -653,12 +653,12 @@
 
       default:
         D.Out(pdExcept, "Unknown type %d in ReadHeader.", header.type);
-        G.Out(pdGendoc,"exit  Message::readHeader on RTIinternalError unknown 
type");
+        // G.Out(pdGendoc,"exit  Message::readHeader on RTIinternalError 
unknown type");
         throw RTIinternalError("Message: Received unknown Header type.");
     }
 
     // 4- Return depends on body
-    G.Out(pdGendoc,"exit  Message::readHeader");
+    // G.Out(pdGendoc,"exit  Message::readHeader");
 
     return header.bodySize != 0 ;
 }
@@ -758,4 +758,4 @@
 
 } // namespace certi
 
-// $Id: Message_R.cc,v 3.18 2008/03/13 14:39:19 siron Exp $
+// $Id: Message_R.cc,v 3.19 2008/04/03 15:21:51 rousse Exp $

Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- libCERTI/Message_W.cc       13 Mar 2008 14:39:19 -0000      3.21
+++ libCERTI/Message_W.cc       3 Apr 2008 15:21:51 -0000       3.22
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Message_W.cc,v 3.21 2008/03/13 14:39:19 siron Exp $
+// $Id: Message_W.cc,v 3.22 2008/04/03 15:21:51 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -56,7 +56,7 @@
 Message::writeBody(SocketUN *socket)
 {
     MessageBody body ;
-    G.Out(pdGendoc,"enter Message::writeBody type %d",header.type);    
+    // G.Out(pdGendoc,"enter Message::writeBody type %d",header.type);    
     // 0- Copy the Header at the beginning of the Body, in order to
     // make a single Socket->Emettre call while sending both.
     // WARNING: As the Body size is not known yet, we will have to
@@ -484,9 +484,9 @@
 
     // 3- Write Header to socket, then write Body to socket.
     // socket->send((void *) &Header, sizeof(MessageHeader));
-    G.Out(pdGendoc,"      Message::writeBody ======> send Message");
+    // G.Out(pdGendoc,"      Message::writeBody ======> send Message");
     socket->send(body.getBuffer(), body.size());
-    G.Out(pdGendoc,"exit  Message::writeBody");
+    // G.Out(pdGendoc,"exit  Message::writeBody");
 }
 
 // ----------------------------------------------------------------------------
@@ -505,7 +505,7 @@
 bool
 Message::writeHeader(SocketUN *socket)
 {
-    G.Out(pdGendoc,"enter Message::writeHeader");
+    // G.Out(pdGendoc,"enter Message::writeHeader");
     // 1- Clear Header
     memset((void *) &header, '\0', sizeof(MessageHeader));
 
@@ -521,7 +521,7 @@
 
     if (exception != e_NO_EXCEPTION) {
         header.bodySize = 1 ;
-        G.Out(pdGendoc,"exit  Message::writeHeader carrying exception");
+        // G.Out(pdGendoc,"exit  Message::writeHeader carrying exception");
         return true ;
     }
 
@@ -694,7 +694,7 @@
     if (header.bodySize == 0)
         socket->send((const unsigned char *) &header, sizeof(MessageHeader));
 
-    G.Out(pdGendoc,"exit  Message::writeHeader");
+    // G.Out(pdGendoc,"exit  Message::writeHeader");
     return header.bodySize != 0 ;
 }
 
@@ -739,4 +739,4 @@
 
 } // namespace certi
 
-// $Id: Message_W.cc,v 3.21 2008/03/13 14:39:19 siron Exp $
+// $Id: Message_W.cc,v 3.22 2008/04/03 15:21:51 rousse Exp $

Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -b -r3.45 -r3.46
--- libCERTI/NetworkMessage_RW.cc       6 Mar 2008 16:33:10 -0000       3.45
+++ libCERTI/NetworkMessage_RW.cc       3 Apr 2008 15:21:51 -0000       3.46
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage_RW.cc,v 3.45 2008/03/06 16:33:10 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.46 2008/04/03 15:21:51 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -48,7 +48,7 @@
 {
     MessageBody body ;
     unsigned short i ;
-    G.Out(pdGendoc,"enter NetworkMessage::readBody");
+    // G.Out(pdGendoc,"enter NetworkMessage::readBody");
     if (Header.bodySize == 0)
         throw RTIinternalError("ReadBody should not have been called.");
 
@@ -313,14 +313,14 @@
        throw RTIinternalError("Unknown/Unimplemented type for body.");
     }
     }
-    G.Out(pdGendoc,"exit NetworkMessage::readBody");
+    // G.Out(pdGendoc,"exit NetworkMessage::readBody");
 }
 
 // ----------------------------------------------------------------------------
 bool
 NetworkMessage::readHeader(Socket *socket)
 {
-    G.Out(pdGendoc,"enter NetworkMessage::readHeader");
+    // G.Out(pdGendoc,"enter NetworkMessage::readHeader");
     // 1- Read Header from Socket
     socket->receive((void *) &Header, sizeof(HeaderStruct));
     // 2- Parse Header(Static Part)
@@ -333,7 +333,7 @@
 
     if (exception != e_NO_EXCEPTION)
         {
-        G.Out(pdGendoc,"exit  Message::readHeader carrying an exception");
+        // G.Out(pdGendoc,"exit  Message::readHeader carrying an exception");
         return true ;
         }
 
@@ -503,12 +503,12 @@
 
       default:
        D.Out(pdExcept, "Unknown type %d in ReadHeader.", Header.type);
-        G.Out(pdGendoc,"exit  NetworkMessage::readHeader with unknown 
type=%d",Header.type);
+        // G.Out(pdGendoc,"exit  NetworkMessage::readHeader with unknown 
type=%d",Header.type);
        throw RTIinternalError("Received unknown Header type.");
     }
 
     // 4- If Header.bodySize is not 0, return RTI_TRUE, else RTI_FALSE
-    G.Out(pdGendoc,"exit  NetworkMessage::readHeader");
+    // G.Out(pdGendoc,"exit  NetworkMessage::readHeader");
     return Header.bodySize ;
 }
 
@@ -519,7 +519,7 @@
     MessageBody body ;
     unsigned short i ;
 
-    G.Out(pdGendoc,"enter NetworkMessage::writeBody");
+    // G.Out(pdGendoc,"enter NetworkMessage::writeBody");
 
     // 0- Copy the Header at the beginning of the body, in order to
     // make a single Socket->Emettre call while sending both.
@@ -801,14 +801,14 @@
     D.Out(pdTrace,"Sending MessageBody of size <%d>",body.size());
     socket->send(body.getBuffer(), body.size());
 
-    G.Out(pdGendoc,"exit  NetworkMessage::writeBody");
+    // G.Out(pdGendoc,"exit  NetworkMessage::writeBody");
 }
 
 // ----------------------------------------------------------------------------
 bool
 NetworkMessage::writeHeader(Socket *socket)
 {
-    G.Out(pdGendoc,"enter NetworkMessage::writeHeader");
+    // G.Out(pdGendoc,"enter NetworkMessage::writeHeader");
     // 2- Fill Header(Static Part)
     Header.type = type ;
     Header.exception = exception ;
@@ -819,7 +819,7 @@
 
     if (exception != e_NO_EXCEPTION) {
         Header.bodySize = 1 ;
-        G.Out(pdGendoc,"exit  NetworkMessage::writeHeader carrying an 
exception");
+        // G.Out(pdGendoc,"exit  NetworkMessage::writeHeader carrying an 
exception");
         return true ;
     }
 
@@ -1055,10 +1055,10 @@
     if (Header.bodySize == 0)
         socket->send(reinterpret_cast<unsigned char *>(&Header), 
sizeof(HeaderStruct));
 
-    G.Out(pdGendoc,"exit  NetworkMessage::writeHeader");
+    // G.Out(pdGendoc,"exit  NetworkMessage::writeHeader");
     return Header.bodySize != 0 ;
 }
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.45 2008/03/06 16:33:10 rousse Exp $
+// $Id: NetworkMessage_RW.cc,v 3.46 2008/04/03 15:21:51 rousse Exp $

Index: libCERTI/SocketServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketServer.cc,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- libCERTI/SocketServer.cc    13 Feb 2008 16:28:30 -0000      3.14
+++ libCERTI/SocketServer.cc    3 Apr 2008 15:21:51 -0000       3.15
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SocketServer.cc,v 3.14 2008/02/13 16:28:30 rousse Exp $
+// $Id: SocketServer.cc,v 3.15 2008/04/03 15:21:51 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -61,11 +61,11 @@
 SocketServer::checkMessage(long socket_number, NetworkMessage *message) const
     throw (SecurityError)
 {
-    G.Out(pdGendoc,"enter SocketServer::checkMessage");
+    // G.Out(pdGendoc,"enter SocketServer::checkMessage");
 
     if ((message->federation == 0) && (message->federate == 0))
         {
-        G.Out(pdGendoc,"exit  SocketServer::checkMessage on return");
+        // G.Out(pdGendoc,"exit  SocketServer::checkMessage on return");
         return ;
         }
 
@@ -83,7 +83,7 @@
         // BUG: Should put a line in the Audit.
         throw SecurityError("Message has a forged origin.");
     }
-    G.Out(pdGendoc,"exit  SocketServer::checkMessage");
+    // G.Out(pdGendoc,"exit  SocketServer::checkMessage");
 }
 
 // ----------------------------------------------------------------------------
@@ -222,7 +222,7 @@
                             TransportType the_type) const
     throw (FederateNotExecutionMember, RTIinternalError)
 {
-    G.Out(pdGendoc,"enter SocketServer::getSocketLink");
+    // G.Out(pdGendoc,"enter SocketServer::getSocketLink");
     // It may throw FederateNotExecutionMember
     SocketTuple *tuple = getWithReferences(the_federation, the_federate);
 
@@ -236,7 +236,7 @@
             throw RTIinternalError("Reference to a killed Federate.");
         return tuple->BestEffortLink ;
     }
-    G.Out(pdGendoc,"exit  SocketServer::getSocketLink without return");
+    // G.Out(pdGendoc,"exit  SocketServer::getSocketLink without return");
 }
 
 // ----------------------------------------------------------------------------
@@ -329,4 +329,4 @@
 
 }
 
-// $Id: SocketServer.cc,v 3.14 2008/02/13 16:28:30 rousse Exp $
+// $Id: SocketServer.cc,v 3.15 2008/04/03 15:21:51 rousse Exp $

Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- libCERTI/SocketTCP.cc       12 Feb 2008 14:26:43 -0000      3.21
+++ libCERTI/SocketTCP.cc       3 Apr 2008 15:21:52 -0000       3.22
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SocketTCP.cc,v 3.21 2008/02/12 14:26:43 rousse Exp $
+// $Id: SocketTCP.cc,v 3.22 2008/04/03 15:21:52 rousse Exp $
 // ----------------------------------------------------------------------------
 
 #ifdef _WIN32
@@ -500,7 +500,7 @@
 SocketTCP::receive(void *buffer, unsigned long size)
                                                throw (NetworkError, 
NetworkSignal)
 {
-G.Out(pdGendoc,"enter SocketTCP::receive");
+// G.Out(pdGendoc,"enter SocketTCP::receive");
 assert(_est_init_tcp);
 
 long nReceived = 0 ;
@@ -557,7 +557,7 @@
        memmove((void *) ReadBuffer, (void *)(ReadBuffer + size), RBLength - 
size);
        RBLength -= size ;
 #endif
-G.Out(pdGendoc,"exit  SocketTCP::receive");
+// G.Out(pdGendoc,"exit  SocketTCP::receive");
 }
 
 // ----------------------------------------------------------------------------
@@ -621,4 +621,4 @@
 
 } // namespace
 
-// $Id: SocketTCP.cc,v 3.21 2008/02/12 14:26:43 rousse Exp $
+// $Id: SocketTCP.cc,v 3.22 2008/04/03 15:21:52 rousse Exp $

Index: libCERTI/SocketUN.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.cc,v
retrieving revision 3.19
retrieving revision 3.20
diff -u -b -r3.19 -r3.20
--- libCERTI/SocketUN.cc        10 Feb 2008 18:19:13 -0000      3.19
+++ libCERTI/SocketUN.cc        3 Apr 2008 15:21:52 -0000       3.20
@@ -296,7 +296,7 @@
 long sent = 0 ;
 unsigned long total_sent = 0 ;
 
-G.Out(pdGendoc,"enter SocketUN::send");
+// G.Out(pdGendoc,"enter SocketUN::send");
 assert(_est_init_un);
 
 pD->Out(pdTrace, "Beginning to send UN message...");
@@ -343,7 +343,7 @@
                }
        }
 SentBytesCount += total_sent ;
-G.Out(pdGendoc,"exit  SocketUN::send");
+// G.Out(pdGendoc,"exit  SocketUN::send");
 }
 
 // ----------------------------------------------------------------------------
@@ -378,7 +378,7 @@
 SocketUN::receive(const unsigned char *buffer, size_t Size)
     throw (NetworkError, NetworkSignal)
 {
-G.Out(pdGendoc,"enter SocketUN::receive");
+// G.Out(pdGendoc,"enter SocketUN::receive");
 
 assert(_est_init_un);
 
@@ -454,7 +454,7 @@
 RBLength - Size);
 RBLength -= Size ;
 #endif
-G.Out(pdGendoc,"exit  SocketUN::receive");
+// G.Out(pdGendoc,"exit  SocketUN::receive");
 }
 
 } // namespace certi

Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.74
retrieving revision 3.75
diff -u -b -r3.74 -r3.75
--- libRTI/RTIambassador.cc     1 Apr 2008 13:00:47 -0000       3.74
+++ libRTI/RTIambassador.cc     3 Apr 2008 15:21:52 -0000       3.75
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambassador.cc,v 3.74 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIambassador.cc,v 3.75 2008/04/03 15:21:52 rousse Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -84,7 +84,7 @@
     throw RTI::RTIinternalError("");
 }
 
-} // anonymous namesapce
+} // anonymous namespace
 
 // ----------------------------------------------------------------------------
 //! Start RTIambassador processes for communication with RTIG.
@@ -2915,4 +2915,4 @@
     privateRefs->executeService(&req, &rep);
 }
 
-// $Id: RTIambassador.cc,v 3.74 2008/04/01 13:00:47 rousse Exp $
+// $Id: RTIambassador.cc,v 3.75 2008/04/03 15:21:52 rousse Exp $