Changeset 14423 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 20, 2008 4:08:45 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39667

Message:

Debug log mutex fix for linux in atomic context.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• common/log/log.cpp (modified) (1 diff)
• r0drv/linux/thread2-r0drv-linux.c (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1009 +1009 @@
         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 \
@@ -1025 +1024 @@
         r0drv/linux/spinlock-r0drv-linux.c \
         r0drv/linux/thread-r0drv-linux.c \
+        r0drv/linux/thread2-r0drv-linux.c \
         r0drv/linux/time-r0drv-linux.c \
         r0drv/linux/timer-r0drv-linux.c \

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

@@ -144 +144 @@
     {
 # if defined(IN_RING0) \
-  && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS))
+  && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX))
         if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
             return VERR_PREEMPT_DISABLED;

trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c

@@ -34 +34 @@
 #include "the-linux-kernel.h"
 
+#include <iprt/assert.h>
 #include <iprt/thread.h>
 #include <iprt/err.h>
 #include "internal/thread.h"
 
-
+/* @todo Implement
 RTDECL(RTTHREAD) RTThreadSelf(void)
 {
-    return rtThreadGetByNative(((RTNATIVETHREAD)current);
+    return rtThreadGetByNative((RTNATIVETHREAD)current);
 }
+*/
 
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+    return !in_atomic();
+}
+