Changeset 5917 for branches/newapi

Timestamp:

12/02/07 23:43:21 (12 months ago)

Author:

erijo

Message:

Handle nanosec overflow when converting between timeval and timespec.

Location:

branches/newapi/licq/src/thread

Files:

• condition.cpp (modified) (1 diff)
• test/conditiontest.cpp (modified) (1 diff)

branches/newapi/licq/src/thread/condition.cpp

@@ -100 +100 @@
     abstime.tv_nsec = now.tv_usec * 1000 + ((msec % 1000) * 1000 * 1000);
 
+    const long nanoInSec = 1 * 1000 * 1000 * 1000;
+    if (abstime.tv_nsec >= nanoInSec)
+    {
+      abstime.tv_nsec -= nanoInSec;
+      abstime.tv_sec += 1;
+    }
+
     int error;
     do

branches/newapi/licq/src/thread/test/conditiontest.cpp

@@ -31 +31 @@
 
   mutex.lock();
-  BOOST_CHECK_EQUAL(condition.wait(&mutex, 10), false);
+  BOOST_CHECK_EQUAL(condition.wait(&mutex, 0), false);
+  BOOST_CHECK_EQUAL(condition.wait(&mutex, 999), false);
   mutex.unlock();
 }