[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/RTIA TimeManagement.cc
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/RTIA TimeManagement.cc |
Date: |
Thu, 28 May 2009 20:26:23 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 09/05/28 20:26:23
Modified files:
RTIA : TimeManagement.cc
Log message:
Fix bug #25497 : NextEventRequest to a timestamp smaller than last
grant time + lookahead
TAR, TARA, NER, NERA may not be "timestamp event".
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/TimeManagement.cc?cvsroot=certi&r1=3.48&r2=3.49
Patches:
Index: TimeManagement.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/TimeManagement.cc,v
retrieving revision 3.48
retrieving revision 3.49
diff -u -b -r3.48 -r3.49
--- TimeManagement.cc 21 Apr 2009 13:54:02 -0000 3.48
+++ TimeManagement.cc 28 May 2009 20:26:23 -0000 3.49
@@ -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.48 2009/04/21 13:54:02 siron Exp $
+// $Id: TimeManagement.cc,v 3.49 2009/05/28 20:26:23 erk Exp $
// ----------------------------------------------------------------------------
#include <config.h>
@@ -496,8 +496,11 @@
if (heure_logique < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
- if (heure_logique < _heure_courante + _lookahead_courant)
- e = e_InvalidFederationTime ;
+// This is check may be overkill because
+// if we consider that advancing in time is NOT a timestamped event
+// see bug #25497 : https://savannah.nongnu.org/bugs/?25497
+// if (heure_logique < _heure_courante + _lookahead_courant)
+// e = e_InvalidFederationTime ;
if (e == e_NO_EXCEPTION) {
@@ -532,8 +535,11 @@
if (heure_logique < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
- if (heure_logique < _heure_courante + _lookahead_courant)
- e = e_InvalidFederationTime ;
+// This is check may be overkill because
+// if we consider that advancing in time is NOT a timestamped event
+// see bug #25497 : https://savannah.nongnu.org/bugs/?25497
+// if (heure_logique < _heure_courante + _lookahead_courant)
+// e = e_InvalidFederationTime ;
if (e == e_NO_EXCEPTION) {
_type_granted_state = AFTER_TARA_OR_NERA ; // will be
@@ -920,12 +926,15 @@
if (logical_time < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
- if (logical_time < _heure_courante + _lookahead_courant) {
-
- D.Out(pdDebug,"InvalidFederation time lkahead=%f, current=%f,
requested=%f",
-
_lookahead_courant.getTime(),_heure_courante.getTime(),logical_time.getTime());
- e = e_InvalidFederationTime ;
- }
+ // This is check may be overkill because
+ // if we consider that advancing in time is NOT a timestamped event
+ // see bug #25497 : https://savannah.nongnu.org/bugs/?25497
+// if (logical_time < _heure_courante + _lookahead_courant) {
+//
+// D.Out(pdDebug,"InvalidFederation time lkahead=%f, current=%f,
requested=%f",
+//
_lookahead_courant.getTime(),_heure_courante.getTime(),logical_time.getTime());
+// e = e_InvalidFederationTime ;
+// }
if (e == e_NO_EXCEPTION) {
@@ -965,8 +974,11 @@
if (logical_time < _heure_courante)
e = e_FederationTimeAlreadyPassed ;
- if (logical_time < _heure_courante + _lookahead_courant)
- e = e_InvalidFederationTime ;
+ // This is check may be overkill because
+ // if we consider that advancing in time is NOT a timestamped event
+ // see bug #25497 : https://savannah.nongnu.org/bugs/?25497
+// if (logical_time < _heure_courante + _lookahead_courant)
+// e = e_InvalidFederationTime ;
if (e == e_NO_EXCEPTION) {
@@ -989,4 +1001,4 @@
}} // namespaces
-// $Id: TimeManagement.cc,v 3.48 2009/04/21 13:54:02 siron Exp $
+// $Id: TimeManagement.cc,v 3.49 2009/05/28 20:26:23 erk Exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/RTIA TimeManagement.cc,
certi-cvs <=