Changeset 58182 in vbox

Timestamp:

Oct 12, 2015 1:23:07 PM (9 years ago)

Author:

vboxsync

Message:

VBoxService: fixed semaphore destruction race.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceAutoMount.cpp (modified) (2 diffs)
• VBoxServiceBalloon.cpp (modified) (3 diffs)
• VBoxServicePageSharing.cpp (modified) (3 diffs)
• VBoxServiceStats.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp

@@ -634 +634 @@
     }
 
-    RTSemEventMultiDestroy(g_AutoMountEvent);
-    g_AutoMountEvent = NIL_RTSEMEVENTMULTI;
-
     VGSvcVerbose(3, "vbsvcAutoMountWorker: Finished with rc=%Rrc\n", rc);
     return VINF_SUCCESS;
@@ -666 +663 @@
 static DECLCALLBACK(void) vbsvcAutoMountStop(void)
 {
-    /*
-     * We need this check because at the moment our auto-mount
-     * thread really is a one-timer which destroys the event itself
-     * after running.
-     */
-    if (g_AutoMountEvent != NIL_RTSEMEVENTMULTI)
-        RTSemEventMultiSignal(g_AutoMountEvent);
+    RTSemEventMultiSignal(g_AutoMountEvent);
 }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp

@@ -394 +394 @@
         VGSvcVerbose(3, "vgsvcBalloonInit: VbglR3CtlFilterMask failed with %Rrc\n", rc);
 
-    RTSemEventMultiDestroy(g_MemBalloonEvent);
-    g_MemBalloonEvent = NIL_RTSEMEVENTMULTI;
-
     VGSvcVerbose(3, "vgsvcBalloonInit: finished mem balloon change request thread\n");
     return VINF_SUCCESS;
@@ -408 +405 @@
 {
     RTSemEventMultiSignal(g_MemBalloonEvent);
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcBalloonTerm(void)
+{
+    if (g_MemBalloonEvent != NIL_RTSEMEVENTMULTI)
+    {
+        RTSemEventMultiDestroy(g_MemBalloonEvent);
+        g_MemBalloonEvent = NIL_RTSEMEVENTMULTI;
+    }
 }
 
@@ -430 +440 @@
     vgsvcBalloonWorker,
     vgsvcBalloonStop,
-    VGSvcDefaultTerm
+    vgsvcBalloonTerm
 };

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -761 +761 @@
         RTProcTerminate(hProcess);
 
-    RTSemEventMultiDestroy(g_PageSharingEvent);
-    g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
-
     VGSvcVerbose(3, "vgsvcPageSharingWorkerProcess: finished thread\n");
     return 0;
@@ -776 +773 @@
 {
     RTSemEventMultiSignal(g_PageSharingEvent);
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcPageSharingTerm(void)
+{
+    if (g_PageSharingEvent != NIL_RTSEMEVENTMULTI)
+    {
+        RTSemEventMultiDestroy(g_PageSharingEvent);
+        g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
+    }
 }
 
@@ -802 +812 @@
 #endif
     vgsvcPageSharingStop,
-    VGSvcDefaultTerm
+    vgsvcPageSharingTerm
 };
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp

@@ -685 +685 @@
         VGSvcVerbose(3, "vgsvcVMStatsWorker: VbglR3CtlFilterMask failed with %d\n", rc);
 
-    RTSemEventMultiDestroy(g_VMStatEvent);
-    g_VMStatEvent = NIL_RTSEMEVENTMULTI;
-
     VGSvcVerbose(3, "VBoxStatsThread: finished statistics change request thread\n");
     return 0;
@@ -699 +696 @@
 {
     RTSemEventMultiSignal(g_VMStatEvent);
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(void) vgsvcVMStatsTerm(void)
+{
+    if (g_VMStatEvent != NIL_RTSEMEVENTMULTI)
+    {
+        RTSemEventMultiDestroy(g_VMStatEvent);
+        g_VMStatEvent = NIL_RTSEMEVENTMULTI;
+    }
 }
 
@@ -721 +731 @@
     vgsvcVMStatsWorker,
     vgsvcVMStatsStop,
-    VGSvcDefaultTerm
+    vgsvcVMStatsTerm
 };