Changeset 486

Timestamp:

01/08/11 18:58:01 (14 years ago)

Author:

sean

Message:

A few Windows fixes using core.time.

Files:

• trunk/src/core/sync/condition.d (modified) (1 diff)
• trunk/src/core/sync/semaphore.d (modified) (2 diffs)
• trunk/src/core/thread.d (modified) (1 diff)

trunk/src/core/sync/condition.d

@@ -156 +156 @@
-     */
-    bool wait( Duration val )
-    in
-    {
-        assert( !val.isNegative );
-    }
-    body
-    {
-        version( Win32 )
-        {
-milliseconds
+dur!("msecs")
-
-            while( val > maxWaitMillis )
-            {
-                if( timedWait( cast(uint)
-Milliseconds
+!("msecs")()
-                    return true;
-                val -= maxWaitMillis;
-            }
-Milliseconds
+!("msecs")()
-        }
-        else version( Posix )
-        {
-            timespec t = void;
-            mktspec( t, val );
-
-            int rc = pthread_cond_timedwait( &m_hndl, m_mutexAddr, &t );
-            if( !rc )
-                return true;
-            if( rc == ETIMEDOUT )

trunk/src/core/sync/semaphore.d

@@ -156 +156 @@
-        }
-    }
-    
-   
-    /**
-     * Suspends the calling thread until the current count moves above zero or
-     * until the supplied time period has elapsed.  If the count moves above
-     * zero in this interval, then atomically decrement the count by one and
-     * return true.  Otherwise, return false.
-     *
-     *
-     * Params:
-     *  period = The time to wait.
-     *
-     * In:
-     *  val must be non-negative.
-     *
-     * Throws:
-     *  SyncException on error.
-     *
-     * Returns:
@@ -257 +256 @@
-            }
-        }
-    }
-
-
-    /**
-     * Suspends the calling thread until the current count moves above zero or
-     * until the supplied time period has elapsed.  If the count moves above
-     * zero in this interval, then atomically decrement the count by one and
-     * return true.  Otherwise, return false.
-     *
-     *
-     * Params:
-     *  period = The time to wait, in 100 nanosecond intervals.  This value may
-     *           be adjusted to equal to the maximum wait period supported by
-     *           the target platform if it is too large.
-     *
-     * In:
-     *  period must be non-negative.
-     *
-     * Throws:

trunk/src/core/thread.d

@@ -1060 +1060 @@
-     *
-     * Params:
-     *  val = The minimum duration the calling thread should be suspended.
-     *
-     * In:
-     *  period must be non-negative.
-     *
-     * Example:
-     * ------------------------------------------------------------------------
-     *
-milliseconds
-seconds( 5 ) );       
+dur!("msecs")
+dur!("seconds")( 5 ) );
-     *
-     * ------------------------------------------------------------------------
-     */
-    static void sleep( Duration val )
-    in
-    {
-        assert( !val.isNegative );
-    }
-    body
-    {
-        version( Windows )
-        {
-milliseconds
+dur!("msecs")
-
-            // NOTE: In instances where all other threads in the process have a
-            //       lower priority than the current thread, the current thread
-            //       will not yield with a sleep time of zero.  However, unlike
-            //       yield(), the user is not asking for a yield to occur but
-            //       only for execution to suspend for the requested interval.
-            //       Therefore, expected performance may not be met if a yield
-            //       is forced upon the user.
-            while( val > maxSleepMillis )
-            {
-                Sleep( cast(uint)
-Milliseconds
+!("msecs")()
-                val -= maxSleepMillis;
-            }
-Milliseconds
+!("msecs")()
-        }
-        else version( Posix )
-        {
-            timespec tin  = void;
-            timespec tout = void;
-            
-            if( val.total!("seconds")() > tin.tv_sec.max )
-            {
-                tin.tv_sec  = tin.tv_sec.max;
-                tin.tv_nsec = cast(typeof(tin.tv_nsec)) val.fracSec.nsecs;