[certi-cvs] certi libCERTI/NetworkMessage_RW.cc libCERTI/NM... [br_DEV_HETEROGENEOUS]

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Branch:         br_DEV_HETEROGENEOUS
Changes by:     Eric NOULARD <erk>      08/04/11 14:08:19

Modified files:
        libCERTI       : NetworkMessage_RW.cc NM_Classes.cc 
        RTIG           : RTIG_processing.cc RTIG.cc 

Log message:
        Fix stupid typo:
        serialize instead of DEserialize in PUBLISH_OBJECT

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.45.2.7&r2=3.45.2.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.10&r2=1.1.2.11
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.56.2.6&r2=3.56.2.7
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.36.2.4&r2=3.36.2.5

Patches:
Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45.2.7
retrieving revision 3.45.2.8
diff -u -b -r3.45.2.7 -r3.45.2.8
--- libCERTI/NetworkMessage_RW.cc       10 Apr 2008 20:43:01 -0000      3.45.2.7
+++ libCERTI/NetworkMessage_RW.cc       11 Apr 2008 14:08:18 -0000      3.45.2.8
@@ -16,10 +16,8 @@
 // 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.2.7 2008/04/10 20:43:01 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.8 2008/04/11 14:08:18 erk Exp $
 // ----------------------------------------------------------------------------
-
-
 #include "NetworkMessage.hh"
 #include "PrettyDebug.hh"
 
@@ -38,8 +36,7 @@
        /* We serialize the common Network messages part 
         * ALL Network Message will contain the following
         */     
-       if ((type==NOT_USED) ||
-          (type==LAST)) {
+       if ((type==NOT_USED) || (type==LAST)) {
                throw RTIinternalError("Invalid network type (not a valid 
type);");
        }
        D.Out(pdDebug, "Serialize <%s>", getName().c_str());
@@ -109,7 +106,7 @@
        serialize();
        /* 2- update message buffer 'reserved bytes' header */
        msgBuf.updateReservedBytes();
-       D.Out(pdDebug,"Sending an msg buffer of <%u> bytes",msgBuf.size());
+       D.Out(pdDebug,"Sending <%s> whose buffer has <%u> 
bytes",getName().c_str(),msgBuf.size());
        //msgBuf.show(msgBuf(0),5);
        /* 3- effectively send the raw message to socket */
        socket->send(static_cast<unsigned char*>(msgBuf(0)), msgBuf.size());
@@ -120,15 +117,14 @@
 NetworkMessage::receive(Socket* socket) throw (NetworkError, NetworkSignal) {
        G.Out(pdGendoc,"enter NetworkMessage::receive");
        /* 0- Reset receive buffer */
-       /* FIXME this reset may not be necessary since we 
-        * do raw-receive + assume-size
+       /* FIXME this reset may not be necessary since we do 
+        * raw-receive + assume-size
         */
        msgBuf.reset();
        /* 1- Read 'reserved bytes' header from socket */
-       D.Out(pdDebug,"Reading %d 'reserved' bytes",msgBuf.reservedBytes);
+       //D.Out(pdDebug,"Reading %d 'reserved' bytes",msgBuf.reservedBytes);
        socket->receive(msgBuf(0), msgBuf.reservedBytes);       
-       //msgBuf.show(msgBuf(0),5);
-       fflush(stdout);
+       //msgBuf.show(msgBuf(0),5);fflush(stdout);
        /* 2- update (assume) complete message size from reserved bytes */
        msgBuf.assumeSizeFromReservedBytes();
        D.Out(pdDebug,"Got a MsgBuf of size %d bytes (including %d 
reserved)",msgBuf.size(),msgBuf.reservedBytes);
@@ -144,4 +140,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.45.2.7 2008/04/10 20:43:01 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.8 2008/04/11 14:08:18 erk Exp $

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- libCERTI/NM_Classes.cc      10 Apr 2008 20:43:01 -0000      1.1.2.10
+++ libCERTI/NM_Classes.cc      11 Apr 2008 14:08:19 -0000      1.1.2.11
@@ -325,7 +325,7 @@
         * the loop is void which is done on purpose.
         * (this is a feature not a bug :-) 
         */             
-       for (i = 0 ; i < handleArraySize ; i ++) {
+       for (i = 0 ; i < handleArraySize ; ++i) {
                msgBuf.write_uint16(handleArray[i]);
        }
 
@@ -777,7 +777,7 @@
 }
 void
 NM_Publish_Object_Class::deserialize() {
-       Super::serialize();
+       Super::deserialize();
        objectClass = msgBuf.read_int32();
 }
 /*<END>---------- Publish_Object_Class ------------<END>*/

Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.56.2.6
retrieving revision 3.56.2.7
diff -u -b -r3.56.2.6 -r3.56.2.7
--- RTIG/RTIG_processing.cc     10 Apr 2008 20:43:00 -0000      3.56.2.6
+++ RTIG/RTIG_processing.cc     11 Apr 2008 14:08:19 -0000      3.56.2.7
@@ -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.56.2.6 2008/04/10 20:43:00 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.7 2008/04/11 14:08:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -1324,4 +1324,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.56.2.6 2008/04/10 20:43:00 erk Exp $
+// $Id: RTIG_processing.cc,v 3.56.2.7 2008/04/11 14:08:19 erk Exp $

Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.36.2.4
retrieving revision 3.36.2.5
diff -u -b -r3.36.2.4 -r3.36.2.5
--- RTIG/RTIG.cc        10 Apr 2008 14:57:49 -0000      3.36.2.4
+++ RTIG/RTIG.cc        11 Apr 2008 14:08:19 -0000      3.36.2.5
@@ -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.cc,v 3.36.2.4 2008/04/10 14:57:49 erk Exp $
+// $Id: RTIG.cc,v 3.36.2.5 2008/04/11 14:08:19 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -85,7 +85,7 @@
 Socket*
 RTIG::chooseProcessingMethod(Socket *link, NetworkMessage *msg)
 {
-    G.Out(pdGendoc,"enter RTIG::chooseProcessingMethod type 
%d",msg->getType());
+    G.Out(pdGendoc,"enter RTIG::chooseProcessingMethod type %d 
(%s)",msg->getType(),msg->getName().c_str());
     // This may throw a security error.
     if ( msg->getType() != NetworkMessage::DESTROY_FEDERATION_EXECUTION)
        socketServer.checkMessage(link->returnSocket(), msg);   
@@ -507,7 +507,6 @@
 {
     NetworkMessage* msg ;
     
-
     char buffer[BUFFER_EXCEPTION_REASON_SIZE] ; // To store the exception 
reason
     G.Out(pdGendoc,"enter RTIG::processIncomingMessage");
     if (link == NULL) {
@@ -987,4 +986,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG.cc,v 3.36.2.4 2008/04/10 14:57:49 erk Exp $
+// $Id: RTIG.cc,v 3.36.2.5 2008/04/11 14:08:19 erk Exp $