Changeset 28462 in vbox

Timestamp:

Apr 19, 2010 1:36:19 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv: Basic testcase for ring-0 RTSemMutex*.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (1 diff)
• HostDrivers/Support/linux/Makefile (modified) (1 diff)
• HostDrivers/Support/linux/files_vboxdrv (modified) (2 diffs)
• Runtime/r0drv/linux/semmutex-r0drv-linux.c (modified) (2 diffs)
• Runtime/testcase/Makefile.kmk (modified) (3 diffs)
• Runtime/testcase/tstRTR0SemMutex.cpp (copied) (copied from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp ) (5 diffs)
• Runtime/testcase/tstRTR0SemMutex.h (copied) (copied from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h ) (2 diffs)
• Runtime/testcase/tstRTR0SemMutexDriver.cpp (copied) (copied from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp ) (9 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -211 +211 @@
     { "RTR0MemKernelIsValidAddr",               (void *)RTR0MemKernelIsValidAddr },
     { "RTR0MemAreKrnlAndUsrDifferent",          (void *)RTR0MemAreKrnlAndUsrDifferent },
-/* These don't work yet on linux - use fast mutexes!
     { "RTSemMutexCreate",                       (void *)RTSemMutexCreate },
     { "RTSemMutexRequest",                      (void *)RTSemMutexRequest },
+    { "RTSemMutexRequestDebug",                 (void *)RTSemMutexRequestDebug },
+    { "RTSemMutexRequestNoResume",              (void *)RTSemMutexRequestNoResume },
+    { "RTSemMutexRequestNoResumeDebug",         (void *)RTSemMutexRequestNoResumeDebug },
     { "RTSemMutexRelease",                      (void *)RTSemMutexRelease },
     { "RTSemMutexDestroy",                      (void *)RTSemMutexDestroy },
-*/
     { "RTProcSelf",                             (void *)RTProcSelf },
     { "RTR0ProcHandleSelf",                     (void *)RTR0ProcHandleSelf },

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -94 +94 @@
         r0drv/linux/semeventmulti-r0drv-linux.o \
         r0drv/linux/semfastmutex-r0drv-linux.o \
+        r0drv/linux/semmutex-r0drv-linux.o \
         r0drv/linux/spinlock-r0drv-linux.o \
         r0drv/linux/thread-r0drv-linux.o \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -39 +39 @@
     ${PATH_ROOT}/include/iprt/handletable.h=>include/iprt/handletable.h \
     ${PATH_ROOT}/include/iprt/initterm.h=>include/iprt/initterm.h \
+    ${PATH_ROOT}/include/iprt/list.h=>include/iprt/list.h \
     ${PATH_ROOT}/include/iprt/lockvalidator.h=>include/iprt/lockvalidator.h \
     ${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
@@ -141 +142 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c=>r0drv/linux/semeventmulti-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c=>r0drv/linux/semfastmutex-r0drv-linux.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c=>r0drv/linux/semmutex-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \

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

@@ -320 +320 @@
     return rtSemMutexLinuxRequest(hMutexSem, cMillies, true /*fInterruptible*/);
 }
-RT_EXPORT_SYMBOL(RTSemMutexRequest);
+RT_EXPORT_SYMBOL(RTSemMutexRequestNoResume);
 
 
@@ -364 +364 @@
             IPRT_DEBUG_SEMS_STATE(pThis, 'u');
         }
+        rc = VINF_SUCCESS;
     }
     else

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -91 +91 @@
         tstRand \
         tstRTFsQueries \
+        tstRTR0SemMutexDriver \
         tstR0ThreadPreemptionDriver \
         tstSemEvent \
@@ -149 +150 @@
         tstLdrObjR0 \
         tstRTR0MemUserKernel \
+        tstRTR0SemMutex \
         tstR0ThreadPreemption
  ifdef VBOX_WITH_RAW_MODE
@@ -394 +396 @@
 endif
 
+tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE
 tstR0ThreadPreemptionDriver_SOURCES = tstR0ThreadPreemptionDriver.cpp
+
+tstRTR0SemMutex_TEMPLATE = VBoxR0
+tstRTR0SemMutex_INST = $(INST_TESTCASE)
+tstRTR0SemMutex_DEFS = IN_RT_R0
+tstRTR0SemMutex_SYSSUFF = .r0
+tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp
+tstRTR0SemMutex_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+if1of ($(VBOX_LDR_FMT), pe lx)
+ tstRTR0SemMutex_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+endif
+
+tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE
+tstRTR0SemMutexDriver_SOURCES = tstRTR0SemMutexDriver.cpp
 
 tstRTFsQueries_SOURCES = tstRTFsQueries.cpp

trunk/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT R0 Testcase - Thread Preemption.
+ * IPRT R0 Testcase - Mutex Semaphores.
  */
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/thread.h>
+#include <iprt/semaphore.h>
 
 #include <iprt/err.h>
@@ -38 +38 @@
 #include <iprt/string.h>
 #include <VBox/sup.h>
-#include "tstR0ThreadPreemption.h"
+#include "tstRTR0SemMutex.h"
 
 
@@ -50 +50 @@
  * @param   pReqHdr     The request header. Input / Output. Optional.
  */
-DECLEXPORT(int) TSTR0ThreadPreemptionSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
-                                                   uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr)
+DECLEXPORT(int) TSTRTR0SemMutexSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
+                                             uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr)
 {
     if (u64Arg)
@@ -63 +63 @@
     *pszErr = '\0';
 
+#define SET_ERROR(szFmt)                do { if (!*pszErr) RTStrPrintf(pszErr, cchErr, "!" szFmt); } while (0)
+#define SET_ERROR1(szFmt, a1)           do { if (!*pszErr) RTStrPrintf(pszErr, cchErr, "!" szFmt, a1); } while (0)
+#define SET_ERROR2(szFmt, a1, a2)       do { if (!*pszErr) RTStrPrintf(pszErr, cchErr, "!" szFmt, a1, a2); } while (0)
+#define SET_ERROR3(szFmt, a1, a2, a3)   do { if (!*pszErr) RTStrPrintf(pszErr, cchErr, "!" szFmt, a1, a2, a3); } while (0)
+#define CHECK_RC_BREAK(rc, rcExpect, szOp) \
+        if ((rc) != (rcExpect)) \
+        { \
+            RTStrPrintf(pszErr, cchErr, "!%s -> %Rrc, expected %Rrc. line %u", szOp, rc, rcExpect, __LINE__); \
+            break; \
+        }
+
+
     /*
      * The big switch.
      */
+    RTSEMMUTEX  hMtx;
+    int         rc;
     switch (uOperation)
     {
-        case TSTR0THREADPREMEPTION_SANITY_OK:
+        case TSTRTR0SEMMUTEX_SANITY_OK:
             break;
 
-        case TSTR0THREADPREMEPTION_SANITY_FAILURE:
-            RTStrPrintf(pszErr, cchErr, "!42failure42%1024s", "");
+        case TSTRTR0SEMMUTEX_SANITY_FAILURE:
+            SET_ERROR1("42failure42%1024s", "");
             break;
 
-        case TSTR0THREADPREMEPTION_BASIC:
-        {
-            if (!ASMIntAreEnabled())
-                RTStrPrintf(pszErr, cchErr, "!Interrupts disabled");
-            else if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-                RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns false by default");
-            else
+        case TSTRTR0SEMMUTEX_BASIC:
+            rc = RTSemMutexCreate(&hMtx);
+            CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexCreate");
+            do
             {
-                RTTHREADPREEMPTSTATE State = RTTHREADPREEMPTSTATE_INITIALIZER;
-                RTThreadPreemptDisable(&State);
-                if (RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-                    RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after RTThreadPreemptDisable");
-                else if (!ASMIntAreEnabled())
-                    RTStrPrintf(pszErr, cchErr, "!Interrupts disabled");
-                RTThreadPreemptRestore(&State);
-            }
+                /*
+                 * The interruptible version first.
+                 */
+                /* simple request and release, polling. */
+                rc = RTSemMutexRequestNoResume(hMtx, 0);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* simple request and release, wait for ever. */
+                rc = RTSemMutexRequestNoResume(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume(indef_wait)");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* simple request and release, wait a tiny while. */
+                rc = RTSemMutexRequestNoResume(hMtx, 133);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume(133)");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* nested request and release. */
+                rc = RTSemMutexRequestNoResume(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume#1");
+                rc = RTSemMutexRequestNoResume(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume#2");
+                rc = RTSemMutexRequestNoResume(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume#3");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#3");
+                rc = RTSemMutexRequestNoResume(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequestNoResume#3b");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#3b");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#2");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#1");
+
+                /*
+                 * The uninterruptible variant.
+                 */
+                /* simple request and release, polling. */
+                rc = RTSemMutexRequest(hMtx, 0);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* simple request and release, wait for ever. */
+                rc = RTSemMutexRequest(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest(indef_wait)");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* simple request and release, wait a tiny while. */
+                rc = RTSemMutexRequest(hMtx, 133);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest(133)");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease");
+
+                /* nested request and release. */
+                rc = RTSemMutexRequest(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest#1");
+                rc = RTSemMutexRequest(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest#2");
+                rc = RTSemMutexRequest(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest#3");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#3");
+                rc = RTSemMutexRequest(hMtx, RT_INDEFINITE_WAIT);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRequest#3b");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#3b");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#2");
+                rc = RTSemMutexRelease(hMtx);
+                CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexRelease#1");
+
+            } while (false);
+
+            rc = RTSemMutexDestroy(hMtx);
+            CHECK_RC_BREAK(rc, VINF_SUCCESS, "RTSemMutexDestroy");
             break;
-        }
-
-        case TSTR0THREADPREMEPTION_IS_PENDING:
-        {
-            RTTHREADPREEMPTSTATE State = RTTHREADPREEMPTSTATE_INITIALIZER;
-            RTThreadPreemptDisable(&State);
-            if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-            {
-                if (ASMIntAreEnabled())
-                {
-                    uint64_t    u64StartTS    = RTTimeNanoTS();
-                    uint64_t    u64StartSysTS = RTTimeSystemNanoTS();
-                    uint64_t    cLoops        = 0;
-                    uint64_t    cNanosSysElapsed;
-                    uint64_t    cNanosElapsed;
-                    bool        fPending;
-                    do
-                    {
-                        fPending         = RTThreadPreemptIsPending(NIL_RTTHREAD);
-                        cNanosElapsed    = RTTimeNanoTS()       - u64StartTS;
-                        cNanosSysElapsed = RTTimeSystemNanoTS() - u64StartSysTS;
-                        cLoops++;
-                    } while (   !fPending
-                             && cNanosElapsed    < UINT64_C(2)*1000U*1000U*1000U
-                             && cNanosSysElapsed < UINT64_C(2)*1000U*1000U*1000U
-                             && cLoops           < 100U*_1M);
-                    if (!fPending)
-                        RTStrPrintf(pszErr, cchErr, "!Preempt not pending after %'llu loops / %'llu ns / %'llu ns (sys)",
-                                    cLoops, cNanosElapsed, cNanosSysElapsed);
-                    else if (cLoops == 1)
-                        RTStrPrintf(pszErr, cchErr, "!cLoops=1\n");
-                    else
-                        RTStrPrintf(pszErr, cchErr, "RTThreadPreemptIsPending returned true after %'llu loops / %'llu ns / %'llu ns (sys)",
-                                    cLoops, cNanosElapsed, cNanosSysElapsed);
-                }
-                else
-                    RTStrPrintf(pszErr, cchErr, "!Interrupts disabled");
-            }
-            else
-                RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after RTThreadPreemptDisable");
-            RTThreadPreemptRestore(&State);
-            break;
-        }
-
-        case TSTR0THREADPREMEPTION_NESTED:
-        {
-            bool const fDefault = RTThreadPreemptIsEnabled(NIL_RTTHREAD);
-            RTTHREADPREEMPTSTATE State1 = RTTHREADPREEMPTSTATE_INITIALIZER;
-            RTThreadPreemptDisable(&State1);
-            if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-            {
-                RTTHREADPREEMPTSTATE State2 = RTTHREADPREEMPTSTATE_INITIALIZER;
-                RTThreadPreemptDisable(&State2);
-                if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-                {
-                    RTTHREADPREEMPTSTATE State3 = RTTHREADPREEMPTSTATE_INITIALIZER;
-                    RTThreadPreemptDisable(&State3);
-                    if (RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-                        RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after 3rd RTThreadPreemptDisable");
-
-                    RTThreadPreemptRestore(&State3);
-                    if (RTThreadPreemptIsEnabled(NIL_RTTHREAD) && !*pszErr)
-                        RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after 1st RTThreadPreemptRestore");
-                }
-                else
-                    RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after 2nd RTThreadPreemptDisable");
-
-                RTThreadPreemptRestore(&State2);
-                if (RTThreadPreemptIsEnabled(NIL_RTTHREAD) && !*pszErr)
-                    RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after 2nd RTThreadPreemptRestore");
-            }
-            else
-                RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns true after 1st RTThreadPreemptDisable");
-            RTThreadPreemptRestore(&State1);
-            if (RTThreadPreemptIsEnabled(NIL_RTTHREAD) != fDefault && !*pszErr)
-                RTStrPrintf(pszErr, cchErr, "!RTThreadPreemptIsEnabled returns false after 3rd RTThreadPreemptRestore");
-            break;
-        }
 
         default:
-            RTStrPrintf(pszErr, cchErr, "!Unknown test #%d", uOperation);
+            SET_ERROR1("Unknown test #%d", uOperation);
             break;
     }

trunk/src/VBox/Runtime/testcase/tstRTR0SemMutex.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT R0 Testcase - Thread Preemption, common header.
+ * IPRT R0 Testcase - Mutex Semaphores, common header.
  */
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31 +31 @@
 #ifdef IN_RING0
 RT_C_DECLS_BEGIN
-DECLEXPORT(int) TSTR0ThreadPreemptionSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
-                                                   uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
+DECLEXPORT(int) TSTRTR0SemMutexSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
+                                             uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
 RT_C_DECLS_END
 #endif
 
-typedef enum TSTR0THREADPREMEPTION
+typedef enum TSTRTR0SEMMUTEX
 {
-    TSTR0THREADPREMEPTION_SANITY_OK = 1,
-    TSTR0THREADPREMEPTION_SANITY_FAILURE,
-    TSTR0THREADPREMEPTION_BASIC,
-    TSTR0THREADPREMEPTION_IS_PENDING,
-    TSTR0THREADPREMEPTION_NESTED
-} TSTR0THREADPREMEPTION;
+    TSTRTR0SEMMUTEX_SANITY_OK = 1,
+    TSTRTR0SEMMUTEX_SANITY_FAILURE,
+    TSTRTR0SEMMUTEX_BASIC
+} TSTRTR0SEMMUTEX;
 

trunk/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 #ifdef VBOX
 # include <VBox/sup.h>
-# include "tstR0ThreadPreemption.h"
+# include "tstRTR0SemMutex.h"
 #endif
 
@@ -57 +57 @@
      */
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstR0ThreadPreemption", &hTest);
+    int rc = RTTestInitAndCreate("tstR0SemMutex", &hTest);
     if (rc)
         return rc;
@@ -73 +73 @@
     rc = RTPathExecDir(szPath, sizeof(szPath));
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szPath, sizeof(szPath), "tstR0ThreadPreemption.r0");
+        rc = RTPathAppend(szPath, sizeof(szPath), "tstR0SemMutex.r0");
     if (RT_FAILURE(rc))
     {
@@ -81 +81 @@
 
     void *pvImageBase;
-    rc = SUPR3LoadServiceModule(szPath, "tstR0ThreadPreemption",
-                                "TSTR0ThreadPreemptionSrvReqHandler",
+    rc = SUPR3LoadServiceModule(szPath, "tstR0SemMutex",
+                                "TSTRTR0SemMutexSrvReqHandler",
                                 &pvImageBase);
     if (RT_FAILURE(rc))
@@ -104 +104 @@
     Req.Hdr.cbReq = sizeof(Req);
     Req.szMsg[0] = '\0';
-    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                             TSTR0THREADPREMEPTION_SANITY_OK, 0, &Req.Hdr), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0SemMutex", sizeof("tstR0SemMutex") - 1,
+                                             TSTRTR0SEMMUTEX_SANITY_OK, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -115 +115 @@
     Req.Hdr.cbReq = sizeof(Req);
     Req.szMsg[0] = '\0';
-    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                             TSTR0THREADPREMEPTION_SANITY_FAILURE, 0, &Req.Hdr), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0SemMutex", sizeof("tstR0SemMutex") - 1,
+                                             TSTRTR0SEMMUTEX_SANITY_FAILURE, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -130 +130 @@
     Req.Hdr.cbReq = sizeof(Req);
     Req.szMsg[0] = '\0';
-    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                             TSTR0THREADPREMEPTION_BASIC, 0, &Req.Hdr), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0SemMutex", sizeof("tstR0SemMutex") - 1,
+                                             TSTRTR0SEMMUTEX_BASIC, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -143 +143 @@
 
     /*
-     * Stay in ring-0 until preemption is pending.
+     * More to come
      */
-RTThreadSleep(250); /** @todo fix GIP initialization? */
-    RTTestSub(hTest, "Pending Preemption");
-    for (int i = 0; ; i++)
-    {
-        Req.Hdr.u32Magic = SUPR0SERVICEREQHDR_MAGIC;
-        Req.Hdr.cbReq = sizeof(Req);
-        Req.szMsg[0] = '\0';
-        RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                                 TSTR0THREADPREMEPTION_IS_PENDING, 0, &Req.Hdr), VINF_SUCCESS);
-        if (    strcmp(Req.szMsg, "cLoops=1\n")
-            ||  i >= 64)
-        {
-            if (Req.szMsg[0] == '!')
-                RTTestIFailed("%s", &Req.szMsg[1]);
-            else if (Req.szMsg[0])
-                RTTestIPrintf(RTTESTLVL_ALWAYS, "%s", Req.szMsg);
-            break;
-        }
-        if ((i % 3) == 0)
-            RTThreadYield();
-    }
-
-    /*
-     * Test nested RTThreadPreemptDisable calls.
-     */
-    RTTestSub(hTest, "Nested");
-    Req.Hdr.u32Magic = SUPR0SERVICEREQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-    Req.szMsg[0] = '\0';
-    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                             TSTR0THREADPREMEPTION_NESTED, 0, &Req.Hdr), VINF_SUCCESS);
-    if (Req.szMsg[0] == '!')
-        RTTestIFailed("%s", &Req.szMsg[1]);
-    else if (Req.szMsg[0])
-        RTTestIPrintf(RTTESTLVL_ALWAYS, "%s", Req.szMsg);
 
     /*