Changeset 54449 in vbox

Timestamp:

Feb 24, 2015 2:54:42 PM (10 years ago)

Author:

vboxsync

Message:

Runtime/testcase: rename tstR0Preemption to tstRTR0Preemption to match the rest of the testcases.

Location:

trunk/src/VBox/Runtime/testcase

Files:

• Makefile.kmk (modified) (5 diffs)
• tstRTR0ThreadPreemption.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp ) (6 diffs)
• tstRTR0ThreadPreemption.h (moved) (moved from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h ) (2 diffs)
• tstRTR0ThreadPreemptionDriver.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp ) (12 diffs)

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

@@ -178 +178 @@
         tstRTR0SemMutexDriverHardened \
         tstRTR0TimerDriverHardened \
-        tstR0ThreadPreemptionDriverHardened \
+        tstRTR0ThreadPreemptionDriverHardened \
         tstRTR0ThreadDriverHardened
   DLLS     += \
@@ -184 +184 @@
         tstRTR0SemMutexDriver \
         tstRTR0TimerDriver \
-        tstR0ThreadPreemptionDriver \
+        tstRTR0ThreadPreemptionDriver \
         tstRTR0ThreadDriver
  else
@@ -191 +191 @@
         tstRTR0SemMutexDriver \
         tstRTR0TimerDriver \
-        tstR0ThreadPreemptionDriver \
+        tstRTR0ThreadPreemptionDriver \
         tstRTR0ThreadDriver
  endif
@@ -199 +199 @@
         tstRTR0SemMutex \
         tstRTR0Timer \
-        tstR0ThreadPreemption \
+        tstRTR0ThreadPreemption \
         tstRTR0Thread
  ifdef VBOX_WITH_RAW_MODE
@@ -762 +762 @@
 
 
-tstR0ThreadPreemption_TEMPLATE = VBoxR0
-tstR0ThreadPreemption_INST = $(INST_TESTCASE)
-tstR0ThreadPreemption_DEFS = IN_RT_R0
-tstR0ThreadPreemption_SYSSUFF = .r0
-tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp
-tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
+tstRTR0ThreadPreemption_TEMPLATE = VBoxR0
+tstRTR0ThreadPreemption_INST = $(INST_TESTCASE)
+tstRTR0ThreadPreemption_DEFS = IN_RT_R0
+tstRTR0ThreadPreemption_SYSSUFF = .r0
+tstRTR0ThreadPreemption_SOURCES = tstRTR0ThreadPreemption.cpp
+tstRTR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
 if1of ($(VBOX_LDR_FMT), pe lx)
- tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
+ tstRTR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
 endif
 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
- tstR0ThreadPreemptionDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
- tstR0ThreadPreemptionDriverHardened_NAME = tstR0ThreadPreemptionDriver
- tstR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstR0ThreadPreemptionDriver\"
- tstR0ThreadPreemptionDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
- tstR0ThreadPreemptionDriver_TEMPLATE = VBoxR3TstDll
+ tstRTR0ThreadPreemptionDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
+ tstRTR0ThreadPreemptionDriverHardened_NAME = tstRTR0ThreadPreemptionDriver
+ tstRTR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR=\"tstRTR0ThreadPreemptionDriver\"
+ tstRTR0ThreadPreemptionDriverHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
+ tstRTR0ThreadPreemptionDriver_TEMPLATE = VBoxR3TstDll
 else
- tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE
-endif
-tstR0ThreadPreemptionDriver_SOURCES = tstR0ThreadPreemptionDriver.cpp
+ tstRTR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE
+endif
+tstRTR0ThreadPreemptionDriver_SOURCES = tstRTR0ThreadPreemptionDriver.cpp
 
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 #include <iprt/string.h>
 #include <VBox/sup.h>
-#include "tstR0ThreadPreemption.h"
+#include "tstRTR0ThreadPreemption.h"
 
 
@@ -181 +181 @@
     switch (uOperation)
     {
-        case TSTR0THREADPREMEPTION_SANITY_OK:
-            break;
-
-        case TSTR0THREADPREMEPTION_SANITY_FAILURE:
+        case TSTRTR0THREADPREEMPTION_SANITY_OK:
+            break;
+
+        case TSTRTR0THREADPREEMPTION_SANITY_FAILURE:
             RTStrPrintf(pszErr, cchErr, "!42failure42%1024s", "");
             break;
 
-        case TSTR0THREADPREMEPTION_BASIC:
+        case TSTRTR0THREADPREEMPTION_BASIC:
         {
             if (!ASMIntAreEnabled())
@@ -207 +207 @@
         }
 
-        case TSTR0THREADPREMEPTION_IS_TRUSTY:
+        case TSTRTR0THREADPREEMPTION_IS_TRUSTY:
             if (!RTThreadPreemptIsPendingTrusty())
                 RTStrPrintf(pszErr, cchErr, "!Untrusty");
             break;
 
-        case TSTR0THREADPREMEPTION_IS_PENDING:
+        case TSTRTR0THREADPREEMPTION_IS_PENDING:
         {
             RTTHREADPREEMPTSTATE State = RTTHREADPREEMPTSTATE_INITIALIZER;
@@ -259 +259 @@
         }
 
-        case TSTR0THREADPREMEPTION_NESTED:
+        case TSTRTR0THREADPREEMPTION_NESTED:
         {
             bool const fDefault = RTThreadPreemptIsEnabled(NIL_RTTHREAD);
@@ -294 +294 @@
         }
 
-        case TSTR0THREADPREEMPTION_CTXHOOKS:
+        case TSTRTR0THREADPREEMPTION_CTXHOOKS:
         {
             if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #ifdef IN_RING0
 RT_C_DECLS_BEGIN
-DECLEXPORT(int) TSTR0ThreadPreemptionSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
-                                                   uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
+DECLEXPORT(int) TSTRTR0ThreadPreemptionSrvReqHandler(PSUPDRVSESSION pSession, uint32_t uOperation,
+                                                     uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
 RT_C_DECLS_END
 #endif
 
-typedef enum TSTR0THREADPREMEPTION
+typedef enum TSTRTR0THREADPREEMPTION
 {
-    TSTR0THREADPREMEPTION_SANITY_OK = 1,
-    TSTR0THREADPREMEPTION_SANITY_FAILURE,
-    TSTR0THREADPREMEPTION_BASIC,
-    TSTR0THREADPREMEPTION_IS_TRUSTY,
-    TSTR0THREADPREMEPTION_IS_PENDING,
-    TSTR0THREADPREMEPTION_NESTED,
-    TSTR0THREADPREEMPTION_CTXHOOKS
-} TSTR0THREADPREMEPTION;
+    TSTRTR0THREADPREEMPTION_SANITY_OK = 1,
+    TSTRTR0THREADPREEMPTION_SANITY_FAILURE,
+    TSTRTR0THREADPREEMPTION_BASIC,
+    TSTRTR0THREADPREEMPTION_IS_TRUSTY,
+    TSTRTR0THREADPREEMPTION_IS_PENDING,
+    TSTRTR0THREADPREEMPTION_NESTED,
+    TSTRTR0THREADPREEMPTION_CTXHOOKS
+} TSTRTR0THREADPREEMPTION;
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
 #ifdef VBOX
 # include <VBox/sup.h>
-# include "tstR0ThreadPreemption.h"
+# include "tstRTR0ThreadPreemption.h"
 #endif
 
@@ -88 +88 @@
      */
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstR0ThreadPreemption", &hTest);
+    int rc = RTTestInitAndCreate("tstRTR0ThreadPreemption", &hTest);
     if (rc)
         return rc;
@@ -104 +104 @@
     rc = RTPathExecDir(szPath, sizeof(szPath));
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(szPath, sizeof(szPath), "tstR0ThreadPreemption.r0");
+        rc = RTPathAppend(szPath, sizeof(szPath), "tstRTR0ThreadPreemption.r0");
     if (RT_FAILURE(rc))
     {
@@ -112 +112 @@
 
     void *pvImageBase;
-    rc = SUPR3LoadServiceModule(szPath, "tstR0ThreadPreemption",
-                                "TSTR0ThreadPreemptionSrvReqHandler",
+    rc = SUPR3LoadServiceModule(szPath, "tstRTR0ThreadPreemption",
+                                "TSTRTR0ThreadPreemptionSrvReqHandler",
                                 &pvImageBase);
     if (RT_FAILURE(rc))
@@ -135 +135 @@
     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("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                             TSTRTR0THREADPREEMPTION_SANITY_OK, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -146 +146 @@
     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("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                             TSTRTR0THREADPREEMPTION_SANITY_FAILURE, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -161 +161 @@
     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("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                             TSTRTR0THREADPREEMPTION_BASIC, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -180 +180 @@
     Req.Hdr.cbReq = sizeof(Req);
     Req.szMsg[0] = '\0';
-    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                             TSTR0THREADPREMEPTION_IS_TRUSTY, 0, &Req.Hdr), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                             TSTRTR0THREADPREEMPTION_IS_TRUSTY, 0, &Req.Hdr), VINF_SUCCESS);
     if (RT_FAILURE(rc))
         return RTTestSummaryAndDestroy(hTest);
@@ -212 +212 @@
         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);
+        RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                                 TSTRTR0THREADPREEMPTION_IS_PENDING, 0, &Req.Hdr), VINF_SUCCESS);
         if (    strcmp(Req.szMsg, "!cLoops=1\n")
             ||  i >= 64)
@@ -241 +241 @@
     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);
+    RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                             TSTRTR0THREADPREEMPTION_NESTED, 0, &Req.Hdr), VINF_SUCCESS);
     if (Req.szMsg[0] == '!')
         RTTestIFailed("%s", &Req.szMsg[1]);
@@ -261 +261 @@
         Req.Hdr.cbReq = sizeof(Req);
         Req.szMsg[0] = '\0';
-        RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
-                                                 TSTR0THREADPREEMPTION_CTXHOOKS, 0, &Req.Hdr), VINF_SUCCESS);
+        RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstRTR0ThreadPreemption", sizeof("tstRTR0ThreadPreemption") - 1,
+                                                 TSTRTR0THREADPREEMPTION_CTXHOOKS, 0, &Req.Hdr), VINF_SUCCESS);
         if (RT_FAILURE(rc))
             return RTTestSummaryAndDestroy(hTest);