[certi-cvs] certi/RTIA RTIA.cc RTIA_federate.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/11/22 14:56:53

Modified files:
        RTIA           : RTIA.cc RTIA_federate.cc 

Log message:
        More symbolic (named) trace instead of numeric ones

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA.cc?cvsroot=certi&r1=3.34&r2=3.35
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.114&r2=3.115

Patches:
Index: RTIA.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA.cc,v
retrieving revision 3.34
retrieving revision 3.35
diff -u -b -r3.34 -r3.35
--- RTIA.cc     11 Aug 2010 16:45:14 -0000      3.34
+++ RTIA.cc     22 Nov 2010 14:56:53 -0000      3.35
@@ -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.cc,v 3.34 2010/08/11 16:45:14 erk Exp $
+// $Id: RTIA.cc,v 3.35 2010/11/22 14:56:53 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -156,8 +156,9 @@
             break ;
           case 1:
             processNetworkMessage(msg_tcp_udp);
-            if (tm->_tick_state == TimeManagement::TICK_BLOCKING)
+            if (tm->_tick_state == TimeManagement::TICK_BLOCKING) {
                 processOngoingTick();
+            }
             break ;
           case 2:
             processFederateRequest(msg_un);
@@ -177,4 +178,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA.cc,v 3.34 2010/08/11 16:45:14 erk Exp $
+// $Id: RTIA.cc,v 3.35 2010/11/22 14:56:53 erk Exp $

Index: RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.114
retrieving revision 3.115
diff -u -b -r3.114 -r3.115
--- RTIA_federate.cc    20 Nov 2010 16:39:28 -0000      3.114
+++ RTIA_federate.cc    22 Nov 2010 14:56:53 -0000      3.115
@@ -100,7 +100,7 @@
 void
 RTIA::chooseFederateProcessing(Message *req, Message* rep, TypeException &e)
 {
-       G.Out(pdGendoc,"enter RTIA::chooseFederateProcessing for type = 
%d",req->getMessageType());
+       G.Out(pdGendoc,"enter RTIA::chooseFederateProcessing for msg <%s> 
(type=%d)",req->getMessageName(), req->getMessageType());
 
        // Verify not in saving or restoring state.
        // May throw SaveInProgress or RestoreInProgress
@@ -1217,7 +1217,8 @@
                TRq = static_cast<M_Tick_Request *>(req);
                // called when tick() is invoked
                if (tm->_tick_state != TimeManagement::NO_TICK) {
-                       throw RTIinternalError("TICK_REQUEST cannot be called 
recursively");
+
+                       throw RTIinternalError(stringize() << "TICK_REQUEST 
cannot be called recursively (state=" << static_cast<int>(tm->_tick_state) 
<<")");
                }
 
                tm->_tick_multiple = TRq->getMultiple();
@@ -1302,7 +1303,7 @@
 
        default:
                D.Out(pdExcept,
-                               "Receiving Message from Federate, Unknown Type 
%d.", req->getMessageType());
+                               "Receiving Message from Federate, Unknown Type 
%s/%d.", req->getMessageName(), req->getMessageType());
                throw RTIinternalError("");
        }
        stat.federateService(req->getMessageType());
@@ -1332,6 +1333,8 @@
                        if (tm->_tick_result &&
                                        tm->_tick_multiple &&
                                        
1e-9*clock->getDeltaNanoSecond(tm->_tick_clock_start) < tm->_tick_max_tick) {
+
+
                                tm->_tick_state = TimeManagement::TICK_CALLBACK;
                        }
                        else {