[certi-cvs] certi RTIG/RTIG_processing.cc RTIG/Federation.c...

certi-cvs
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIG/RTIG_processing.cc RTIG/Federation.c...

From:	certi-cvs
Subject:	[certi-cvs] certi RTIG/RTIG_processing.cc RTIG/Federation.c...
Date:	Tue, 11 Jan 2011 12:29:40 +0000
CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/01/11 12:29:40

Modified files:
        RTIG           : RTIG_processing.cc Federation.cc 
        RTIA           : TimeManagement.cc RTIA_network.cc 

Log message:
        Better trace for NULL [PRIME] message protocol
        RTIA_NULLMSG=D
        RTIG_NULLMSG=D

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.109&r2=3.110
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/Federation.cc?cvsroot=certi&r1=3.137&r2=3.138
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.69&r2=3.70
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_network.cc?cvsroot=certi&r1=3.40&r2=3.41

Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.109
retrieving revision 3.110
diff -u -b -r3.109 -r3.110
--- RTIG/RTIG_processing.cc     2 Oct 2010 13:20:41 -0000       3.109
+++ RTIG/RTIG_processing.cc     11 Jan 2011 12:29:40 -0000      3.110
@@ -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.109 2010/10/02 13:20:41 erk Exp $
+// $Id: RTIG_processing.cc,v 3.110 2011/01/11 12:29:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -38,6 +38,7 @@
 
 static PrettyDebug D("RTIG", __FILE__);
 static PrettyDebug G("GENDOC",__FILE__);
+static PrettyDebug DNULL("RTIG_NULLMSG","[RTIG NULL MSG]");
 
 // ----------------------------------------------------------------------------
 //! Creates a new federation.
@@ -499,24 +500,26 @@
        G.Out(pdGendoc,"exit RTIG::processSetTimeConstrained");
 }
 
-// ----------------------------------------------------------------------------
-//! processMessageNull.
 void
 RTIG::processMessageNull(NetworkMessage *msg, bool anonymous)
 {
        auditServer << "Date " << msg->getDate().getTime();
 
+       DNULL.Out(pdDebug, "Rcv NULL MSG (Federate=%d, Time = %f)",
+               msg->getFederate(), msg->getDate().getTime()) ;
        // Catch all exceptions because RTIA does not expect an answer anyway.
        try {
                federations.updateRegulator(msg->getFederation(),
                                msg->getFederate(),
                                msg->getDate(), anonymous);
        } catch (Exception &e) {}
-}
+} /* end of processMessageNull */
 
 void
 RTIG::processMessageNullPrime(NM_Message_Null_Prime *msg)
 {
+    DNULL.Out(pdDebug, "Rcv NULL PRIME MSG (Federate=%d, Time = %f)",
+                msg->getFederate(), msg->getDate().getTime()) ;
        /*
         * Update the NullPrimeDate of the concerned federate.
         * and check the result in order to decide whether
@@ -1567,4 +1570,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.109 2010/10/02 13:20:41 erk Exp $
+// $Id: RTIG_processing.cc,v 3.110 2011/01/11 12:29:40 erk Exp $

Index: RTIG/Federation.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/Federation.cc,v
retrieving revision 3.137
retrieving revision 3.138
diff -u -b -r3.137 -r3.138
--- RTIG/Federation.cc  9 Nov 2010 22:24:26 -0000       3.137
+++ RTIG/Federation.cc  11 Jan 2011 12:29:40 -0000      3.138
@@ -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: Federation.cc,v 3.137 2010/11/09 22:24:26 erk Exp $
+// $Id: Federation.cc,v 3.138 2011/01/11 12:29:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -72,6 +72,7 @@
 
 static PrettyDebug D("FEDERATION", __FILE__);
 static PrettyDebug G("GENDOC",__FILE__);
+static PrettyDebug DNULL("RTIG_NULLMSG","[RTIG NULL MSG]");
 
 /**
  * \defgroup certi_FOM_FileSearch CERTI FOM file search algorithm
@@ -2081,8 +2082,10 @@
                msg.setFederate(federate_handle);
        }
        msg.setDate(time);
+       DNULL.Out(pdDebug,"Snd NULL MSG (Federate=%d, Time = %f)",
+                           msg.getFederate(), msg.getDate().getTime());
        broadcastAnyMessage(&msg, federate_handle, anonymous);
-}
+} /* end of updateRegulator */
 
 // ----------------------------------------------------------------------------
 // isOwner (isAttributeOwnedByFederate)
@@ -2739,5 +2742,5 @@
 
 }} // namespace certi/rtig
 
-// $Id: Federation.cc,v 3.137 2010/11/09 22:24:26 erk Exp $
+// $Id: Federation.cc,v 3.138 2011/01/11 12:29:40 erk Exp $
 

Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.69
retrieving revision 3.70
diff -u -b -r3.69 -r3.70
--- RTIA/TimeManagement.cc      20 Nov 2010 16:52:44 -0000      3.69
+++ RTIA/TimeManagement.cc      11 Jan 2011 12:29:40 -0000      3.70
@@ -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.69 2010/11/20 16:52:44 erk Exp $
+// $Id: TimeManagement.cc,v 3.70 2011/01/11 12:29:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -33,8 +33,10 @@
 
 namespace {
 
-PrettyDebug D("RTIA_TM", __FILE__);
+PrettyDebug D("RTIA_TM", "[RTIA TM] ");
 static PrettyDebug G("GENDOC",__FILE__) ;
+static PrettyDebug DNULL("RTIA_NULLMSG","[RTIA NULL MSG] ");
+
 const double epsilon2 = 1.0e-4 ;
 
 }
@@ -109,10 +111,10 @@
 
         comm->sendMessage(&msg);
         lastNullMessageDate = logicalTime ;
-        D.Out(pdDebug, "NULL message sent (Time = %f).", 
logicalTime.getTime()) ;
+        DNULL.Out(pdDebug, "NULL message sent (Time = %f).", 
logicalTime.getTime()) ;
     }
     else {
-        D.Out(pdExcept, "NULL message not sent (Time = %f, Last = %f).",
+        DNULL.Out(pdExcept, "NULL message not sent (Time = %f, Last = %f).",
               logicalTime.getTime(), lastNullMessageDate.getTime());
     }
 } /* end of sendNullMessage */
@@ -132,10 +134,10 @@
         msg.setDate(logicalTime) ;
         comm->sendMessage(&msg);
         lastNullPrimeMessageDate = logicalTime ;
-        D.Out(pdDebug, "NULL PRIME message sent (Time = %f).", 
logicalTime.getTime()) ;
+        DNULL.Out(pdDebug, "NULL PRIME message sent (Time = %f).", 
logicalTime.getTime()) ;
     }
     else {
-        D.Out(pdExcept, "NULL PRIME message not sent (Time = %f, Last NULL= 
%f, Last NULL PRIME = %f).",
+        DNULL.Out(pdExcept, "NULL PRIME message not sent (Time = %f, Last 
NULL= %f, Last NULL PRIME = %f).",
               logicalTime.getTime(), lastNullMessageDate.getTime(), 
lastNullPrimeMessageDate.getTime());
     }
 #endif
@@ -1061,4 +1063,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.69 2010/11/20 16:52:44 erk Exp $
+// $Id: TimeManagement.cc,v 3.70 2011/01/11 12:29:40 erk Exp $

Index: RTIA/RTIA_network.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_network.cc,v
retrieving revision 3.40
retrieving revision 3.41
diff -u -b -r3.40 -r3.41
--- RTIA/RTIA_network.cc        8 Nov 2010 15:31:34 -0000       3.40
+++ RTIA/RTIA_network.cc        11 Jan 2011 12:29:40 -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: RTIA_network.cc,v 3.40 2010/11/08 15:31:34 erk Exp $
+// $Id: RTIA_network.cc,v 3.41 2011/01/11 12:29:40 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -35,8 +35,9 @@
 namespace certi {
 namespace rtia {
 
-static PrettyDebug D("RTIA", "(RTIA net) ");
+static PrettyDebug D("RTIA", "[RTIA net] ");
 static PrettyDebug G("GENDOC",__FILE__);
+static PrettyDebug DNULL("RTIA_NULLMSG","[RTIA NULL MSG] ");
 
 // ----------------------------------------------------------------------------
 //! RTIA processes a message coming from network.
@@ -56,6 +57,8 @@
                 msg->getDate().getTime());
 
           //msg->show(std::cout);
+          DNULL.Out(pdDebug, "NULL message received (Federate=%d, Time = %f)",
+                            msg->getFederate(), msg->getDate().getTime()) ;
           tm->update(msg->getFederate(), msg->getDate());
           delete msg ;
           break ;
@@ -401,4 +404,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA_network.cc,v 3.40 2010/11/08 15:31:34 erk Exp $
+// $Id: RTIA_network.cc,v 3.41 2011/01/11 12:29:40 erk Exp $
[Prev in Thread]
Current Thread
[Next in Thread]
[certi-cvs] certi RTIG/RTIG_processing.cc RTIG/Federation.c..., certi-cvs <=
Prev by Date: [certi-cvs] certi/doc build.dox
Next by Date: [certi-cvs] certi libCERTI/BasicMessage.cc libRTI/RTI1516am...
Previous by thread: [certi-cvs] certi/doc build.dox
Next by thread: [certi-cvs] certi libCERTI/BasicMessage.cc libRTI/RTI1516am...
Index(es):
- Date
- Thread