Changeset 2224

Timestamp:

07/08/2008 17:31:32 (5 months ago)

Author:

chris

Message:

Allow waiting for a process while killing it, will be needed for tests
that fork() to avoid zombies and for ServerIsAlive? to work.

Location:

box/trunk/lib/server

Files:

• ServerControl.cpp (modified) (3 diffs)
• ServerControl.h (modified) (1 diff)

box/trunk/lib/server/ServerControl.cpp

@@ -5 +5 @@
 #ifdef HAVE_SYS_TYPES_H
         #include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+        #include <sys/wait.h>
 #endif
 
@@ -161 +165 @@
 #endif // WIN32
 
-bool KillServer(int pid)
+bool KillServer(int pid, bool WaitForProcess)
 {
         if (!KillServerInternal(pid))
@@ -168 +172 @@
         }
 
+        #ifdef HAVE_WAITPID
+        if (WaitForProcess)
+        {
+                int status, result;
+
+                result = waitpid(pid, &status, 0);
+                if (result != pid)
+                {
+                        BOX_WARNING("waitpid returned " << result);
+                }
+                TEST_THAT(result == pid);
+
+                TEST_THAT(WIFEXITED(status));
+                if (WIFEXITED(status))
+                {
+                        if (WEXITSTATUS(status) != 0)
+                        {
+                                BOX_WARNING("process exited with code " <<
+                                        WEXITSTATUS(status));
+                        }
+                        TEST_THAT(WEXITSTATUS(status) == 0);
+                }
+        }
+        #endif
+
         for (int i = 0; i < 30; i++)
         {
                 if (i == 0) 
                 {
-                        printf("Waiting for server to die: ");
+                        printf("Waiting for server to die (pid %d): ", pid);
                 }
 

box/trunk/lib/server/ServerControl.h

@@ -5 +5 @@
 
 bool HUPServer(int pid);
-bool KillServer(int pid);
+bool KillServer(int pid, bool WaitForProcess = false);
 
 #ifdef WIN32