Changeset 52553 in vbox

Timestamp:

Sep 1, 2014 2:48:33 PM (10 years ago)

Author:

vboxsync

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

95812

Message:

HostDrivers/solaris, Runtime/r0drv: Fix calling RTThreadPreemptIs* too early on Solaris.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (3 diffs)
• Runtime/r0drv/initterm-r0drv.cpp (modified) (1 diff)
• Runtime/r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c (modified) (4 diffs)

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

@@ -201 +201 @@
 int _init(void)
 {
+#if 0    /* No IPRT logging before RTR0Init() is done! */
     LogFlowFunc(("vboxdrv:_init\n"));
+#endif
 
     /*
@@ -210 +212 @@
         pModCtl->mod_loadflags |= MOD_NOAUTOUNLOAD;
     else
-        LogRel(("vboxdrv: failed to disable autounloading!\n"));
+        cmn_err(CE_NOTE, "vboxdrv: failed to disable autounloading!\n");
 
     /*
@@ -300 +302 @@
 int _info(struct modinfo *pModInfo)
 {
-    LogFlowFunc(("vboxdrv:_info\n"));
+#if 0    /* No IPRT logging before RTR0Init() is done! And yes this is called before _init()!*/
+    LogFlowFunc(("vboxdrv:_init\n"));
+#endif
     int e = mod_info(&g_VBoxDrvSolarisModLinkage, pModInfo);
     return e;

trunk/src/VBox/Runtime/r0drv/initterm-r0drv.cpp

@@ -67 +67 @@
     uint32_t cNewUsers;
     Assert(fReserved == 0);
+#ifndef RT_OS_SOLARIS       /* On Solaris our thread preemption information is only obtained in rtR0InitNative().*/
     RT_ASSERT_PREEMPTIBLE();
+#endif
 
     /*

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

@@ -139 +139 @@
     AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER);
     AssertPtrReturn(phKrnlInfo, VERR_INVALID_POINTER);
-    RT_ASSERT_PREEMPTIBLE();
+    /* This can be called as part of IPRT init, in which case we have no thread preempt information yet. */
+    if (g_frtSolInitDone)
+        RT_ASSERT_PREEMPTIBLE();
 
     *phKrnlInfo = NIL_RTDBGKRNLINFO;
@@ -182 +184 @@
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertMsgReturn(pThis->u32Magic == RTDBGKRNLINFO_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), UINT32_MAX);
-    RT_ASSERT_PREEMPTIBLE();
+    if (g_frtSolInitDone)
+        RT_ASSERT_PREEMPTIBLE();
 
     uint32_t cRefs = ASMAtomicDecU32(&pThis->cRefs);
@@ -204 +207 @@
     AssertPtrReturn(pszStructure, VERR_INVALID_PARAMETER);
     AssertPtrReturn(poffMember, VERR_INVALID_PARAMETER);
-    RT_ASSERT_PREEMPTIBLE();
+    if (g_frtSolInitDone)
+        RT_ASSERT_PREEMPTIBLE();
 
     int rc = VERR_NOT_FOUND;
@@ -232 +236 @@
     AssertPtrNullReturn(ppvSymbol, VERR_INVALID_PARAMETER);
     AssertReturn(!pszModule, VERR_MODULE_NOT_FOUND);
-    RT_ASSERT_PREEMPTIBLE();
+    if (g_frtSolInitDone)
+        RT_ASSERT_PREEMPTIBLE();
 
     uintptr_t uValue = kobj_getsymvalue((char *)pszSymbol, 1 /* only kernel */);