[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi RTIA/FederationManagement.cc RTIA/RTIA_fe...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] certi RTIA/FederationManagement.cc RTIA/RTIA_fe... |
|
Date: |
Tue, 03 Jun 2008 08:45:50 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: ROUSSELOT <rousse> 08/06/03 08:45:50
Modified files:
RTIA : FederationManagement.cc RTIA_federate.cc
TimeManagement.cc TimeManagement.hh
libCERTI : Message_R.cc Message_W.cc
libRTI : RTIambassador.cc
test/Billard : Billard.cc
Log message:
#23460 bug corrected, Carle please test it
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/FederationManagement.cc?cvsroot=certi&r1=3.63&r2=3.64
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/RTIA_federate.cc?cvsroot=certi&r1=3.80&r2=3.81
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.39&r2=3.40
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.hh?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_R.cc?cvsroot=certi&r1=3.25&r2=3.26
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message_W.cc?cvsroot=certi&r1=3.30&r2=3.31
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTIambassador.cc?cvsroot=certi&r1=3.83&r2=3.84
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/Billard.cc?cvsroot=certi&r1=3.33&r2=3.34
Patches:
Index: RTIA/FederationManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/FederationManagement.cc,v
retrieving revision 3.63
retrieving revision 3.64
diff -u -b -r3.63 -r3.64
--- RTIA/FederationManagement.cc 29 May 2008 12:20:33 -0000 3.63
+++ RTIA/FederationManagement.cc 3 Jun 2008 08:45:49 -0000 3.64
@@ -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: FederationManagement.cc,v 3.63 2008/05/29 12:20:33 rousse Exp $
+// $Id: FederationManagement.cc,v 3.64 2008/06/03 08:45:49 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -440,7 +440,7 @@
tm->StopperAvanceTemps();
if (tm->requestRegulateurState())
- tm->setTimeRegulating(false, exception);
+ tm->setTimeRegulating(false,0,0, exception);
msg.federation = _numero_federation ;
msg.federate = federate ;
Index: RTIA/RTIA_federate.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/RTIA_federate.cc,v
retrieving revision 3.80
retrieving revision 3.81
diff -u -b -r3.80 -r3.81
--- RTIA/RTIA_federate.cc 29 May 2008 12:20:34 -0000 3.80
+++ RTIA/RTIA_federate.cc 3 Jun 2008 08:45:49 -0000 3.81
@@ -964,7 +964,7 @@
D.Out(pdTrace,
"Receiving Message from Federate, type SetTimeRegulating.");
- tm->setTimeRegulating(req->getBoolean(), e);
+
tm->setTimeRegulating(req->getBoolean(),req->getFederationTime(),req->getFederationTimeDelta(),
e);
break ;
case Message::ENABLE_TIME_CONSTRAINED:
Index: RTIA/TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.39
retrieving revision 3.40
diff -u -b -r3.39 -r3.40
--- RTIA/TimeManagement.cc 12 May 2008 12:17:00 -0000 3.39
+++ RTIA/TimeManagement.cc 3 Jun 2008 08:45:49 -0000 3.40
@@ -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.39 2008/05/12 12:17:00 erk Exp $
+// $Id: TimeManagement.cc,v 3.40 2008/06/03 08:45:49 rousse Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -627,8 +627,11 @@
}
// ----------------------------------------------------------------------------
+// Rajouter le time et le lookahead
+// Modifier le lookahead courant
void
-TimeManagement::setTimeRegulating(bool etat, TypeException &e)
+TimeManagement::setTimeRegulating(bool etat,FederationTime heure_logique,
+ FederationTimeDelta the_lookahead, TypeException &e)
{
NM_Set_Time_Regulating msg ;
@@ -658,6 +661,9 @@
} else {
msg.regulatorOff();
}
+ // Modifier lookahead courant
+ _lookahead_courant = the_lookahead;
+ // faudrait peut etre remplacer heure courante par le temps en parametre
msg.setDate(_heure_courante + _lookahead_courant);
comm->sendMessage(&msg);
@@ -958,4 +964,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.39 2008/05/12 12:17:00 erk Exp $
+// $Id: TimeManagement.cc,v 3.40 2008/06/03 08:45:49 rousse Exp $
Index: RTIA/TimeManagement.hh
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.hh,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- RTIA/TimeManagement.hh 12 May 2008 12:17:01 -0000 3.17
+++ RTIA/TimeManagement.hh 3 Jun 2008 08:45:49 -0000 3.18
@@ -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.17 2008/05/12 12:17:01 erk Exp $
+// $Id: TimeManagement.hh,v 3.18 2008/06/03 08:45:49 rousse Exp $
// ----------------------------------------------------------------------------
#ifndef CERTI_RTIA_TIME_MANAGEMENT_HH
@@ -90,7 +90,8 @@
// Change Federate Time State
void setLookahead(FederationTimeDelta lookahead, TypeException &e);
void setTimeConstrained(bool etat, TypeException &e);
- void setTimeRegulating(bool etat, TypeException &e);
+ void setTimeRegulating(bool etat,FederationTime heure_logique,
+ FederationTimeDelta lookahead, TypeException &e);
void StopperAvanceTemps() {
_avancee_en_cours = PAS_D_AVANCEE ;
};
@@ -157,4 +158,4 @@
#endif // CERTI_RTIA_TIME_MANAGEMENT_HH
-// $Id: TimeManagement.hh,v 3.17 2008/05/12 12:17:01 erk Exp $
+// $Id: TimeManagement.hh,v 3.18 2008/06/03 08:45:49 rousse Exp $
Index: libCERTI/Message_R.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_R.cc,v
retrieving revision 3.25
retrieving revision 3.26
diff -u -b -r3.25 -r3.26
--- libCERTI/Message_R.cc 30 May 2008 09:49:17 -0000 3.25
+++ libCERTI/Message_R.cc 3 Jun 2008 08:45:49 -0000 3.26
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_R.cc,v 3.25 2008/05/30 09:49:17 rousse Exp $
+// $Id: Message_R.cc,v 3.26 2008/06/03 08:45:49 rousse Exp $
// ----------------------------------------------------------------------------
@@ -460,6 +460,7 @@
case ENABLE_TIME_CONSTRAINED:
case DISABLE_TIME_CONSTRAINED:
boolean = msgBuffer.read_bool();
+ lookahead = msgBuffer.read_double();
break ;
// Body contains boolean, TickTime, TickTime
@@ -616,4 +617,4 @@
} // namespace certi
-// $Id: Message_R.cc,v 3.25 2008/05/30 09:49:17 rousse Exp $
+// $Id: Message_R.cc,v 3.26 2008/06/03 08:45:49 rousse Exp $
Index: libCERTI/Message_W.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message_W.cc,v
retrieving revision 3.30
retrieving revision 3.31
diff -u -b -r3.30 -r3.31
--- libCERTI/Message_W.cc 2 Jun 2008 07:57:35 -0000 3.30
+++ libCERTI/Message_W.cc 3 Jun 2008 08:45:50 -0000 3.31
@@ -17,7 +17,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: Message_W.cc,v 3.30 2008/06/02 07:57:35 rousse Exp $
+// $Id: Message_W.cc,v 3.31 2008/06/03 08:45:50 rousse Exp $
// ----------------------------------------------------------------------------
@@ -476,6 +476,7 @@
case ENABLE_TIME_CONSTRAINED:
case DISABLE_TIME_CONSTRAINED:
msgBuffer.write_bool(boolean);
+ msgBuffer.write_double(lookahead);
break ;
// Body contains boolean, TickTime, TickTime
@@ -577,4 +578,4 @@
} // namespace certi
-// $Id: Message_W.cc,v 3.30 2008/06/02 07:57:35 rousse Exp $
+// $Id: Message_W.cc,v 3.31 2008/06/03 08:45:50 rousse Exp $
Index: libRTI/RTIambassador.cc
===================================================================
RCS file: /sources/certi/certi/libRTI/RTIambassador.cc,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -b -r3.83 -r3.84
--- libRTI/RTIambassador.cc 30 May 2008 09:49:18 -0000 3.83
+++ libRTI/RTIambassador.cc 3 Jun 2008 08:45:50 -0000 3.84
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
-// $Id: RTIambassador.cc,v 3.83 2008/05/30 09:49:18 rousse Exp $
+// $Id: RTIambassador.cc,v 3.84 2008/06/03 08:45:50 rousse Exp $
// ----------------------------------------------------------------------------
@@ -1671,8 +1671,8 @@
// ----------------------------------------------------------------------------
// Enable Time Regulation
void
-RTI::RTIambassador::enableTimeRegulation(const FedTime& /*theFederateTime*/,
- const FedTime& /*theLookahead*/)
+RTI::RTIambassador::enableTimeRegulation(const FedTime& theFederateTime,
+ const FedTime& theLookahead)
throw (RTI::RTIinternalError, RTI::RestoreInProgress,
RTI::SaveInProgress, RTI::FederateNotExecutionMember,
RTI::ConcurrentAccessAttempted, RTI::InvalidLookahead,
@@ -1681,6 +1681,8 @@
{
Message req, rep ;
req.type = Message::ENABLE_TIME_REGULATION ;
+ req.setFedTime(theFederateTime);
+ req.setLookahead(theLookahead);
req.setBoolean(true);
privateRefs->executeService(&req, &rep);
}
@@ -2958,4 +2960,4 @@
privateRefs->executeService(&req, &rep);
}
-// $Id: RTIambassador.cc,v 3.83 2008/05/30 09:49:18 rousse Exp $
+// $Id: RTIambassador.cc,v 3.84 2008/06/03 08:45:50 rousse Exp $
Index: test/Billard/Billard.cc
===================================================================
RCS file: /sources/certi/certi/test/Billard/Billard.cc,v
retrieving revision 3.33
retrieving revision 3.34
diff -u -b -r3.33 -r3.34
--- test/Billard/Billard.cc 5 May 2008 08:12:17 -0000 3.33
+++ test/Billard/Billard.cc 3 Jun 2008 08:45:50 -0000 3.34
@@ -225,7 +225,7 @@
constrained = true ;
D.Out(pdInit, "Time Constrained enabled.");
}
- rtiamb.modifyLookahead(TIME_STEP);
+ //rtiamb.modifyLookahead(TIME_STEP);
}
else {
if (constrained) {
@@ -243,6 +243,7 @@
rtiamb.queryFederateTime(localTime);
try {
+std::cout<<"BILLARD"<<std::endl;
rtiamb.enableTimeRegulation(localTime, TIME_STEP);
regulating = true ;
break ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi RTIA/FederationManagement.cc RTIA/RTIA_fe...,
certi-cvs <=