Changeset 86873 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Nov 12, 2020 10:30:55 AM (4 years ago)

Author:

vboxsync

Message:

Additions/VBoxClient: Big revamp of the internal service handling and termination fixes. A service now runs as part of a worker thread, while the main thread is used for initialization / shutdown and signal handling [build fix].

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• clipboard.cpp (modified) (4 diffs)
• display-svga-x11.cpp (modified) (3 diffs)
• draganddrop.cpp (modified) (1 diff)
• hostversion.cpp (modified) (1 diff)
• seamless.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -440 +440 @@
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_FUSE */
 
-/** @copydoc VBCLSERVICE::pfnInit */
-static int vbclShClInit(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbclShClInit(void)
 {
     int rc;
@@ -455 +457 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnWorker */
-static int vbclShClWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbclShClWorker(bool volatile *pfShutdown)
 {
     RT_NOREF(pfShutdown);
@@ -491 +495 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnStop */
-static void vbclShClStop(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbclShClStop(void)
 {
     /* Disconnect from the host service.
@@ -500 +506 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnTerm */
-static int vbclShClTerm(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(int) vbclShClTerm(void)
 {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -760 +760 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnInit */
-static int vbclSVGAInit(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbclSVGAInit(void)
 {
     /* In 32-bit guests GAs build on our release machines causes an xserver hang.
@@ -789 +791 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnStop */
-static void vbclSVGAStop(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbclSVGAStop(void)
 {
     if (mpMonitorPositions)
@@ -1342 +1346 @@
 }
 
-static int vbclSVGAWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbclSVGAWorker(bool volatile *pfShutdown)
 {
     RT_NOREF(pfShutdown);

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -3556 +3556 @@
     return rc;
 }
-/** @copydoc VBCLSERVICE::pfnInit */
-static int vbclDnDInit(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbclDnDInit(void)
 {
     return g_Svc.init();
 }
 
-/** @copydoc VBCLSERVICE::pfnWorker */
-static int vbclDnDWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbclDnDWorker(bool volatile *pfShutdown)
 {
     return g_Svc.worker(pfShutdown);
 }
 
-/** @copydoc VBCLSERVICE::pfnStop */
-static void vbclDnDStop(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbclDnDStop(void)
 {
     g_Svc.stop();
 }
 
-/** @copydoc VBCLSERVICE::pfnTerm */
-static int vbclDnDTerm(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(int) vbclDnDTerm(void)
 {
     return g_Svc.term();

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -117 +117 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnWorker */
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnWorker}
+ */
 /** @todo Move this part in VbglR3 and just provide a callback for the platform-specific
           notification stuff, since this is very similar to the VBoxTray code. */
-static int vbclHostVerWorker(bool volatile *pfShutdown)
+static DECLCALLBACK(int) vbclHostVerWorker(bool volatile *pfShutdown)
 {
     RT_NOREF(pfShutdown);

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -315 +315 @@
 }
 
-/** @copydoc VBCLSERVICE::pfnInit */
-static int vbclSeamlessInit(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnInit}
+ */
+static DECLCALLBACK(int) vbclSeamlessInit(void)
 {
     return g_Svc.mSeamless.init();
 }
 
-/** @copydoc VBCLSERVICE::pfnWorker */
-static int vbclSeamlessWorker(bool volatile *pfShutdown)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnWorker}
+ */
+static DECLCALLBACK(int) vbclSeamlessWorker(bool volatile *pfShutdown)
 {
     return g_Svc.mSeamless.worker(pfShutdown);
 }
 
-/** @copydoc VBCLSERVICE::pfnStop */
-static void vbclSeamlessStop(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnStop}
+ */
+static DECLCALLBACK(void) vbclSeamlessStop(void)
 {
     return g_Svc.mSeamless.stop();
 }
 
-/** @copydoc VBCLSERVICE::pfnTerm */
-static int vbclSeamlessTerm(void)
+/**
+ * @interface_method_impl{VBCLSERVICE,pfnTerm}
+ */
+static DECLCALLBACK(int) vbclSeamlessTerm(void)
 {
     return g_Svc.mSeamless.term();