actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash handler crashes

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-30 12:35:13 +00:00
parent 85e9138040
commit 11f1b49d7a
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Unix/CrashHandler.cpp
+15 -11
View File
@@ -4,7 +4,6 @@
#include <cstdlib> #include <cstdlib>
#include <cstdarg> #include <cstdarg>
#include <unistd.h> #include <unistd.h>
#include <cstring>
#include <cerrno> #include <cerrno>
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
@@ -101,10 +100,15 @@ static void NORETURN spawn_child_process( int from_parent )
char path[1024]; char path[1024];
GetExecutableName( path, sizeof(path) ); GetExecutableName( path, sizeof(path) );
execlp( path, path, CHILD_MAGIC_PARAMETER, NULL );
/* If we got here, the exec failed. */ /* Use execve; it's the lowest-level of the exec calls. The others may allocate. */
safe_print(fileno(stderr), "Crash handler execl(", path, ") failed: ", strerror(errno), "\n", NULL); char *argv[3] = { path, CHILD_MAGIC_PARAMETER, NULL };
char *envp[1] = { NULL };
execve( path, argv, envp );
/* If we got here, the exec failed. We can't call strerror. */
// safe_print(fileno(stderr), "Crash handler execl(", path, ") failed: ", strerror(errno), "\n", NULL);
safe_print(fileno(stderr), "Crash handler execl(", path, ") failed: ", itoa( errno ), "\n", NULL);
_exit(1); _exit(1);
} }
@@ -267,9 +271,9 @@ static void RunCrashHandler( const CrashData *crash )
} }
static int received = 0; static int received = 0;
static pid_t childpid = 0; static int active = 0;
if( received ) if( active )
{ {
/* We've received a second signal. This may mean that another thread /* We've received a second signal. This may mean that another thread
* crashed before we stopped it, or it may mean that the crash handler * crashed before we stopped it, or it may mean that the crash handler
@@ -289,15 +293,14 @@ static void RunCrashHandler( const CrashData *crash )
break; break;
} }
if( received == getpid() ) if( active == 1 )
safe_print( fileno(stderr), " while still in the crash handler\n", NULL); safe_print( fileno(stderr), " while still in the crash handler\n", NULL);
else if( childpid == getpid() ) else if( active == 2 )
safe_print( fileno(stderr), " while in the crash handler child\n", NULL); safe_print( fileno(stderr), " while in the crash handler child\n", NULL);
else
safe_print( fileno(stderr), " (to unknown PID)\n", NULL);
_exit(1); _exit(1);
} }
active = 1;
received = getpid(); received = getpid();
/* Stop other threads. XXX: This prints a spurious ptrace error if any threads /* Stop other threads. XXX: This prints a spurious ptrace error if any threads
@@ -313,7 +316,7 @@ static void RunCrashHandler( const CrashData *crash )
exit(1); exit(1);
} }
childpid = fork(); pid_t childpid = fork();
if( childpid == -1 ) if( childpid == -1 )
{ {
safe_print(fileno(stderr), "Crash handler fork() failed: ", strerror(errno), "\n", NULL); safe_print(fileno(stderr), "Crash handler fork() failed: ", strerror(errno), "\n", NULL);
@@ -322,6 +325,7 @@ static void RunCrashHandler( const CrashData *crash )
if( childpid == 0 ) if( childpid == 0 )
{ {
active = 2;
close(fds[1]); close(fds[1]);
spawn_child_process(fds[0]); spawn_child_process(fds[0]);
} }