Changeset 57721 in vbox for trunk/src

Timestamp:

Sep 11, 2015 3:51:18 PM (9 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: instead of relying on 'pidof', explicitly ask the VBoxService process to create the PID file

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxService/VBoxService.cpp (modified) (7 diffs)
• common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)
• linux/installer/vboxadd-service.sh (modified) (5 diffs)

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

@@ -71 +71 @@
 int                  g_cVerbosity = 0;
 char                 g_szLogFile[RTPATH_MAX + 128] = "";
+char                 g_szPidFile[RTPATH_MAX] = "";
 /** Logging parameters. */
 /** @todo Make this configurable later. */
@@ -290 +291 @@
 }
 
+/*
+ * Create the PID file.
+ */
+int vboxServiceCreatePidFile(const char *pszPidFile)
+{
+    RTFILE hFile;
+    int rc = RTFileOpen(&hFile, pszPidFile, RTFILE_O_WRITE | RTFILE_O_TRUNCATE);
+    if (RT_SUCCESS(rc))
+    {
+        char szPid[32];
+        RTPROCESS Process = RTProcSelf();
+        size_t cb = RTStrPrintf(szPid, sizeof(szPid), "%RU64\n", (uint64_t)Process);
+        rc = RTFileWrite(hFile, szPid, cb, NULL);
+        int rc2 = RTFileClose(hFile);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+    if (RT_FAILURE(rc))
+        VBoxServiceError("Failed to create PID file: %Rrc\n", rc);
+    return rc;
+}
+
 
 /**
@@ -300 +323 @@
     RTPrintf("Usage:\n"
              " %-12s [-f|--foreground] [-v|--verbose] [-l|--logfile <file>]\n"
-             "              [-i|--interval <seconds>]\n"
+             "              [-p|--pidfile <file>] [-i|--interval <seconds>]\n"
              "              [--disable-<service>] [--enable-<service>]\n"
              "              [--only-<service>] [-h|-?|--help]\n", g_pszProgName);
@@ -314 +337 @@
              "    -f | --foreground       Don't daemonize the program. For debugging.\n"
              "    -l | --logfile <file>   Enables logging to a file.\n"
+             "    -p | --pidfile <file>   Write the process ID to a file.\n"
              "    -v | --verbose          Increment the verbosity level. For debugging.\n"
              "    -V | --version          Show version information.\n"
@@ -908 +932 @@
             else if (MATCHES("logfile"))
                 psz = "l";
+            else if (MATCHES("pidfile"))
+                psz = "p";
             else if (MATCHES("daemonized"))
             {
@@ -1004 +1030 @@
                 }
 
+                case 'p':
+                {
+                    rc = VBoxServiceArgString(argc, argv, psz + 1, &i,
+                                              g_szPidFile, sizeof(g_szPidFile));
+                    if (rc)
+                        return rc;
+                    psz = NULL;
+                    break;
+                }
+
                 default:
                 {
@@ -1125 +1161 @@
 #endif /* RT_OS_WINDOWS */
         rc = VBoxServiceStartServices();
+        if (RT_SUCCESS(rc))
+        {
+            if (strlen(g_szPidFile))
+                rc = vboxServiceCreatePidFile(g_szPidFile);
+        }
         rcExit = RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
         if (RT_SUCCESS(rc))

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

@@ -1977 +1977 @@
                         char szVar[_1K];
                         char szValue[_16K];
-                        int rc2 = RTEnvGetByIndexEx(hEnv, iVar, szVar, sizeof(szVar), szValue, sizeof(szValue));
+                        rc2 = RTEnvGetByIndexEx(hEnv, iVar, szVar, sizeof(szVar), szValue, sizeof(szValue));
                         if (RT_SUCCESS(rc2))
                             VBoxServiceVerbose(4, "\t%s=%s\n", szVar, szValue);

trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh

@@ -94 +94 @@
 if [ "$system" = "debian" ]; then
     daemon() {
-        start-stop-daemon --start --exec $1 -- $2
+        start-stop-daemon --start --exec $1 -- $2 $3
     }
 
@@ -121 +121 @@
     fi
     daemon() {
-        start-stop-daemon --start --exec $1 -- $2
+        start-stop-daemon --start --exec $1 -- $2 $3
     }
 
@@ -147 +147 @@
 if [ "$system" = "slackware" -o "$system" = "other" ]; then
     daemon() {
-        $1 $2
+        $1 $2 $3
     }
 
@@ -172 +172 @@
     . /etc/rc.d/init.d/functions
     daemon() {
-        loadproc $1 $2
+        loadproc $1 $2 $3
     }
 
@@ -213 +213 @@
         }
         testbinary
-        daemon $binary > /dev/null
+        daemon $binary --pidfile $PIDFILE > /dev/null
         RETVAL=$?
-        test $RETVAL -eq 0 && echo `pidof VBoxService` > $PIDFILE
         succ_msg
     fi