Changeset 24 for trunk/kHlp

Timestamp:

Feb 8, 2009, 2:58:54 PM (17 years ago)

Author:

bird

Message:

darwin porting.

Location:

trunk/kHlp

Files:

• Bare/Makefile.kup (added)
• Bare/kHlpBareThread.c (modified) (2 diffs)
• Bare/kHlpSys-darwin.c (added)
• Makefile.kmk (modified) (4 diffs)

trunk/kHlp/Bare/kHlpBareThread.c

@@ -37 +37 @@
 
 #if K_OS == K_OS_DARWIN
+# include <mach/mach_time.h>
 
 #elif K_OS == K_OS_LINUX
@@ -59 +60 @@
 {
 #if K_OS == K_OS_DARWIN
-    /** @todo mach_wait_until, see gen/nanosleep.c. */
-    usleep(cMillies * 1000);
+    static struct mach_timebase_info   s_Info;
+    static KBOOL                s_fNanoseconds = K_UNKNOWN;
+    KU64 uNow = mach_absolute_time();
+    KU64 uDeadline;
+    KU64 uPeriod;
+
+    if (s_fNanoseconds == K_UNKNOWN)
+    {
+        if (mach_timebase_info(&s_Info))
+            s_fNanoseconds = K_TRUE; /* the easy way out */
+        else if (s_Info.denom == s_Info.numer)
+            s_fNanoseconds = K_TRUE;
+        else
+            s_fNanoseconds = K_FALSE;
+    }
+
+    uPeriod = (KU64)cMillies * 1000 * 1000;
+    if (!s_fNanoseconds)
+        uPeriod = (double)uPeriod * s_Info.denom / s_Info.numer; /* Use double to avoid 32-bit trouble. */
+    uDeadline = uNow + uPeriod;
+    mach_wait_until(uDeadline);
 
 #elif K_OS == K_OS_LINUX

trunk/kHlp/Makefile.kmk

@@ -65 +65 @@
         Generic/kHlpInt2Ascii.c \
         \
-    Generic/kHlpGetEnvUZ.c \
+        Generic/kHlpGetEnvUZ.c \
         \
         Generic/kHlpGetExt.c \
@@ -78 +78 @@
         Bare/kHlpBareProcess.c \
         Bare/kHlpBareThread.c \
+
+kHlpBareStatic_SOURCES.darwin = \
+        Bare/kHlpSys-darwin.c
 
 #
@@ -99 +102 @@
         Generic/kHlpInt2Ascii.c \
         \
-    Generic/kHlpGetEnvUZ.c \
+        Generic/kHlpGetEnvUZ.c \
         \
         Generic/kHlpGetExt.c \
@@ -111 +114 @@
         CRT/kHlpCRTString.cpp \
 
+kHlpCRTStatic_SOURCES.darwin = \
+        Bare/kHlpSys-darwin.c
+
 
 # Generate the rules