Changeset 403 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp

Timestamp:

Jan 28, 2007 8:45:05 AM (18 years ago)

Author:

vboxsync

Message:

Need RTThreadWait in ring-0 too when using the generic timers, so thread.cpp was ported to ring-0. Fixed a bug in RTTimerStart() (the generic code). (hope this doesn't break the other platforms...)

File:

• trunk/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp ) (5 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * InnoTek Portable Runtime - Threads, Ring-0 Driver, Darwin.
+ * InnoTek Portable Runtime - Threads (Part 2), Ring-0 Driver, Darwin.
  */
 
@@ -30 +30 @@
 
 
-RTDECL(RTTHREAD) RTThreadSelf(void)
+int rtThreadNativeInit(void)
 {
-    return (RTTHREAD)current_thread();
-}
-
-
-RTDECL(int)   RTThreadSleep(unsigned cMillies)
-{
-    uint64_t u64Deadline;
-    clock_interval_to_deadline(cMillies, kMillisecondScale, &u64Deadline);
-    clock_delay_until(u64Deadline);
+    /* No TLS in Ring-0. :-/ */
     return VINF_SUCCESS;
 }
 
 
-RTDECL(bool) RTThreadYield(void)
+RTDECL(RTTHREAD) RTThreadSelf(void)
 {
-    thread_block(THREAD_CONTINUE_NULL);
-    return true; /* this is fishy */
+    return rtThreadGetByNative((RTNATIVETHREAD)current_thread());
 }
 
 
-int rtThreadNativeSetPriority(RTTHREAD Thread, RTTHREADTYPE enmType)
+int rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
 {
     /*
      * Convert the priority type to scheduling policies.
+     * (This is really just guess work.)
      */
     bool                            fSetExtended = false;
@@ -105 +97 @@
      * Do the actual modification.
      */
-    kern_return_t rc = thread_policy_set((thread_t)Thread, THREAD_PRECEDENCE_POLICY,
+    kern_return_t kr = thread_policy_set((thread_t)pThread->Core.Key, THREAD_PRECEDENCE_POLICY,
                                          (thread_policy_t)&Precedence, THREAD_PRECEDENCE_POLICY_COUNT);
-    AssertMsg(rc == KERN_SUCCESS, ("%rc\n", rc)); NOREF(rc);
+    AssertMsg(kr == KERN_SUCCESS, ("%rc\n", kr)); NOREF(kr);
 
     if (fSetExtended)
     {
-        rc = thread_policy_set((thread_t)Thread, THREAD_EXTENDED_POLICY,
+        kr = thread_policy_set((thread_t)pThread->Core.Key, THREAD_EXTENDED_POLICY,
                                (thread_policy_t)&Extended, THREAD_EXTENDED_POLICY_COUNT);
-        AssertMsg(rc == KERN_SUCCESS, ("%rc\n", rc));
+        AssertMsg(kr == KERN_SUCCESS, ("%rc\n", kr));
     }
 
     if (fSetTimeContstraint)
     {
-        rc = thread_policy_set((thread_t)Thread, THREAD_TIME_CONSTRAINT_POLICY,
+        kr = thread_policy_set((thread_t)pThread->Core.Key, THREAD_TIME_CONSTRAINT_POLICY,
                                (thread_policy_t)&TimeConstraint, THREAD_TIME_CONSTRAINT_POLICY_COUNT);
-        AssertMsg(rc == KERN_SUCCESS, ("%rc\n", rc));
+        AssertMsg(kr == KERN_SUCCESS, ("%rc\n", kr));
     }
 
     return VINF_SUCCESS; /* ignore any errors for now */
+}
+
+
+int rtThreadNativeAdopt(PRTTHREADINT pThread)
+{
+    return VERR_NOT_IMPLEMENTED;
 }
 
@@ -139 +137 @@
     const thread_t Self = current_thread();
 
-    rtThreadMain((PRTR0THREADARGS)pvArg, (RTNATIVETHREAD)Self);
+    rtThreadMain((PRTTHREADINT)pvArg, (RTNATIVETHREAD)Self);
 
-    kern_return_t rc = thread_terminate(Self);
-    AssertFatalMsgFailed(("rc=%d\n", rc));
+    kern_return_t kr = thread_terminate(Self);
+    AssertFatalMsgFailed(("kr=%d\n", kr));
 }
 
 
-int rtThreadNativeCreate(PRTR0THREADARGS pArgs, PRTNATIVETHREAD pNativeThread)
+int rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {
     thread_t NativeThread;
-    kern_return_t rc = kernel_thread_start(rtThreadNativeMain, pArgs, &NativeThread);
-    if (rc == KERN_SUCCESS)
+    kern_return_t kr = kernel_thread_start(rtThreadNativeMain, pThreadInt, &NativeThread);
+    if (kr == KERN_SUCCESS)
     {
         *pNativeThread = (RTNATIVETHREAD)NativeThread;
@@ -156 +154 @@
         return VINF_SUCCESS;
     }
-    return RTErrConvertFromMachKernReturn(rc);
+    return RTErrConvertFromMachKernReturn(kr);
 }