Changeset 24179 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Oct 30, 2009 10:26:43 AM (15 years ago)

Author:

vboxsync

Message:

iprt/initterm.h,SUPDrv-solaris.c: Added RTR0TermForced so the module containing IPRT can make sure it's really terminated and that modules not calling RTR0Term doesn't create trouble (other than debug assertions). Use this for SUPDrv on Solaris.

File:

• trunk/src/VBox/Runtime/r0drv/initterm-r0drv.cpp (modified) (4 diffs)

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

@@ -83 +83 @@
     if (RT_SUCCESS(rc))
     {
-#if !defined(RT_OS_LINUX)
+#if !defined(RT_OS_LINUX) /** @todo implement thread2-r0drv-linux.c */
         rc = rtThreadInit();
 #endif
@@ -91 +91 @@
             rc = rtR0MpNotificationInit();
             if (RT_SUCCESS(rc))
+            {
                 rc = rtR0PowerNotificationInit();
-#endif
+                if (RT_SUCCESS(rc))
+                    return rc;
+                rtR0MpNotificationTerm();
+            }
+#else
             if (RT_SUCCESS(rc))
                 return rc;
+#endif
+#if !defined(RT_OS_LINUX) /** @todo implement thread2-r0drv-linux.c */
+            rtThreadTerm();
+#endif
         }
-
         rtR0TermNative();
     }
@@ -102 +110 @@
 }
 RT_EXPORT_SYMBOL(RTR0Init);
+
+
+static void rtR0Term(void)
+{
+#if !defined(RT_OS_LINUX) /** @todo implement thread2-r0drv-linux.c */
+    rtThreadTerm();
+#endif
+#ifndef IN_GUEST /* play safe for now */
+    rtR0PowerNotificationTerm();
+    rtR0MpNotificationTerm();
+#endif
+    rtR0TermNative();
+}
 
 
@@ -112 +133 @@
     RT_ASSERT_PREEMPTIBLE();
 
-    /*
-     * Last user does the cleanup.
-     */
     cNewUsers = ASMAtomicDecS32(&g_crtR0Users);
     Assert(cNewUsers >= 0);
-    if (cNewUsers != 0)
-        return;
-
-#if !defined(RT_OS_LINUX)
-    rtThreadTerm();
-#endif
-#ifndef IN_GUEST /* play safe for now */
-    rtR0PowerNotificationTerm();
-    rtR0MpNotificationTerm();
-#endif
-    rtR0TermNative();
+    if (cNewUsers == 0)
+        rtR0Term();
 }
 RT_EXPORT_SYMBOL(RTR0Term);
 
+
+/* Note! Should *not* be exported since it's only for static linking. */
+RTR0DECL(void) RTR0TermForced(void)
+{
+    RT_ASSERT_PREEMPTIBLE();
+    AssertMsg(g_crtR0Users == 1, ("%d\n", g_crtR0Users));
+
+    rtR0Term();
+}
+