database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Don't ignore SIGCHLD since that affects waitpid on some platforms

Browse Source 
Fix spelling error
Move exit_code into local scope
This commit is contained in:
unknown
2008-03-04 12:32:51 +01:00
parent e32d6c83e6
commit 1c660c9c81
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/lib/My/SafeProcess/safe_process.cc
View File

@ -89,7 +89,6 @@ static void die(const char* fmt, ...)
static void kill_child (void) static void kill_child (void)
{ {
int exit_code= 1;
int status= 0; int status= 0;
message("Killing child: %d", child_pid); message("Killing child: %d", child_pid);
@ -99,6 +98,7 @@ static void kill_child (void)
pid_t ret_pid= waitpid(child_pid, &status, 0); pid_t ret_pid= waitpid(child_pid, &status, 0);
if (ret_pid == child_pid) if (ret_pid == child_pid)
{ {
int exit_code= 1;
if (WIFEXITED(status)) if (WIFEXITED(status))
{ {
// Process has exited, collect return status // Process has exited, collect return status
@ -113,7 +113,7 @@ static void kill_child (void)
exit(exit_code); exit(exit_code);
} }
exit(exit_code); exit(1);
} }
@ -122,13 +122,12 @@ static void handle_signal (int sig)
message("Got signal %d, child_pid: %d", sig, child_pid); message("Got signal %d, child_pid: %d", sig, child_pid);
terminated= 1; terminated= 1;
if (child_pid > 0)
kill_child();
// Ignore further signals // Ignore further signals
signal(SIGTERM, SIG_IGN); signal(SIGTERM, SIG_IGN);
signal(SIGINT, SIG_IGN); signal(SIGINT, SIG_IGN);
signal(SIGCHLD, SIG_IGN);
if (child_pid > 0)
kill_child();
// Continune execution, allow the child to be started and // Continune execution, allow the child to be started and
// finally terminated by monitor loop // finally terminated by monitor loop
@ -237,7 +236,7 @@ int main(int argc, char* const argv[] )
break; break;
} }
// Check if child has exited, normally this wil be // Check if child has exited, normally this will be
// detected immediately with SIGCHLD handler // detected immediately with SIGCHLD handler
int status= 0; int status= 0;
pid_t ret_pid= waitpid(child_pid, &status, WNOHANG); pid_t ret_pid= waitpid(child_pid, &status, WNOHANG);