TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

more fixes to clock-munger

Browse Source
This commit is contained in:
David Rose 2005-08-29 18:27:36 +00:00
parent bdc0d8a898
commit 39e81de5df
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/distributed/ClockDelta.py
View File

@ -120,7 +120,7 @@ class ClockDelta(DirectObject.DirectObject):
""" """
newDelta = (float(localTime) - newDelta = (float(localTime) -
(float(networkTime) / NetworkTimePrecision)) (float(networkTime) / NetworkTimePrecision))
self.newDelta(localTime, newDelta, newUncertainty) self.newDelta(localTime, newDelta, newUncertainty, trustNew = trustNew)
def peerToPeerResync(self, avId, timestamp, serverTime, uncertainty): def peerToPeerResync(self, avId, timestamp, serverTime, uncertainty):
""" """
@ -184,8 +184,8 @@ class ClockDelta(DirectObject.DirectObject):
""" """
oldUncertainty = self.getUncertainty() oldUncertainty = self.getUncertainty()
if oldUncertainty != None: if oldUncertainty != None:
assert(self.notify.debug('previous delta at %.3f s, +/- %.3f s.' % (self.delta, oldUncertainty))) self.notify.info('previous delta at %.3f s, +/- %.3f s.' % (self.delta, oldUncertainty))
assert(self.notify.debug('new delta at %.3f s, +/- %.3f s.' % (newDelta, newUncertainty))) self.notify.info('new delta at %.3f s, +/- %.3f s.' % (newDelta, newUncertainty))
# Our previous measurement was self.delta +/- oldUncertainty; # Our previous measurement was self.delta +/- oldUncertainty;
# our new measurement is newDelta +/- newUncertainty. Take # our new measurement is newDelta +/- newUncertainty. Take
# the intersection of both. # the intersection of both.
@ -209,7 +209,7 @@ class ClockDelta(DirectObject.DirectObject):
else: else:
newDelta = (low + high) / 2.0 newDelta = (low + high) / 2.0
newUncertainty = (high - low) / 2.0 newUncertainty = (high - low) / 2.0
assert(self.notify.debug('intersection at %.3f s, +/- %.3f s.' % (newDelta, newUncertainty))) self.notify.info('intersection at %.3f s, +/- %.3f s.' % (newDelta, newUncertainty))
self.delta = newDelta self.delta = newDelta
self.uncertainty = newUncertainty self.uncertainty = newUncertainty

27
panda/src/express/trueClock.cxx
View File

@ -43,8 +43,9 @@ static const double _00000001 = 1.0 / 10000000.0;
// high-precision clock rate vs. the time-of-day rate, when // high-precision clock rate vs. the time-of-day rate, when
// paranoid-clock is in effect. Reducing it makes the clock respond // paranoid-clock is in effect. Reducing it makes the clock respond
// more quickly to changes in rate, but setting it too small may // more quickly to changes in rate, but setting it too small may
// introduce erratic behavior. // introduce erratic behavior, especially if the user has ntp
static const double paranoid_clock_interval = 1.0; // configured.
static const double paranoid_clock_interval = 3.0;
// It will be considered a clock jump error if either the // It will be considered a clock jump error if either the
// high-precision clock or the time-of-day clock change by this number // high-precision clock or the time-of-day clock change by this number
@ -105,7 +106,8 @@ get_short_time() {
PN_int64 count; PN_int64 count;
QueryPerformanceCounter((LARGE_INTEGER *)&count); QueryPerformanceCounter((LARGE_INTEGER *)&count);
time = (double)(count - _init_count) * _recip_frequency; time = (double)(count - _init_count) * _recip_frequency +
ConfigVariableDouble("clock-jump", 0.0);
} else { } else {
// No high-resolution clock; return the best information we have. // No high-resolution clock; return the best information we have.
@ -273,7 +275,7 @@ correct_time(double time) {
// a row. // a row.
Timestamps::iterator ti; Timestamps::iterator ti;
for (ti = _timestamps.begin(); ti != _timestamps.end(); ++ti) { for (ti = _timestamps.begin(); ti != _timestamps.end(); ++ti) {
(*ti)._time -= time_adjust; (*ti)._time -= time_adjust / _time_scale;
(*ti)._tod -= tod_adjust; (*ti)._tod -= tod_adjust;
} }
@ -293,7 +295,8 @@ correct_time(double time) {
// sync. // sync.
double corrected_time = time * _time_scale + _time_offset; double corrected_time = time * _time_scale + _time_offset;
double corrected_tod = tod + _tod_offset; double corrected_tod = tod + _tod_offset;
if (corrected_time - corrected_tod > paranoid_clock_jump_error_max_delta) { if (corrected_time - corrected_tod > paranoid_clock_jump_error_max_delta &&
_time_scale > 0.00001) {
express_cat.info() express_cat.info()
<< "Force-adjusting time_scale to catch up to errors.\n"; << "Force-adjusting time_scale to catch up to errors.\n";
set_time_scale(time, _time_scale * 0.5); set_time_scale(time, _time_scale * 0.5);
@ -321,7 +324,7 @@ correct_time(double time) {
double keep_interval = paranoid_clock_interval; double keep_interval = paranoid_clock_interval;
if (tod_age > 0.0 && time_age > 0.0) { if (tod_age > keep_interval / 2.0 && time_age > 0.0) {
// Adjust the _time_scale value to match the ratio between the // Adjust the _time_scale value to match the ratio between the
// elapsed time on the high-resolution clock, and the // elapsed time on the high-resolution clock, and the
// time-of-day clock. // time-of-day clock.
@ -341,6 +344,12 @@ correct_time(double time) {
// Actually report it a little bit later, to give the time // Actually report it a little bit later, to give the time
// scale a chance to settle down. // scale a chance to settle down.
_report_time_scale_time = tod + _tod_offset + keep_interval; _report_time_scale_time = tod + _tod_offset + keep_interval;
if (express_cat.is_debug()) {
express_cat.debug()
<< "Will report time scale, now " << 100.0 / _time_scale
<< "%, tod_age = " << tod_age << ", time_age = " << time_age
<< ", ratio = " << ratio << "\n";
}
} }
} }
@ -360,9 +369,11 @@ correct_time(double time) {
double corrected_tod = tod + _tod_offset; double corrected_tod = tod + _tod_offset;
if (_time_scale_changed && corrected_tod >= _report_time_scale_time) { if (_time_scale_changed && corrected_tod >= _report_time_scale_time) {
double percent = 100.0 / _time_scale;
// Round percent to the nearest 5% to reduce confusion in the logs.
percent = floor(percent / 20.0 + 0.5) * 20.0;
express_cat.info() express_cat.info()
<< "Clock appears to be running at " << 100.0 / _time_scale << "Clock appears to be running at " << percent << "% real time.\n";
<< "% real time.\n";
_last_reported_time_scale = _time_scale; _last_reported_time_scale = _time_scale;
_time_scale_changed = false; _time_scale_changed = false;
} }