Changeset 13254 in vbox for trunk/src

Timestamp:

Oct 14, 2008 12:35:50 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Added RTThreadPreemptIsEnabled, RTThreadPreemptDisable and RTThreadPreemptRestore. Made the logger check that preemption is enabled before trying to take the semaphore on Solaris and Windows.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (6 diffs)
• common/log/log.cpp (modified) (1 diff)
• r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp (added)
• r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp (added)
• r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp (added)
• r0drv/nt/thread-r0drv-nt.cpp (modified) (1 diff)
• r0drv/solaris/thread-r0drv-solaris.c (modified) (3 diffs)
• r0drv/solaris/vbi/thread-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -976 +976 @@
         generic/RTLogWriteStdOut-stub-generic.cpp \
         generic/mppresent-generic.cpp \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/linux/alloc-r0drv-linux.c \
         r0drv/linux/initterm-r0drv-linux.c \
@@ -1010 +1013 @@
         r0drv/memobj-r0drv.cpp \
         r0drv/mpnotification-r0drv.c \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/nt/alloc-r0drv-nt.cpp \
         r0drv/nt/assert-r0drv-nt.cpp \
@@ -1054 +1060 @@
         generic/timer-generic.cpp \
         r0drv/generic/RTMpOn-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
         r0drv/darwin/alloc-r0drv-darwin.cpp \
@@ -1103 +1112 @@
         r0drv/memobj-r0drv.cpp \
         r0drv/generic/RTMpOn-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
         r0drv/os2/alloc-r0drv-os2.cpp \
@@ -1149 +1161 @@
         generic/mppresent-generic.cpp \
         r0drv/generic/RTMpOn-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/generic/mpnotification-r0drv-generic.cpp \
         r0drv/freebsd/alloc-r0drv-freebsd.c \
@@ -1196 +1211 @@
 else  # !VBOX_WITH_SOLARIS_VBI
  RuntimeR0Drv_SOURCES.solaris += \
+        r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp \
+        r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp \
         r0drv/solaris/mpnotification-r0drv-solaris.c \
         r0drv/solaris/alloc-r0drv-solaris.c \

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -143 +143 @@
     if (pLogger->MutexSem != NIL_RTSEMFASTMUTEX)
     {
+# if defined(IN_RING0) \
+  && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS))
+        if (!RTThreadPreemptIsEnabled())
+            return VERR_PREEMPT_DISABLED;
+# endif
         int rc = RTSemFastMutexRequest(pLogger->MutexSem);
         if (RT_FAILURE(rc))

trunk/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp

@@ -72 +72 @@
 
 
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+    KIRQL Irql = KeGetCurrentIrql();
+    return Irql <= APC_LEVEL;
+}
+
+
+RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchOldIrql == 255);
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+
+    KeRaiseIrql(DISPATCH_LEVEL, &pState->uchOldIrql);
+}
+
+
+RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+
+    KeLowerIrql(pState->uchOldIrql);
+    pState->uchOldIrql = 255;
+}
+

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

@@ -49 +49 @@
     clock_t cTicks;
     unsigned long timeout;
-    
+
     if (!cMillies)
     {
@@ -63 +63 @@
 #if 0
     timeout = ddi_get_lbolt();
-    timeout += cTicks; 
- 
+    timeout += cTicks;
+
     kcondvar_t cnd;
     kmutex_t mtx;
@@ -98 +98 @@
 }
 
+
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+    return curthread->t_preempt == 0;
+}
+
+
+RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy != 42);
+    pState->uchDummy = 42;
+
+    kpreempt_disable();
+}
+
+
+RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy == 42);
+    pState->uchDummy = 0;
+
+    kpreempt_enable();
+}
+

trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c

@@ -62 +62 @@
 #if 0
     timeout = ddi_get_lbolt();
-    timeout += cTicks; 
- 
+    timeout += cTicks;
+
     kcondvar_t cnd;
     kmutex_t mtx;
@@ -96 +96 @@
 }
 
+
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+    return vbi_is_preempt_enabled() != 0;
+}
+
+
+RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy != 42);
+    pState->uchDummy = 42;
+    vbi_preempt_disable();
+}
+
+
+RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy == 42);
+    pState->uchDummy = 0;
+    vbi_preempt_enable();
+}
+