Changeset 63345 in vbox for trunk/src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c

Timestamp:

Aug 11, 2016 6:25:33 PM (8 years ago)

Author:

vboxsync

Message:

r0drv/netbsd: re-import r0drv support for NetBSD on top of svn copy of
FreeBSD sources for cases where the differences are obvious and
minimal.

From Haomai Wang GSoC project with additional changes by Arto Huusko.

File:

• trunk/src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c (copied) (copied from trunk/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c ) (10 diffs)

trunk/src/VBox/Runtime/r0drv/netbsd/thread-r0drv-netbsd.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Threads (Part 1), Ring-0 Driver, FreeBSD.
+ * IPRT - Threads (Part 1), Ring-0 Driver, NetBSD.
  */
 
 /*
- * Copyright (C) 2007-2016 Oracle Corporation
+ * Copyright (C) 2007-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
  */
 
-
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "the-freebsd-kernel.h"
+#include "the-netbsd-kernel.h"
 #include "internal/iprt.h"
 #include <iprt/thread.h>
@@ -43 +42 @@
 RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)
 {
-    return (RTNATIVETHREAD)curthread;
+    return (RTNATIVETHREAD)curlwp;
 }
 
 
-static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)
+static int rtR0ThreadNbsdSleepCommon(RTMSINTERVAL cMillies)
 {
     int rc;
@@ -103 +102 @@
 RTDECL(int) RTThreadSleep(RTMSINTERVAL cMillies)
 {
-    return rtR0ThreadFbsdSleepCommon(cMillies);
+    return rtR0ThreadNbsdSleepCommon(cMillies);
 }
 
@@ -109 +108 @@
 RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies)
 {
-    return rtR0ThreadFbsdSleepCommon(cMillies);
+    return rtR0ThreadNbsdSleepCommon(cMillies);
 }
 
@@ -115 +114 @@
 RTDECL(bool) RTThreadYield(void)
 {
-#if __FreeBSD_version >= 900032
-    kern_yield(curthread->td_user_pri);
-#else
-    uio_yield();
-#endif
-    return false; /** @todo figure this one ... */
+    yield();
+    return true;
 }
 
@@ -128 +123 @@
     Assert(hThread == NIL_RTTHREAD);
 
-    return curthread->td_critnest == 0
-        && ASMIntAreEnabled(); /** @todo is there a native freebsd function/macro for this? */
+    return curlwp->l_dopreempt == 0
+        && ASMIntAreEnabled(); /** @todo is there a native netbsd function/macro for this? */
 }
 
@@ -137 +132 @@
     Assert(hThread == NIL_RTTHREAD);
 
-    return curthread->td_owepreempt == 1;
+    return curlwp->l_dopreempt;
 }
 
@@ -154 +149 @@
 }
 
-
 RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
 {
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 0);
-    pState->u32Reserved = 42;
 
-    critical_enter();
-    RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
+    curlwp->l_nopreempt++;
+    __insn_barrier();
 }
 
@@ -168 +160 @@
 RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
 {
+
     AssertPtr(pState);
-    Assert(pState->u32Reserved == 42);
-    pState->u32Reserved = 0;
-
-    RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
-    critical_exit();
+    __insn_barrier();
+    if (--curlwp->l_nopreempt != 0)
+        return;
+    __insn_barrier();
+    if (__predict_false(curlwp->l_dopreempt))
+        kpreempt(0);
+    __insn_barrier();
 }
-
 
 RTDECL(bool) RTThreadIsInInterrupt(RTTHREAD hThread)
 {
     Assert(hThread == NIL_RTTHREAD); NOREF(hThread);
-    /** @todo FreeBSD: Implement RTThreadIsInInterrupt. Required for guest
+    /** @todo NetBSD: Implement RTThreadIsInInterrupt. Required for guest
      *        additions! */
     return !ASMIntAreEnabled();
 }
-