vbox的更動 47302 路徑 trunk/src/VBox/Runtime/r0drv

時間撮記:

2013-7-22 下午02:18:41 (11 年 以前)

作者:

vboxsync

訊息:

r0drv/threadctxhooks: Use the right function prototypes on S10, S11 as we might have to use freectx() in which case it does matter.

位置:

trunk/src/VBox/Runtime/r0drv/solaris

檔案:

• initterm-r0drv-solaris.c (修改) (3 筆差異)
• the-solaris-kernel.h (修改) (1 筆差異)
• threadctxhooks-r0drv-solaris.c (修改) (2 筆差異)

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

@@ -67 +67 @@
 /** The xc_call callout table structure. */
 RTR0FNSOLXCCALL                 g_rtSolXcCall;
+/** Whether to use the old-style installctx()/removectx() routines. */
+bool                            g_frtSolOldThreadCtx = false;
+/** The thread-context hooks callout table structure. */
+RTR0FNSOLTHREADCTX              g_rtSolThreadCtx;
 /** Thread preemption offset. */
 size_t                          g_offrtSolThreadPreempt;
@@ -127 +131 @@
             goto errorbail;
         }
-        cmn_err(CE_CONT, "!cpu_t::cpu_runrun @ 0x%lx\n",    g_offrtSolCpuPreempt);
-        cmn_err(CE_CONT, "!cpu_t::cpu_kprunrun @ 0x%lx\n",  g_offrtSolCpuForceKernelPreempt);
-        cmn_err(CE_CONT, "!kthread_t::t_preempt @ 0x%lx\n", g_offrtSolThreadPreempt);
+        cmn_err(CE_CONT, "!cpu_t::cpu_runrun @ 0x%lx (%ld)\n",    g_offrtSolCpuPreempt, g_offrtSolCpuPreempt);
+        cmn_err(CE_CONT, "!cpu_t::cpu_kprunrun @ 0x%lx (%ld)\n",  g_offrtSolCpuForceKernelPreempt, g_offrtSolCpuForceKernelPreempt);
+        cmn_err(CE_CONT, "!kthread_t::t_preempt @ 0x%lx (%ld)\n", g_offrtSolThreadPreempt, g_offrtSolThreadPreempt);
 
         /*
@@ -161 +165 @@
                 goto errorbail;
             }
+        }
+
+        /*
+         * Mandatory: Thread-context hooks.
+         */
+        rc = RTR0DbgKrnlInfoQuerySymbol(g_hKrnlDbgInfo, NULL /* pszModule */, "exitctx",  NULL /* ppvSymbol */);
+        if (RT_SUCCESS(rc))
+        {
+            g_rtSolThreadCtx.Install.pfnSol_installctx = (void *)installctx;
+            g_rtSolThreadCtx.Remove.pfnSol_removectx =   (void *)removectx;
+        }
+        else
+        {
+            g_frtSolOldThreadCtx = true;
+            g_rtSolThreadCtx.Install.pfnSol_installctx_old = (void *)installctx;
+            g_rtSolThreadCtx.Remove.pfnSol_removectx_old   = (void *)removectx;
         }
 

trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

@@ -148 +148 @@
 extern bool                     g_frtSolOldIPIUlong;
 
+/*
+ * Thread-context hooks.
+ * Workarounds for older Solaris versions that did not have the exitctx() callback.
+ */
+typedef struct RTR0FNSOLTHREADCTX
+{
+    union
+    {
+        void *(*pfnSol_installctx)        (kthread_t *pThread, void *pvArg,
+                                           void (*pfnSave)(void *pvArg),
+                                           void (*pfnRestore)(void *pvArg),
+                                           void (*pfnFork)(void *pvThread, void *pvThreadFork),
+                                           void (*pfnLwpCreate)(void *pvThread, void *pvThreadCreate),
+                                           void (*pfnExit)(void *pvThread),
+                                           void (*pfnFree)(void *pvArg, int fIsExec));
+
+        void *(*pfnSol_installctx_old)    (kthread_t *pThread, void *pvArg,
+                                           void (*pfnSave)(void *pvArg),
+                                           void (*pfnRestore)(void *pvArg),
+                                           void (*pfnFork)(void *pvThread, void *pvThreadFork),
+                                           void (*pfnLwpCreate)(void *pvThread, void *pvThreadCreate),
+                                           void (*pfnFree)(void *pvArg, int fIsExec));
+    } Install;
+
+    union
+    {
+        int (*pfnSol_removectx)           (kthread_t *pThread, void *pvArg,
+                                           void (*pfnSave)(void *pvArg),
+                                           void (*pfnRestore)(void *pvArg),
+                                           void (*pfnFork)(void *pvThread, void *pvThreadFork),
+                                           void (*pfnLwpCreate)(void *pvThread, void *pvThreadCreate),
+                                           void (*pfnExit)(void *pvThread),
+                                           void (*pfnFree)(void *pvArg, int fIsExec));
+
+        int (*pfnSol_removectx_old)       (kthread_t *pThread, void *pvArg,
+                                           void (*pfnSave)(void *pvArg),
+                                           void (*pfnRestore)(void *pvArg),
+                                           void (*pfnFork)(void *pvThread, void *pvThreadFork),
+                                           void (*pfnLwpCreate)(void *pvThread, void *pvThreadCreate),
+                                           void (*pfnFree)(void *pvArg, int fIsExec));
+    } Remove;
+} RTR0FNSOLTHREADCTX;
+typedef RTR0FNSOLTHREADCTX *PRTR0FNSOLTHREADCTX;
+
+extern RTR0FNSOLTHREADCTX       g_rtSolThreadCtx;
+extern bool                     g_frtSolOldThreadCtx;
 
 /* Solaris globals. */

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

@@ -121 +121 @@
      * invoke the consumer's hook or not.
      */
-    installctx(curthread,
-               pThis,
-               rtThreadCtxHooksSolPreempting,
-               rtThreadCtxHooksSolResumed,
-               NULL,                            /* fork */
-               NULL,                            /* lwp_create */
-               NULL,                            /* exit */
-               NULL);                           /* free */
+    if (g_frtSolOldThreadCtx)
+    {
+        g_rtSolThreadCtx.Install.pfnSol_installctx_old(curthread,
+                                                       pThis,
+                                                       rtThreadCtxHooksSolPreempting,
+                                                       rtThreadCtxHooksSolResumed,
+                                                       NULL,                          /* fork */
+                                                       NULL,                          /* lwp_create */
+                                                       NULL);                         /* free */
+    }
+    else
+    {
+        g_rtSolThreadCtx.Install.pfnSol_installctx(curthread,
+                                                   pThis,
+                                                   rtThreadCtxHooksSolPreempting,
+                                                   rtThreadCtxHooksSolResumed,
+                                                   NULL,                              /* fork */
+                                                   NULL,                              /* lwp_create */
+                                                   NULL,                              /* exit */
+                                                   NULL);                             /* free */
+    }
 
     *phThreadCtx = pThis;
@@ -151 +164 @@
      * Deregister the hook.
      */
-    int rc = removectx(curthread,
-                       pThis,
-                       rtThreadCtxHooksSolPreempting,
-                       rtThreadCtxHooksSolResumed,
-                       NULL,                            /* fork */
-                       NULL,                            /* lwp_create */
-                       NULL,                            /* exit */
-                       NULL);                           /* free */
+    int rc;
+    if (g_frtSolOldThreadCtx)
+    {
+        rc = g_rtSolThreadCtx.Remove.pfnSol_removectx_old(curthread,
+                                                          pThis,
+                                                          rtThreadCtxHooksSolPreempting,
+                                                          rtThreadCtxHooksSolResumed,
+                                                          NULL,                          /* fork */
+                                                          NULL,                          /* lwp_create */
+                                                          NULL);                         /* free */
+    }
+    else
+    {
+        rc = g_rtSolThreadCtx.Remove.pfnSol_removectx(curthread,
+                                                      pThis,
+                                                      rtThreadCtxHooksSolPreempting,
+                                                      rtThreadCtxHooksSolResumed,
+                                                      NULL,                              /* fork */
+                                                      NULL,                              /* lwp_create */
+                                                      NULL,                              /* exit */
+                                                      NULL);                             /* free */
+    }
     AssertMsg(rc, ("removectx failed. rc=%d\n", rc));
     NOREF(rc);