fixed testWaitTimeout on OSX. For some reason, the timeout passed to …

…the wait routine wasn't being honored.
dlang · Aug 29, 2011 · b4a3ec7 · b4a3ec7
1 parent 045482b
commit b4a3ec7
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/core/sync/semaphore.d b/src/core/sync/semaphore.d
@@ -216,18 +216,15 @@ class Semaphore
             mach_timespec_t t = void;
             (cast(byte*) &t)[0 .. t.sizeof] = 0;
 
-            if( dur!("nsecs")( 0 ) == val )
+            if( val.total!("seconds")() > t.tv_sec.max )
             {
-                if( val.total!("seconds")() > t.tv_sec.max )
-                {
-                    t.tv_sec  = t.tv_sec.max;
-                    t.tv_nsec = cast(typeof(t.tv_nsec)) val.fracSec.nsecs;
-                }
-                else
-                {
-                    t.tv_sec  = cast(typeof(t.tv_sec)) val.total!("seconds")();
-                    t.tv_nsec = cast(typeof(t.tv_nsec)) val.fracSec.nsecs;
-                }
+                t.tv_sec  = t.tv_sec.max;
+                t.tv_nsec = cast(typeof(t.tv_nsec)) val.fracSec.nsecs;
+            }
+            else
+            {
+                t.tv_sec  = cast(typeof(t.tv_sec)) val.total!("seconds")();
+                t.tv_nsec = cast(typeof(t.tv_nsec)) val.fracSec.nsecs;
             }
             while( true )
             {
@@ -505,8 +502,8 @@ version( unittest )
                 }
                 Thread.yield();
             }
-            alertedOne = semReady.wait( dur!"msecs"(200) );
-            alertedTwo = semReady.wait( dur!"msecs"(200) );
+            alertedOne = semReady.wait( dur!"msecs"(100) );
+            alertedTwo = semReady.wait( dur!"msecs"(100) );
         }
 
         auto thread = new Thread( &waiter );