certi/test/Billard Billard.cc

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Pierre Siron <siron>    08/02/22 09:56:28

Modified files:
        test/Billard   : Billard.cc 

Log message:
        This new version of Billard uses the time parameter
        of the timeAdvanceGrant service.
        Therefore a queryFederateTime call is removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.28&r2=3.29

Patches:
Index: Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.28
retrieving revision 3.29
diff -u -b -r3.28 -r3.29
--- Billard.cc  13 Feb 2008 16:28:30 -0000      3.28
+++ Billard.cc  22 Feb 2008 09:56:28 -0000      3.29
@@ -419,7 +419,14 @@
 Billard::step()
 {
     granted = false ;
+
+    try {
     rtiamb.queryFederateTime(localTime);
+    }
+    catch (RTI::Exception& e) {
+        D.Out(pdExcept,
+              "**** Exception asking for federate local time : ", &e);
+    }
 
     try {
         RTIfedTime time_aux(localTime.getTime()+TIME_STEP.getTime());
@@ -448,16 +455,6 @@
             throw ;
         }
     }
-    try {
-        rtiamb.queryFederateTime(localTime);
-    }
-    catch (RTI::Exception& e) {
-        D.Out(pdExcept,
-              "**** Exception asking for federate local time : ", &e);
-    }
-
-    D.Out(pdTrace, "Time advanced, local time is now %.2f.",
-          localTime.getTime());
 
     RTIfedTime next_step(localTime + TIME_STEP);
 
@@ -1081,9 +1078,12 @@
 /** Callback : time advance granted
  */
 void
-Billard::timeAdvanceGrant(const RTI::FedTime& /*theTime*/)
+Billard::timeAdvanceGrant(const RTI::FedTime& theTime)
     throw (RTI::InvalidFederationTime, RTI::TimeAdvanceWasNotInProgress, 
           RTI::FederateInternalError)
 {    
     granted = true ;
+    localTime = theTime ;
+    D.Out(pdTrace, "Time advanced, local time is now %.2f.",
+          localTime.getTime());
 }