Changeset 51941 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Jul 8, 2014 5:50:10 PM (11 years ago)

Author:

vboxsync

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

94834

Message:

SUPDrv-win.cpp: Use the RTTerm/RTOnce stuff to clean up that default random number generator instance the driver verifier is upset about (leak).

File:

• trunk/src/VBox/Runtime/common/misc/once.cpp (modified) (11 diffs)

trunk/src/VBox/Runtime/common/misc/once.cpp

@@ -34 +34 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
-#include <iprt/critsect.h>
+#ifdef IN_RING3
+# include <iprt/critsect.h>
+# define RTONCE_USE_CRITSECT_FOR_TERM
+#elif defined(IN_RING0)
+# include <iprt/spinlock.h>
+# define RTONCE_USE_SPINLOCK_FOR_TERM
+#else
+# define RTONCE_NO_TERM
+#endif
 #include <iprt/err.h>
 #include <iprt/initterm.h>
@@ -44 +52 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef IN_RING3
-
+#ifndef RTONCE_NO_TERM
 /** For initializing the clean-up list code. */
 static RTONCE           g_OnceCleanUp = RTONCE_INITIALIZER;
-/** Critical section protecting the clean-up list. */
+/** Lock protecting the clean-up list. */
+#ifdef RTONCE_USE_CRITSECT_FOR_TERM
 static RTCRITSECT       g_CleanUpCritSect;
+#else
+static RTSEMFASTMUTEX   g_hCleanUpLock;
+#endif
 /** The clean-up list. */
 static RTLISTANCHOR     g_CleanUpList;
+
+/** Locks the clean-up list. */
+#ifdef RTONCE_USE_CRITSECT_FOR_TERM
+# define RTONCE_CLEANUP_LOCK()      RTCritSectEnter(&g_CleanUpCritSect)
+#else
+# define RTONCE_CLEANUP_LOCK()      RTSemFastMutexRequest(g_hCleanUpLock);
+#endif
+
+/** Unlocks the clean-up list. */
+#ifdef RTONCE_USE_CRITSECT_FOR_TERM
+# define RTONCE_CLEANUP_UNLOCK()    RTCritSectLeave(&g_CleanUpCritSect);
+#else
+# define RTONCE_CLEANUP_UNLOCK()    RTSemFastMutexRelease(g_hCleanUpLock);
+#endif
+
 
 
@@ -58 +84 @@
 {
     bool const fLazyCleanUpOk = RTTERMREASON_IS_LAZY_CLEANUP_OK(enmReason);
-    RTCritSectEnter(&g_CleanUpCritSect); /* Potentially dangerous. */
+    RTONCE_CLEANUP_LOCK();      /* Potentially dangerous. */
 
     PRTONCE pCur, pPrev;
@@ -87 +113 @@
     }
 
-    RTCritSectLeave(&g_CleanUpCritSect);
-    NOREF(pvUser); NOREF(enmReason); NOREF(iStatus);
+    RTONCE_CLEANUP_UNLOCK();
+
+    /*
+     * Reset our own structure and the critsect / mutex.
+     */
+    if (!fLazyCleanUpOk)
+    {
+# ifdef RTONCE_USE_CRITSECT_FOR_TERM
+        RTCritSectDelete(&g_CleanUpCritSect);
+# else
+        RTSemFastMutexDestroy(g_hCleanUpLock);
+        g_hCleanUpLock = NIL_RTSEMFASTMUTEX;
+# endif
+
+        ASMAtomicWriteS32(&g_OnceCleanUp.rc, VERR_INTERNAL_ERROR);
+        ASMAtomicWriteS32(&g_OnceCleanUp.iState, RTONCESTATE_UNINITIALIZED);
+    }
+
+    NOREF(pvUser); NOREF(iStatus);
 }
 
@@ -103 +146 @@
     NOREF(pvUser);
     RTListInit(&g_CleanUpList);
+# ifdef RTONCE_USE_CRITSECT_FOR_TERM
     int rc = RTCritSectInit(&g_CleanUpCritSect);
+# else
+    int rc = RTSemFastMutexCreate(&g_hCleanUpLock);
+# endif
     if (RT_SUCCESS(rc))
     {
@@ -110 +157 @@
             return rc;
 
+# ifdef RTONCE_USE_CRITSECT_FOR_TERM
         RTCritSectDelete(&g_CleanUpCritSect);
+# else
+        RTSemFastMutexDestroy(g_hCleanUpLock);
+        g_hCleanUpLock = NIL_RTSEMFASTMUTEX;
+# endif
     }
     return rc;
 }
 
-#endif /* IN_RING3 */
-
-
+#endif /* !RTONCE_NO_TERM */
 
 /**
@@ -262 +312 @@
                  , VERR_INTERNAL_ERROR);
 
-#ifndef IN_RING3
+#ifdef RTONCE_NO_TERM
     AssertReturn(!pfnCleanUp, VERR_NOT_SUPPORTED);
-#else /* IN_RING3 */
+#else /* !RTONCE_NO_TERM */
 
     /*
@@ -275 +325 @@
             return rc;
     }
-#endif /* IN_RING3 */
+#endif /* !RTONCE_NO_TERM */
 
     /*
@@ -290 +340 @@
         ASMAtomicWriteS32(&pOnce->rc, rcOnce);
 
-#ifdef IN_RING3
+#ifndef RTONCE_NO_TERM
         /*
          * Register clean-up if requested and we were successful.
@@ -296 +346 @@
         if (pfnCleanUp && RT_SUCCESS(rcOnce))
         {
-            RTCritSectEnter(&g_CleanUpCritSect);
+            RTONCE_CLEANUP_LOCK();
+
             pOnce->pfnCleanUp = pfnCleanUp;
             pOnce->pvUser     = pvUser;
             RTListAppend(&g_CleanUpList, &pOnce->CleanUpNode);
-            RTCritSectLeave(&g_CleanUpCritSect);
+
+            RTONCE_CLEANUP_UNLOCK();
         }
-#endif
+#endif /* !RTONCE_NO_TERM */
 
         /*
@@ -367 +419 @@
     NOREF(iState);
 
-#ifdef IN_RING3
+#ifndef RTONCE_NO_TERM
     /* Unregister clean-up. */
     if (pOnce->pfnCleanUp)
     {
-        RTCritSectEnter(&g_CleanUpCritSect);
+        RTONCE_CLEANUP_LOCK();
+
         RTListNodeRemove(&pOnce->CleanUpNode);
         pOnce->pfnCleanUp = NULL;
         pOnce->pvUser     = NULL;
-        RTCritSectLeave(&g_CleanUpCritSect);
-    }
-#endif /* IN_RING3 */
+
+        RTONCE_CLEANUP_UNLOCK();
+    }
+#endif /* !RTONCE_NO_TERM */
 
     /* Do the same as RTONCE_INITIALIZER does. */