certi RTIA/RTIA_federate.cc RTIA/TimeManagement...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Pierre Siron <siron>    07/11/12 14:49:10

Modified files:
        RTIA           : RTIA_federate.cc TimeManagement.cc 
        libCERTI       : Exception.hh 
        libRTI         : RTIambPrivateRefs.cc 

Log message:
        End of the enableAsynchronousDelivery implementation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.47&r2=3.48
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.21&r2=3.22
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Exception.hh?cvsroot=certi&r1=3.1&r2=3.2
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambPrivateRefs.cc?cvsroot=certi&r1=3.3&r2=3.4

Patches:
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.47
retrieving revision 3.48
diff -u -b -r3.47 -r3.48
--- RTIA/RTIA_federate.cc       31 Oct 2007 10:30:23 -0000      3.47
+++ RTIA/RTIA_federate.cc       12 Nov 2007 14:49:10 -0000      3.48
@@ -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_federate.cc,v 3.47 2007/10/31 10:30:23 erk Exp $
+// $Id: RTIA_federate.cc,v 3.48 2007/11/12 14:49:10 siron Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -574,20 +574,27 @@
       case Message::QUERY_LBTS:
         D.Out(pdTrace, "Receiving Message from Federate, type RequestLBTS.");
 
+        rep.setFederationTime(tm->requestLBTS());
+        break ;
+
       case Message::ENABLE_ASYNCHRONOUS_DELIVERY:
         D.Out(pdTrace, "Receiving Message from Federate, "
                        "type EnableAsynchronousDelivery.");
+        if (! tm->_asynchronous_delivery)
         tm->_asynchronous_delivery = true ;
+        else
+           e = e_AsynchronousDeliveryAlreadyEnabled;
         break ;
 
       case Message::DISABLE_ASYNCHRONOUS_DELIVERY:
         D.Out(pdTrace, "Receiving Message from Federate, "
                        "type DisableAsynchronousDelivery.");
+        if (tm->_asynchronous_delivery)
         tm->_asynchronous_delivery = false ;
+        else
+          e = e_AsynchronousDeliveryAlreadyDisabled;
         break ;
 
-        rep.setFederationTime(tm->requestLBTS());
-        break ;
 
       case Message::QUERY_FEDERATE_TIME:
         D.Out(pdTrace,
@@ -1210,4 +1217,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: RTIA_federate.cc,v 3.47 2007/10/31 10:30:23 erk Exp $
+// $Id: RTIA_federate.cc,v 3.48 2007/11/12 14:49:10 siron Exp $

Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -b -r3.21 -r3.22
--- RTIA/TimeManagement.cc      6 Nov 2007 13:46:08 -0000       3.21
+++ RTIA/TimeManagement.cc      12 Nov 2007 14:49:10 -0000      3.22
@@ -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.21 2007/11/06 13:46:08 rousse Exp $
+// $Id: TimeManagement.cc,v 3.22 2007/11/12 14:49:10 siron Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -599,7 +599,7 @@
 
     // 2nd try, give a FIFO message. (discoverObject, etc.)
     if (!msg_donne)
-        if ( _asynchronous_delivery || _avancee_en_cours )
+        if ( _asynchronous_delivery || (_avancee_en_cours != PAS_D_AVANCEE))
           // to exclude the case not asynchronous_delivery and
           // not time advancing
           msg = queues->giveFifoMessage(msg_donne, msg_restant);
@@ -747,4 +747,4 @@
 
 }} // namespaces
 
-// $Id: TimeManagement.cc,v 3.21 2007/11/06 13:46:08 rousse Exp $
+// $Id: TimeManagement.cc,v 3.22 2007/11/12 14:49:10 siron Exp $

Index: libCERTI/Exception.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Exception.hh,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -b -r3.1 -r3.2
--- libCERTI/Exception.hh       20 Apr 2007 08:27:07 -0000      3.1
+++ libCERTI/Exception.hh       12 Nov 2007 14:49:10 -0000      3.2
@@ -20,7 +20,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: Exception.hh,v 3.1 2007/04/20 08:27:07 rousse Exp $
+// $Id: Exception.hh,v 3.2 2007/11/12 14:49:10 siron Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef _CERTI_EXCEPTION_HH
@@ -33,6 +33,8 @@
 typedef enum {
     e_NO_EXCEPTION = 0,
     e_ArrayIndexOutOfBounds,
+    e_AsynchronousDeliveryAlreadyEnabled,
+    e_AsynchronousDeliveryAlreadyDisabled,
     e_AttributeAlreadyOwned,
     e_AttributeAlreadyBeingAcquired,
     e_AttributeAlreadyBeingDivested,
@@ -118,4 +120,4 @@
 
 #endif // _CERTI_EXCEPTION_HH
 
-// $Id: Exception.hh,v 3.1 2007/04/20 08:27:07 rousse Exp $
+// $Id: Exception.hh,v 3.2 2007/11/12 14:49:10 siron Exp $

Index: libRTI/RTIambPrivateRefs.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambPrivateRefs.cc,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -b -r3.3 -r3.4
--- libRTI/RTIambPrivateRefs.cc 31 Oct 2007 10:30:24 -0000      3.3
+++ libRTI/RTIambPrivateRefs.cc 12 Nov 2007 14:49:10 -0000      3.4
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: RTIambPrivateRefs.cc,v 3.3 2007/10/31 10:30:24 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.4 2007/11/12 14:49:10 siron Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -118,6 +118,16 @@
           throw ArrayIndexOutOfBounds(msg->getExceptionReason());
       } break ;
 
+      case e_AsynchronousDeliveryAlreadyEnabled: {
+          D.Out(pdExcept, "Throwing e_AsynchronousDeliveryAlreadyEnabled 
exception.");
+          throw AsynchronousDeliveryAlreadyEnabled(msg->getExceptionReason());
+      } break ;
+
+      case e_AsynchronousDeliveryAlreadyDisabled: {
+          D.Out(pdExcept, "Throwing e_AsynchronousDeliveryAlreadyDisabled 
exception.");
+          throw AsynchronousDeliveryAlreadyDisabled(msg->getExceptionReason());
+      } break ;
+
       case e_AttributeAlreadyOwned: {
           D.Out(pdExcept, "Throwing e_AttributeAlreadyOwned exception.");
           throw AttributeAlreadyOwned(msg->getExceptionReason());
@@ -522,4 +532,4 @@
     }
 }
 
-// $Id: RTIambPrivateRefs.cc,v 3.3 2007/10/31 10:30:24 erk Exp $
+// $Id: RTIambPrivateRefs.cc,v 3.4 2007/11/12 14:49:10 siron Exp $