Changeset 55863 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

May 14, 2015 6:29:34 PM (10 years ago)

Author:

vboxsync

Message:

IPRT,SUPDrv,VMM: Revised the context switching hook interface. Do less work when enabling the hook (formerly 'registration'). Drop the reference counting (kept internally for solaris) as it complicates restrictions wrt destroying enabled hooks. Bumped support driver version.

File:

• trunk/src/VBox/Runtime/testcase/tstRTR0ThreadPreemption.cpp (modified) (8 diffs)

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

@@ -49 +49 @@
     RTCPUID             uSourceCpuId;
     RTNATIVETHREAD      hSourceThread;
-    RTTHREADCTX         hThreadCtx;
 
     /* For RTTHREADCTXEVENT_PREEMPTING. */
@@ -82 +81 @@
     switch (enmEvent)
     {
-        case RTTHREADCTXEVENT_PREEMPTING:
+        case RTTHREADCTXEVENT_OUT:
         {
             ASMAtomicWriteBool(&pData->fPreemptingInvoked, true);
@@ -119 +118 @@
         }
 
-        case RTTHREADCTXEVENT_RESUMED:
+        case RTTHREADCTXEVENT_IN:
         {
             ASMAtomicWriteBool(&pData->fResumedInvoked, true);
@@ -302 +301 @@
             }
 
-            bool fRegistered = RTThreadCtxHooksAreRegistered(NIL_RTTHREADCTX);
+            bool fRegistered = RTThreadCtxHookIsEnabled(NIL_RTTHREADCTXHOOK);
             if (fRegistered)
             {
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksAreRegistered returns true before creating any hooks");
-                break;
-            }
-
-            RTTHREADCTX hThreadCtx;
-            int rc = RTThreadCtxHooksCreate(&hThreadCtx);
-            if (RT_FAILURE(rc))
-            {
-                if (rc == VERR_NOT_SUPPORTED)
-                    RTStrPrintf(pszErr, cchErr, "RTThreadCtxHooksCreate returns VERR_NOT_SUPPORTED");
-                else
-                    RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksCreate returns %Rrc", rc);
-                break;
-            }
-
-            fRegistered = RTThreadCtxHooksAreRegistered(hThreadCtx);
-            if (fRegistered)
-            {
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksAreRegistered returns true before registering any hooks");
-                RTThreadCtxHooksRelease(hThreadCtx);
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHookIsEnabled returns true before creating any hooks");
                 break;
             }
@@ -331 +311 @@
             AssertReturn(pCtxData, VERR_NO_MEMORY);
             pCtxData->u32Magic           = TSTRTR0THREADCTXDATA_MAGIC;
-            pCtxData->hThreadCtx         = hThreadCtx;
             pCtxData->fPreemptingSuccess = false;
             pCtxData->fPreemptingInvoked = false;
@@ -339 +318 @@
             RT_ZERO(pCtxData->achResult);
 
+            RTTHREADCTXHOOK hThreadCtx;
+            int rc = RTThreadCtxHookCreate(&hThreadCtx, 0, tstRTR0ThreadCtxHook, pCtxData);
+            if (RT_FAILURE(rc))
+            {
+                if (rc == VERR_NOT_SUPPORTED)
+                    RTStrPrintf(pszErr, cchErr, "RTThreadCtxHooksCreate returns VERR_NOT_SUPPORTED");
+                else
+                    RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksCreate returns %Rrc", rc);
+                RTMemFree(pCtxData);
+                break;
+            }
+
+            fRegistered = RTThreadCtxHookIsEnabled(hThreadCtx);
+            if (fRegistered)
+            {
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHookIsEnabled returns true before registering any hooks");
+                RTThreadCtxHookDestroy(hThreadCtx);
+                break;
+            }
+
             RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
             RTThreadPreemptDisable(&PreemptState);
@@ -345 +344 @@
             pCtxData->uSourceCpuId       = RTMpCpuId();
 
-            rc = RTThreadCtxHooksRegister(hThreadCtx, &tstRTR0ThreadCtxHook, pCtxData);
+            rc = RTThreadCtxHookEnable(hThreadCtx);
             if (RT_FAILURE(rc))
             {
                 RTThreadPreemptRestore(&PreemptState);
                 RTMemFree(pCtxData);
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksRegister returns %Rrc", rc);
-                break;
-            }
-
-            fRegistered = RTThreadCtxHooksAreRegistered(hThreadCtx);
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHookEnable returns %Rrc", rc);
+                break;
+            }
+
+            fRegistered = RTThreadCtxHookIsEnabled(hThreadCtx);
             if (!fRegistered)
             {
                 RTThreadPreemptRestore(&PreemptState);
                 RTMemFree(pCtxData);
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksAreRegistered return false when hooks are supposedly registered");
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHookIsEnabled return false when hooks are supposedly registered");
                 break;
             }
@@ -428 +427 @@
             }
 
-            RTThreadCtxHooksDeregister(hThreadCtx);
-
-            fRegistered = RTThreadCtxHooksAreRegistered(hThreadCtx);
+            RTThreadCtxHookDisable(hThreadCtx);
+
+            fRegistered = RTThreadCtxHookIsEnabled(hThreadCtx);
             if (fRegistered)
             {
                 RTMemFree(pCtxData);
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksAreRegistered return true when hooks are deregistered");
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHookIsEnabled return true when hooks are deregistered");
                 break;
             }
 
             Assert(RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-            uint32_t cRefs = RTThreadCtxHooksRelease(hThreadCtx);
-            if (cRefs == UINT32_MAX)
-                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksRelease returns invalid cRefs!");
+            rc = RTThreadCtxHookDestroy(hThreadCtx);
+            if (RT_FAILURE(rc))
+                RTStrPrintf(pszErr, cchErr, "!RTThreadCtxHooksRelease returns %Rrc!", rc);
 
             RTMemFree(pCtxData);