Changeset 29775 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 25, 2010 11:37:55 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService.cpp: Same code everywhere, please.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (3 diffs)

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

@@ -443 +443 @@
 
 #ifndef RT_OS_WINDOWS
-/*
- * Block all important signals, then explicitly wait until one of these signal arrives.
+/**
+ * Block all important signals, then explicitly wait until one of these
+ * signal arrives.
  */
 static void VBoxServiceWaitSignal(void)
@@ -458 +459 @@
     pthread_sigmask(SIG_BLOCK, &signalMask, NULL);
 
+    /* This loop is required on Solaris at least. FreeBSD doesn't know ERESTART. */
     int rc;
-#ifndef RT_OS_FREEBSD
     do
     {
@@ -466 +467 @@
     }
     while (   rc == EINTR
-           || rc == ERESTART);
-#else
-    iSignal = -1;
-    rc = sigwait(&signalMask, &iSignal);
-#endif
+#ifdef ERESTART
+           || rc == ERESTART
+#endif
+          );
 
     VBoxServiceVerbose(3, "VBoxServiceWaitSignal: Received signal %d (rc=%d)\n", iSignal, rc);