ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'ct/backend_devel' into second-tp-attempt

Browse source
This commit is contained in:
Michael Ploujnikov 2010-01-18 12:45:57 -05:00
commit bcfedcd4a6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/threads.c
View file

@ -257,7 +257,7 @@ lumiera_thread_deadline_extend (unsigned ms)
clock_gettime (CLOCK_REALTIME, &deadline);
deadline.tv_sec += ms / 1000;
deadline.tv_nsec += 1000000 * (ms % 1000);
if (deadline.tv_nsec > 1000000000)
if (deadline.tv_nsec >= 1000000000)
{
deadline.tv_sec += (deadline.tv_nsec / 1000000000);
deadline.tv_nsec %= 1000000000;

2
src/lib/sync.hpp
View file

@ -344,7 +344,7 @@ namespace lib {
clock_gettime(CLOCK_REALTIME, this);
tv_sec += offs / 1000;
tv_nsec += 1000000 * (offs % 1000);
if (tv_nsec > 1000000000)
if (tv_nsec >= 1000000000)
{
tv_sec += tv_nsec / 1000000000;
tv_nsec %= 1000000000;