Changeset 17018 in vbox

Timestamp:

Feb 23, 2009 1:27:43 PM (16 years ago)

Author:

vboxsync

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

43218

Message:

RTProcIsRunningByName: spec update.

Location:

trunk

Files:

• include/iprt/process.h (modified) (1 diff)
• src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp (modified) (6 diffs)

trunk/include/iprt/process.h

@@ -249 +249 @@
 
 /**
- * Check if the given process is running on the system. This check is case
- * sensitive.
+ * Check if the given process is running on the system.
+ *
+ * This check is case sensitive on most systems, except for Windows, OS/2 and
+ * Darwin.
  *
  * @returns true if the process is running & false otherwise.
- * @param   pszName  Process name to search for.
+ * @param   pszName     Process name to search for. If no path is given only the
+ *                      filename part of the running process set will be
+ *                      matched. If a path is specified, the full path will be
+ *                      matched.
  */
 RTR3DECL(bool)  RTProcIsRunningByName(const char *pszName);

trunk/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp

@@ -52 +52 @@
         return false;
 
-    bool fFoundIt = false;
+    bool const fWithPath = RTPathHavePath(pszName);
+
+    /*
+     * Enumerate /proc.
+     */
     PRTDIR pDir;
     int rc = RTDirOpen(&pDir, "/proc");
@@ -99 +103 @@
                      * We are interested on the file name part only.
                      */
-                    char const *pszFilename = RTPathFilename(szExe);
-                    if (RTStrCmp(pszFilename, pszName) == 0)
+                    char const *pszProcName = fWithPath ? szExe : RTPathFilename(szExe);
+                    if (RTStrCmp(pszProcName, pszName) == 0)
                     {
                         /* Found it! */

trunk/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp

@@ -38 +38 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/string.h>
 
 
@@ -51 +52 @@
      * Test 1: Check for a definitely not running process.
      */
-    int rc = VERR_GENERAL_FAILURE;
     char szExecPath[RTPATH_MAX] = { "vbox-5b05e1ff-6ae2-4d10-885a-7d25018c4c5b" };
-    bool fRunning = RTProcIsRunningByName(szExecPath);
-    if (!fRunning)
+    if (!RTProcIsRunningByName(szExecPath))
         RTPrintf("tstRTProcIsRunningByName: Process '%s' is not running (expected).\n", szExecPath);
     else
@@ -63 +62 @@
 
     /*
-     * Test 2: Check for our own process.
+     * Test 2: Check for a definitely not running process.
+     */
+    strcpy(szExecPath, "/bin/vbox-5b05e1ff-6ae2-4d10-885a-7d25018c4c5b");
+    if (!RTProcIsRunningByName(szExecPath))
+        RTPrintf("tstRTProcIsRunningByName: Process '%s' is not running (expected).\n", szExecPath);
+    else
+    {
+        RTPrintf("tstRTProcIsRunningByName: FAILURE - '%s' is running! (test 1)\n", szExecPath);
+        cErrors++;
+    }
+
+    /*
+     * Test 3: Check for our own process, filename only.
      */
     if (RTProcGetExecutableName(szExecPath, RTPATH_MAX))
@@ -71 +82 @@
         if (pszFilename)
         {
-            bool fRunning = RTProcIsRunningByName(pszFilename);
-            if (fRunning)
+            if (RTProcIsRunningByName(pszFilename))
                 RTPrintf("tstRTProcIsRunningByName: Process '%s' (self) is running\n", pszFilename);
             else
@@ -85 +95 @@
             cErrors++;
         }
+
+        /*
+         * Test 4: Check for our own process, full path.
+         */
+        if (RTProcIsRunningByName(szExecPath))
+            RTPrintf("tstRTProcIsRunningByName: Process '%s' (self) is running\n", szExecPath);
+        else
+        {
+            RTPrintf("tstRTProcIsRunningByName: FAILURE - Process '%s' (self) is not running!\n", szExecPath);
+            cErrors++;
+        }
     }
     else
@@ -91 +112 @@
         cErrors++;
     }
+
 
     /*