RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix assertion error after long delay

This commit is contained in:
David Rose 2010-09-22 14:31:42 +00:00
parent 55455a48c9
commit 57f10c8a37
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/pipeline/threadSimpleManager.cxx
View File

@ -588,8 +588,15 @@ choose_next_context(struct ThreadContext *from_context) {
}
TickRecord &record = _tick_records.front();
_total_ticks -= record._tick_count;
nassertv(record._thread->_run_ticks >= record._tick_count);
record._thread->_run_ticks -= record._tick_count;
if (record._thread->_run_ticks >= record._tick_count) {
// Ensure we don't go negative.
record._thread->_run_ticks -= record._tick_count;
} else {
// It is possible for this to happen if the application has been
// paused for more than 2^31 ticks.
record._thread->_run_ticks = 0;
}
_tick_records.pop_front();
}
new_epoch = true;
@ -724,8 +731,14 @@ do_timeslice_accounting(ThreadSimpleImpl *thread, double now) {
nassertv(!_tick_records.empty());
TickRecord &record = _tick_records.front();
_total_ticks -= record._tick_count;
nassertv(record._thread->_run_ticks >= record._tick_count);
record._thread->_run_ticks -= record._tick_count;
if (record._thread->_run_ticks >= record._tick_count) {
// Ensure we don't go negative.
record._thread->_run_ticks -= record._tick_count;
} else {
// It is possible for this to happen if the application has been
// paused for more than 2^31 ticks.
record._thread->_run_ticks = 0;
}
_tick_records.pop_front();
}