certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi libCERTI/NetworkMessage.hh libCERTI/Netwo...


From: certi-cvs
Subject: [certi-cvs] certi libCERTI/NetworkMessage.hh libCERTI/Netwo...
Date: Wed, 07 May 2008 15:37:38 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/05/07 15:37:38

Modified files:
        libCERTI       : NetworkMessage.hh NetworkMessage_RW.cc 
                         NetworkMessage.cc Interaction.cc 
        RTIA           : TimeManagement.cc ObjectManagement.cc Files.cc 
                         RTIA_network.cc FederationManagement.cc 

Log message:
        Fix bug #23187 : removeObjectInstance with null time
        Time was conveyed in network messages but not in Federate<->RTIA 
messages

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.31&r2=3.32
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.cc?cvsroot=certi&r1=3.30&r2=3.31
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Interaction.cc?cvsroot=certi&r1=3.36&r2=3.37
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.36&r2=3.37
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/ObjectManagement.cc?cvsroot=certi&r1=3.40&r2=3.41
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Files.cc?cvsroot=certi&r1=3.9&r2=3.10
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.60&r2=3.61

Patches:
Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.31
retrieving revision 3.32
diff -u -b -r3.31 -r3.32
--- libCERTI/NetworkMessage.hh  26 Apr 2008 14:59:40 -0000      3.31
+++ libCERTI/NetworkMessage.hh  7 May 2008 15:37:37 -0000       3.32
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.31 2008/04/26 14:59:40 erk Exp $
+// $Id: NetworkMessage.hh,v 3.32 2008/05/07 15:37:37 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -204,11 +204,6 @@
 
        void setAHS(const AttributeHandle *, int);
 
-
-       void setBoolean(bool);
-       bool getBoolean() const { return boolean ; };
-
-
        UShort number ;
 
        std::string federationName ;
@@ -350,4 +345,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.31 2008/04/26 14:59:40 erk Exp $
+// $Id: NetworkMessage.hh,v 3.32 2008/05/07 15:37:37 erk Exp $

Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- libCERTI/NetworkMessage_RW.cc       26 Apr 2008 14:59:41 -0000      3.47
+++ libCERTI/NetworkMessage_RW.cc       7 May 2008 15:37:37 -0000       3.48
@@ -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.47 2008/04/26 14:59:41 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.48 2008/05/07 15:37:37 erk Exp $
 // ----------------------------------------------------------------------------
 #include "NetworkMessage.hh"
 #include "PrettyDebug.hh"
@@ -54,6 +54,7 @@
        msgBuffer.write_bool(isDated);
        if (isDated) {
                msgBuffer.write_double(date);
+               D.Out(pdDebug, "Sent Message date is  <%f>", date);
        }       
        msgBuffer.write_bool(isLabelled);
        if (isLabelled) {
@@ -86,6 +87,7 @@
        isDated = msgBuffer.read_bool();
        if (isDated) {
                date = msgBuffer.read_double();
+               D.Out(pdDebug, "Received Message date is  <%f>", date);
        }
        isLabelled = msgBuffer.read_bool();
        if (isLabelled) {
@@ -144,4 +146,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.47 2008/04/26 14:59:41 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.48 2008/05/07 15:37:37 erk Exp $

Index: libCERTI/NetworkMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.cc,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -b -r3.30 -r3.31
--- libCERTI/NetworkMessage.cc  28 Apr 2008 17:20:19 -0000      3.30
+++ libCERTI/NetworkMessage.cc  7 May 2008 15:37:37 -0000       3.31
@@ -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.cc,v 3.30 2008/04/28 17:20:19 erk Exp $
+// $Id: NetworkMessage.cc,v 3.31 2008/05/07 15:37:37 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -216,17 +216,6 @@
     }
 }
 
-// ----------------------------------------------------------------------------
-/** Store a boolean into a NetworkMessage
-    @param[in] the_bool boolean
-*/
-void
-NetworkMessage::setBoolean(bool the_bool)
-{
-    boolean = the_bool ;
-}
-
-
 } // namespace certi
 
-// $Id: NetworkMessage.cc,v 3.30 2008/04/28 17:20:19 erk Exp $
+// $Id: NetworkMessage.cc,v 3.31 2008/05/07 15:37:37 erk Exp $

Index: libCERTI/Interaction.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Interaction.cc,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -b -r3.36 -r3.37
--- libCERTI/Interaction.cc     26 Apr 2008 14:59:40 -0000      3.36
+++ libCERTI/Interaction.cc     7 May 2008 15:37:37 -0000       3.37
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Interaction.cc,v 3.36 2008/04/26 14:59:40 erk Exp $
+// $Id: Interaction.cc,v 3.37 2008/05/07 15:37:37 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -471,8 +471,6 @@
         answer->federation = server->federation();
         answer->federate = federate_handle ;
         answer->interactionClass = handle ; // Interaction Class Handle
-       answer->setBoolean(false) ; // without time
-
         answer->setLabel(the_tag);
 
         answer->handleArraySize = list_size ;
@@ -551,4 +549,4 @@
 
 } // namespace certi
 
-// $Id: Interaction.cc,v 3.36 2008/04/26 14:59:40 erk Exp $
+// $Id: Interaction.cc,v 3.37 2008/05/07 15:37:37 erk Exp $

Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -b -r3.36 -r3.37
--- RTIA/TimeManagement.cc      6 May 2008 13:36:19 -0000       3.36
+++ RTIA/TimeManagement.cc      7 May 2008 15:37:38 -0000       3.37
@@ -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: TimeManagement.cc,v 3.36 2008/05/06 13:36:19 erk Exp $
+// $Id: TimeManagement.cc,v 3.37 2008/05/07 15:37:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -932,4 +932,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.36 2008/05/06 13:36:19 erk Exp $
+// $Id: TimeManagement.cc,v 3.37 2008/05/07 15:37:38 erk Exp $

Index: RTIA/ObjectManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/ObjectManagement.cc,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -b -r3.40 -r3.41
--- RTIA/ObjectManagement.cc    7 May 2008 09:55:01 -0000       3.40
+++ RTIA/ObjectManagement.cc    7 May 2008 15:37:38 -0000       3.41
@@ -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: ObjectManagement.cc,v 3.40 2008/05/07 09:55:01 rousse Exp $
+// $Id: ObjectManagement.cc,v 3.41 2008/05/07 15:37:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -491,6 +491,7 @@
     req.setObject(the_object);
     req.setEventRetraction(the_event);
     req.setTag(the_tag);
+    req.setFederationTime(theTime);
     req.setBoolean(true);
 
     comm->requestFederateService(&req);
@@ -813,4 +814,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: ObjectManagement.cc,v 3.40 2008/05/07 09:55:01 rousse Exp $
+// $Id: ObjectManagement.cc,v 3.41 2008/05/07 15:37:38 erk Exp $

Index: RTIA/Files.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Files.cc,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -b -r3.9 -r3.10
--- RTIA/Files.cc       26 Apr 2008 14:59:41 -0000      3.9
+++ RTIA/Files.cc       7 May 2008 15:37:38 -0000       3.10
@@ -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: Files.cc,v 3.9 2008/04/26 14:59:41 erk Exp $
+// $Id: Files.cc,v 3.10 2008/05/07 15:37:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -129,9 +129,9 @@
             }
             return buffer_msg ;
         }
-        else return 0 ;
+        else return NULL;
     }
-    else return 0 ;
+    else return NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -186,4 +186,4 @@
 
 }} // namespaces
 
-// $Id: Files.cc,v 3.9 2008/04/26 14:59:41 erk Exp $
+// $Id: Files.cc,v 3.10 2008/05/07 15:37:38 erk Exp $

Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- RTIA/RTIA_network.cc        26 Apr 2008 14:59:42 -0000      3.23
+++ RTIA/RTIA_network.cc        7 May 2008 15:37:38 -0000       3.24
@@ -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: RTIA_network.cc,v 3.23 2008/04/26 14:59:42 erk Exp $
+// $Id: RTIA_network.cc,v 3.24 2008/05/07 15:37:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -118,7 +118,7 @@
          // criteria. Otherwise, a single message will be enqueue in FIFO.
  
          // Here we have to consider RAV without time
-         if ( !msg->getBoolean() )
+         if ( !msg->isDated)
              {
              // without time
              updateOrder = RECEIVE ;
@@ -162,7 +162,7 @@
             "Receving Message from RTIG, type 
NetworkMessage::RECEIVE_INTERACTION.");
 
          // Here we have to consider RAV without time
-         if ( !msg->getBoolean() )
+         if ( !msg->isDated)
              {
              // without time
              interactionOrder = RECEIVE ;
@@ -194,13 +194,12 @@
           D.Out(pdTrace, "Receving Message from RTIG, \
                          type NetworkMessage::REMOVE_OBJECT.");
 
-          if (tm->requestContraintState() && msg->getBoolean()) {
+          if (tm->requestContraintState() && msg->isDated) {
               // Verify that received TSO timestamp is >= current
               // time + lookahead
               queues->insertTsoMessage(msg);
           }
           else {
-             msg->setBoolean(false);
               queues->insertFifoMessage(msg);
          }
 
@@ -342,4 +341,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA_network.cc,v 3.23 2008/04/26 14:59:42 erk Exp $
+// $Id: RTIA_network.cc,v 3.24 2008/05/07 15:37:38 erk Exp $

Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.60
retrieving revision 3.61
diff -u -b -r3.60 -r3.61
--- RTIA/FederationManagement.cc        3 May 2008 20:14:44 -0000       3.60
+++ RTIA/FederationManagement.cc        7 May 2008 15:37:38 -0000       3.61
@@ -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: FederationManagement.cc,v 3.60 2008/05/03 20:14:44 erk Exp $
+// $Id: FederationManagement.cc,v 3.61 2008/05/07 15:37:38 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -509,8 +509,6 @@
         req.federate = federate ;
         req.setLabel(label);
         req.setTag(tag);
-        // no federates set so boolean must be false
-        req.setBoolean(false) ;
 
         G.Out(pdGendoc,"      registerSynchronization====> send Message to 
RTIG");
 
@@ -559,8 +557,6 @@
         req.federate = federate ;
         req.setLabel(label);
         req.setTag(tag);
-        // federates set exists so boolean must be true
-        req.setBoolean(true) ;
         req.handleArraySize = array_size ;
         for ( int j=0 ; j < array_size ; j++)
             req.handleArray[j] = fed_array[j] ;
@@ -730,8 +726,6 @@
     req.setLabel(label);
     req.federation = _numero_federation ;
     req.federate = federate ;
-    // boolean true because with time
-    req.setBoolean(true);
 
     G.Out(pdGendoc,"      requestFederationSave====>send Message R_F_S to 
RTIG");
 
@@ -760,9 +754,6 @@
     req.setLabel(label);
     req.federation = _numero_federation ;
     req.federate = federate ;
-    // boolean false because without time
-    req.setBoolean(false);
-
     G.Out(pdGendoc,"      requestFederationSave====>send Message R_F_S to 
RTIG");
 
     comm->sendMessage(&req);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]