[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
certi RTIA/RTIA_federate.cc RTIA/TimeManagement...
|
From: |
certi-cvs |
|
Subject: |
certi RTIA/RTIA_federate.cc RTIA/TimeManagement... |
|
Date: |
Tue, 26 Feb 2008 08:56:11 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Pierre Siron <siron> 08/02/26 08:56:11
Modified files:
RTIA : RTIA_federate.cc TimeManagement.cc
TimeManagement.hh
libCERTI : Message_R.cc Message_W.cc
libRTI : RTIambassador.cc
Log message:
Implementation of some time query services
(cf. task #6901).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.64&r2=3.65
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.27&r2=3.28
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.18&r2=3.19
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.70&r2=3.71
Patches:
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.64
retrieving revision 3.65
diff -u -b -r3.64 -r3.65
--- RTIA/RTIA_federate.cc 25 Feb 2008 10:28:13 -0000 3.64
+++ RTIA/RTIA_federate.cc 26 Feb 2008 08:56:10 -0000 3.65
@@ -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.64 2008/02/25 10:28:13 rousse Exp $
+// $Id: RTIA_federate.cc,v 3.65 2008/02/26 08:56:10 siron Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -672,7 +672,10 @@
break ;
case Message::QUERY_MIN_NEXT_EVENT_TIME:
- e = e_UnimplementedService ;
+ D.Out(pdTrace,
+ "Receiving Message from Federate, type QueryMinNextEventTime.");
+
+ rep.setFederationTime(tm->requestMinNextEventTime());
break ;
case Message::MODIFY_LOOKAHEAD:
@@ -1303,4 +1306,4 @@
}} // namespace certi/rtia
-// $Id: RTIA_federate.cc,v 3.64 2008/02/25 10:28:13 rousse Exp $
+// $Id: RTIA_federate.cc,v 3.65 2008/02/26 08:56:10 siron Exp $
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -b -r3.27 -r3.28
--- RTIA/TimeManagement.cc 25 Feb 2008 10:28:13 -0000 3.27
+++ RTIA/TimeManagement.cc 26 Feb 2008 08:56:10 -0000 3.28
@@ -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.27 2008/02/25 10:28:13 rousse Exp $
+// $Id: TimeManagement.cc,v 3.28 2008/02/26 08:56:10 siron Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -496,6 +496,27 @@
}
// ----------------------------------------------------------------------------
+//!Return the min of LBTS and the time stamp of the next TSO message
+FederationTime
+TimeManagement::requestMinNextEventTime()
+{
+ FederationTime dateTSO ;
+ FederationTime dateMNET ;
+ bool found ;
+
+ queues->nextTsoDate(found, dateTSO) ;
+
+ if (!found)
+ dateMNET = _LBTS ;
+ else
+ dateMNET = (_LBTS <= dateTSO ? _LBTS : dateTSO) ;
+
+ D.Out(pdRegister, "Minimum Next Event Time : %f.", dateMNET);
+
+ return dateMNET ;
+}
+
+// ----------------------------------------------------------------------------
void
TimeManagement::setLookahead(FederationTimeDelta lookahead, TypeException &e)
{
@@ -770,4 +791,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.27 2008/02/25 10:28:13 rousse Exp $
+// $Id: TimeManagement.cc,v 3.28 2008/02/26 08:56:10 siron Exp $
Index: RTIA/TimeManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- RTIA/TimeManagement.hh 18 Feb 2008 13:37:30 -0000 3.12
+++ RTIA/TimeManagement.hh 26 Feb 2008 08:56:10 -0000 3.13
@@ -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.hh,v 3.12 2008/02/18 13:37:30 siron Exp $
+// $Id: TimeManagement.hh,v 3.13 2008/02/26 08:56:10 siron Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIA_TIME_MANAGEMENT_HH
@@ -88,6 +88,7 @@
FederationTime requestFederationTime();
FederationTime requestFederateTime() { return(_heure_courante); };
FederationTimeDelta requestLookahead();
+ FederationTime requestMinNextEventTime();
FederationTime requestLBTS() { return _LBTS ; };
bool requestContraintState() { return _est_contraint ; };
bool requestRegulateurState() { return _est_regulateur ; };
@@ -132,4 +133,4 @@
#endif // CERTI_RTIA_TIME_MANAGEMENT_HH
-// $Id: TimeManagement.hh,v 3.12 2008/02/18 13:37:30 siron Exp $
+// $Id: TimeManagement.hh,v 3.13 2008/02/26 08:56:10 siron Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/Message_R.cc 22 Feb 2008 07:12:28 -0000 3.15
+++ libCERTI/Message_R.cc 26 Feb 2008 08:56:10 -0000 3.16
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.15 2008/02/22 07:12:28 rousse Exp $
+// $Id: Message_R.cc,v 3.16 2008/02/26 08:56:10 siron Exp $
// ----------------------------------------------------------------------------
@@ -626,6 +626,7 @@
// ------- federationTime useful
case QUERY_LBTS:
+ case QUERY_MIN_NEXT_EVENT_TIME:
case QUERY_FEDERATE_TIME:
case TIME_ADVANCE_REQUEST:
case NEXT_EVENT_REQUEST:
@@ -747,4 +748,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.15 2008/02/22 07:12:28 rousse Exp $
+// $Id: Message_R.cc,v 3.16 2008/02/26 08:56:10 siron Exp $
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- libCERTI/Message_W.cc 22 Feb 2008 07:12:28 -0000 3.18
+++ libCERTI/Message_W.cc 26 Feb 2008 08:56:10 -0000 3.19
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.18 2008/02/22 07:12:28 rousse Exp $
+// $Id: Message_W.cc,v 3.19 2008/02/26 08:56:10 siron Exp $
// ----------------------------------------------------------------------------
@@ -654,6 +654,7 @@
// ------- federationTime useful
case QUERY_LBTS:
+ case QUERY_MIN_NEXT_EVENT_TIME:
case QUERY_FEDERATE_TIME:
case TIME_ADVANCE_REQUEST:
case NEXT_EVENT_REQUEST:
@@ -726,4 +727,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.18 2008/02/22 07:12:28 rousse Exp $
+// $Id: Message_W.cc,v 3.19 2008/02/26 08:56:10 siron Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.70
retrieving revision 3.71
diff -u -b -r3.70 -r3.71
--- libRTI/RTIambassador.cc 25 Feb 2008 10:28:14 -0000 3.70
+++ libRTI/RTIambassador.cc 26 Feb 2008 08:56:11 -0000 3.71
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.70 2008/02/25 10:28:14 rousse Exp $
+// $Id: RTIambassador.cc,v 3.71 2008/02/26 08:56:11 siron Exp $
// ----------------------------------------------------------------------------
@@ -1881,7 +1881,13 @@
RestoreInProgress,
RTIinternalError)
{
- theTime = RTIfedTime(0.0);
+ Message req, rep ;
+
+ req.type = Message::QUERY_MIN_NEXT_EVENT_TIME ;
+ privateRefs->executeService(&req, &rep);
+
+ theTime = rep.getFedTime();
+
}
// ----------------------------------------------------------------------------
@@ -2906,4 +2912,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.70 2008/02/25 10:28:14 rousse Exp $
+// $Id: RTIambassador.cc,v 3.71 2008/02/26 08:56:11 siron Exp $
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- certi RTIA/RTIA_federate.cc RTIA/TimeManagement...,
certi-cvs <=