儲存庫 vbox 的更動 17011

時間撮記:

2009-2-23 下午12:27:38 (16 年 以前)

作者:

vboxsync

訊息:

RTProcIsRunningByName cleanup.

位置:

trunk/src/VBox/Runtime

檔案:

• generic/RTProcIsRunningByName-generic.cpp (修改) (1 筆差異)
• r3/linux/RTProcIsRunningByName-linux.cpp (修改) (4 筆差異)
• testcase/tstRTProcIsRunningByName.cpp (修改) (2 筆差異)

trunk/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp

@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/string.h>
 #include <iprt/process.h>
 

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

@@ -33 +33 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_PROCESS
+#include <iprt/process.h>
 #include <iprt/string.h>
-#include <iprt/process.h>
 #include <iprt/dir.h>
 #include <iprt/path.h>
@@ -40 +40 @@
 #include <iprt/param.h>
 #include <iprt/assert.h>
-
-#include <unistd.h>
 
 
@@ -52 +50 @@
         return false;
 
+    bool fFoundIt = false;
     PRTDIR pDir;
     int rc = RTDirOpen(&pDir, "/proc");
@@ -58 +57 @@
     {
         RTDIRENTRY DirEntry;
-        while(RT_SUCCESS(RTDirRead(pDir, &DirEntry, NULL)))
+        while (RT_SUCCESS(RTDirRead(pDir, &DirEntry, NULL)))
         {
             /*
              * Filter numeric directory entries only.
              */
-            if (DirEntry.enmType == RTDIRENTRYTYPE_DIRECTORY &&
-                RTStrToUInt32(DirEntry.szName) > 0)
+            if (    DirEntry.enmType == RTDIRENTRYTYPE_DIRECTORY
+                &&  RTStrToUInt32(DirEntry.szName) > 0)
             {
                 /*
-                 * Build the path to the proc cmdline file of this process.
+                 * The first line of the 'cmdline' file is the argv[0] passed to
+                 * execv, which is what we're interested in... (Alternatively we
+                 * could try readlink 'exe'. Check what happens to set-uid procs.)
                  */
-                char *pszPath;
-                RTStrAPrintf(&pszPath, "/proc/%s/cmdline", DirEntry.szName);
                 PRTSTREAM pStream;
-                rc = RTStrmOpen(pszPath, "r", &pStream);
-                if(RT_SUCCESS(rc))
+                rc = RTStrmOpenF("r", &pStream, "/proc/%s/cmdline", &DirEntry.szName[0]);
+                if (RT_SUCCESS(rc))
                 {
                     char szLine[RTPATH_MAX];
-                    /*
-                     * The fist line should be the application path always.
-                     */
-                    RTStrmGetLine(pStream, szLine, sizeof(szLine));
-                    /*
-                     * We are interested on the file name part only.
-                     */
-                    char *pszFilename = RTPathFilename(szLine);
-                    if (RTStrCmp(pszFilename, pszName) == 0)
+                    rc = RTStrmGetLine(pStream, szLine, sizeof(szLine));
+                    RTStrmClose(pStream);
+                    if (    RT_SUCCESS(rc)
+                        ||  rc == VERR_BUFFER_OVERFLOW)
                     {
                         /*
-                         * Clean up
+                         * We are interested on the file name part only.
                          */
-                        RTStrmClose(pStream);
-                        RTStrFree(pszPath);
-                        RTDirClose(pDir);
-                        return true;
+                        char const *pszFilename = RTPathFilename(szLine);
+                        if (RTStrCmp(pszFilename, pszName) == 0)
+                        {
+                            /* Found it! */
+                            RTDirClose(pDir);
+                            return true;
+                        }
                     }
-                    RTStrmClose(pStream);
                 }
-                RTStrFree(pszPath);
             }
         }

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

@@ -29 +29 @@
  */
 
-
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
+#include <iprt/process.h>
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
 #include <iprt/err.h>
-#include <iprt/process.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
@@ -44 +43 @@
 int main(int argc, char **argv)
 {
+    int cErrors = 0;
+
     RTR3Init();
+    RTPrintf("tstRTPRocIsRunningByName: TESTING...\n");
 
+    /*
+     * Test 1: Check for a definitely not running process.
+     */
     int rc = VERR_GENERAL_FAILURE;
-
     char szExecPath[RTPATH_MAX] = { "vbox-5b05e1ff-6ae2-4d10-885a-7d25018c4c5b" };
-    /* Check for a definitely not running process. */
-    RTPrintf("tstRTProcIsRunningByName: Searching for a not running process with the name %s...\n", szExecPath);
     bool fRunning = RTProcIsRunningByName(szExecPath);
     if (!fRunning)
+        RTPrintf("tstRTProcIsRunningByName: Process '%s' is not running (expected).\n", szExecPath);
+    else
     {
-        RTPrintf("tstRTProcIsRunningByName: Success!\n");
-        rc = VINF_SUCCESS;
+        RTPrintf("tstRTProcIsRunningByName: FAILURE - '%s' is running! (test 1)\n", szExecPath);
+        cErrors++;
+    }
+
+    /*
+     * Test 2: Check for our own process.
+     */
+    if (RTProcGetExecutableName(szExecPath, RTPATH_MAX))
+    {
+        /* Strip any path components */
+        char *pszFilename = RTPathFilename(szExecPath);
+        if (pszFilename)
+        {
+            bool fRunning = RTProcIsRunningByName(pszFilename);
+            if (fRunning)
+                RTPrintf("tstRTProcIsRunningByName: Process '%s' (self) is running\n", pszFilename);
+            else
+            {
+                RTPrintf("tstRTProcIsRunningByName: FAILURE - Process '%s' (self) is not running!\n", pszFilename);
+                cErrors++;
+            }
+        }
+        else
+        {
+            RTPrintf("tstRTProcIsRunningByName: FAILURE - RTPathFilename failed!\n");
+            cErrors++;
+        }
     }
     else
-        RTPrintf("tstRTProcIsRunningByName: Expected failure but got success!\n");
-    /* If the first test succeeded, check for a running process. For that we
-     * use the name of this testcase. */
-    if (RT_SUCCESS(rc))
     {
-        /* Reset */
-        rc = VERR_GENERAL_FAILURE;
-        if (RTProcGetExecutableName(szExecPath, RTPATH_MAX))
-        {
-            /* Strip any path components */
-            char *pszFilename;
-            if ((pszFilename = RTPathFilename(szExecPath)))
-            {
-                RTPrintf("tstRTProcIsRunningByName: Searching for a running process with the name %s...\n", pszFilename);
-                bool fRunning = RTProcIsRunningByName(pszFilename);
-                if (fRunning)
-                {
-                    RTPrintf("tstRTProcIsRunningByName: Success!\n");
-                    rc = VINF_SUCCESS;
-                }
-                else
-                    RTPrintf("tstRTProcIsRunningByName: Expected success but got failure!\n");
-            }
-            else
-                RTPrintf("tstRTProcIsRunningByName: RTPathFilename failed!\n", rc);
-        }
-        else
-            RTPrintf("tstRTProcIsRunningByName: RTProcGetExecutableName failed!\n", rc);
+        RTPrintf("tstRTProcIsRunningByName: FAILURE - RTProcGetExecutableName failed!\n");
+        cErrors++;
     }
 
-    return RT_SUCCESS(rc) ? 0 : 1;
+    /*
+     * Summary.
+     */
+    if (!cErrors)
+        RTPrintf("tstRTProcIsRunningByName: SUCCESS\n");
+    else
+        RTPrintf("tstRTProcIsRunningByName: FAILURE - %d errors\n", cErrors);
+    return cErrors ? 1 : 0;
 }