Changeset 68102 in vbox

Timestamp:

Jul 25, 2017 9:36:25 AM (8 years ago)

Author:

vboxsync

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

117154

Message:

R0 guest library: move HGCM globals out of global library structure.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
As part of elimitating dependencies of the HGCM R0 guest library code on the
rest of the library, move its global variables (handles and mutex) out of the
global library structure and into HGCM.cpp. The aim is to reduce the number
of library files included in the Linux shared folder driver.

Signed-off-by: Hans de Goede <hdegoede@…>
Reworked by Oracle.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCM.cpp (modified) (5 diffs)
• VBGLInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp

@@ -40 +40 @@
 
 /**
- * Initializes the HGCM VBGL bits.
- *
- * @return VBox status code.
- */
-int vbglR0HGCMInit(void)
-{
-    return RTSemFastMutexCreate(&g_vbgldata.mutexHGCMHandle);
-}
+ * Fast heap for HGCM handles data.
+ * @{
+ */
+
+static RTSEMFASTMUTEX mutexHGCMHandle;
+
+static struct VBGLHGCMHANDLEDATA aHGCMHandleData[64];
+
+/** @} */
 
 /**
@@ -54 +55 @@
  * @return VBox status code.
  */
+int vbglR0HGCMInit(void)
+{
+    AssertReturn(mutexHGCMHandle == NIL_RTSEMFASTMUTEX, VINF_ALREADY_INITIALIZED);
+    return RTSemFastMutexCreate(&mutexHGCMHandle);
+}
+
+/**
+ * Initializes the HGCM VBGL bits.
+ *
+ * @return VBox status code.
+ */
 int vbglR0HGCMTerminate(void)
 {
-    RTSemFastMutexDestroy(g_vbgldata.mutexHGCMHandle);
-    g_vbgldata.mutexHGCMHandle = NIL_RTSEMFASTMUTEX;
+    RTSemFastMutexDestroy(mutexHGCMHandle);
+    mutexHGCMHandle = NIL_RTSEMFASTMUTEX;
 
     return VINF_SUCCESS;
@@ -64 +76 @@
 DECLINLINE(int) vbglHandleHeapEnter(void)
 {
-    int rc = RTSemFastMutexRequest(g_vbgldata.mutexHGCMHandle);
+    int rc = RTSemFastMutexRequest(mutexHGCMHandle);
 
     VBGL_HGCM_ASSERT_MSG(RT_SUCCESS(rc), ("Failed to request handle heap mutex, rc = %Rrc\n", rc));
@@ -73 +85 @@
 DECLINLINE(void) vbglHandleHeapLeave(void)
 {
-    RTSemFastMutexRelease(g_vbgldata.mutexHGCMHandle);
+    RTSemFastMutexRelease(mutexHGCMHandle);
 }
 
@@ -86 +98 @@
         /* Simple linear search in array. This will be called not so often, only connect/disconnect. */
         /** @todo bitmap for faster search and other obvious optimizations. */
-        for (i = 0; i < RT_ELEMENTS(g_vbgldata.aHGCMHandleData); i++)
+        for (i = 0; i < RT_ELEMENTS(aHGCMHandleData); i++)
         {
-            if (!g_vbgldata.aHGCMHandleData[i].fAllocated)
+            if (!aHGCMHandleData[i].fAllocated)
             {
-                p = &g_vbgldata.aHGCMHandleData[i];
+                p = &aHGCMHandleData[i];
                 p->fAllocated = 1;
                 break;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

@@ -108 +108 @@
 
     /** @} */
-
-    /**
-     * Fast heap for HGCM handles data.
-     * @{
-     */
-
-    RTSEMFASTMUTEX mutexHGCMHandle;
-
-    struct VBGLHGCMHANDLEDATA aHGCMHandleData[64];
-
-    /** @} */
 #endif
 } VBGLDATA;