Changeset 2592

Timestamp:

19/01/2010 22:01:27 (8 months ago)

Author:

chris

Message:

Merge [2587] from trunk: Add debugging for child processes terminating
normally or abnormally, as Brendon Baumgartner reported symptoms that
sound like a bbstored child process crashing, and nothing in the logs
indicates what happened to it.

Files:

• box/RELEASE/0.11rc6/lib/server/ServerStream.h (modified) (2 diffs)

box/RELEASE/0.11rc6/lib/server/ServerStream.h

@@ -303 +303 @@
                                 if(ForkToHandleRequests && !IsSingleProcess())
                                 {
-                                        int status = 0;
-                                        int p = 0;
-                                        do
-                                        {
-                                                if((p = ::waitpid(0 /* any child in process group */, &status, WNOHANG)) == -1
-                                                        && errno != ECHILD && errno != EINTR)
-                                                {
-                                                        THROW_EXCEPTION(ServerException, ServerWaitOnChildError)
-                                                }
-                                        } while(p > 0);
+                                        WaitForChildren();
                                 }
                                 #endif // !WIN32
@@ -326 +317 @@
                 DeleteSockets();
         }
+
+        #ifndef WIN32 // no waitpid() on Windows
+        void WaitForChildren()
+        {
+                int p = 0;
+                do
+                {
+                        int status = 0;
+                        p = ::waitpid(0 /* any child in process group */,
+                                &status, WNOHANG);
+
+                        if(p == -1 && errno != ECHILD && errno != EINTR)
+                        {
+                                THROW_EXCEPTION(ServerException,
+                                        ServerWaitOnChildError)
+                        }
+                        else if(p == 0)
+                        {
+                                // no children exited, will return from
+                                // function
+                        }
+                        else if(WIFEXITED(status))
+                        {
+                                BOX_INFO("child process " << p << " "
+                                        "terminated normally");
+                        }
+                        else if(WIFSIGNALED(status))
+                        {
+                                int sig = WTERMSIG(status);
+                                BOX_ERROR("child process " << p << " "
+                                        "terminated abnormally with "
+                                        "signal " << sig);
+                        }
+                        else
+                        {
+                                BOX_WARNING("something unknown happened "
+                                        "to child process " << p << ": "
+                                        "status = " << status);
+                        }
+                }
+                while(p > 0);
+        }
+        #endif
 
         virtual void HandleConnection(StreamType &rStream)