Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: Fix bugs in new backtrace code. 

svn path=/trunk/boinc/; revision=15017
This commit is contained in:
Charlie Fenton 2008-04-04 12:32:28 +00:00
parent 907581140b
commit f074fca337
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/mac/mac_backtrace.C
View File

@ -82,14 +82,14 @@ enum {
#define SKIPFRAME 4 /* Number frames overhead for signal handler and backtrace */ #define SKIPFRAME 4 /* Number frames overhead for signal handler and backtrace */
static char * PersistentFGets(char *buf, size_t buflen, FILE *f); static char * PersistentFGets(char *buf, size_t buflen, FILE *f);
static void GetPathToThisProcess(char* outbuf, size_t maxLen); static void GetNameOfAndPathToThisProcess(char *nameBuf, size_t nameBufLen, char* outbuf, size_t outBufLen);
static void PrintOSVersion(char *minorVersion); static void PrintOSVersion(char *minorVersion);
void PrintBacktrace(void) { void PrintBacktrace(void) {
int err; int err;
QCrashReportRef crRef = NULL; QCrashReportRef crRef = NULL;
char pathToThisProcess[1024], pipeBuf[1024], *nameBuf; char nameBuf[256], pathToThisProcess[1024], pipeBuf[1024];
const NXArchInfo *localArch; const NXArchInfo *localArch;
char OSMinorVersion; char OSMinorVersion;
@ -121,14 +121,8 @@ void PrintBacktrace(void) {
} }
#endif #endif
GetPathToThisProcess(pathToThisProcess, sizeof(pathToThisProcess)); GetNameOfAndPathToThisProcess(nameBuf, sizeof(nameBuf), pathToThisProcess, sizeof(pathToThisProcess));
nameBuf = strrchr(pathToThisProcess, '/');
if (nameBuf) {
++nameBuf; // Advance over the separator
} else {
nameBuf = pathToThisProcess;
}
if (nameBuf[0]) { if (nameBuf[0]) {
fprintf(stderr, "\nCrashed executable name: %s\n", nameBuf); fprintf(stderr, "\nCrashed executable name: %s\n", nameBuf);
} }
@ -229,40 +223,51 @@ static char * PersistentFGets(char *buf, size_t buflen, FILE *f) {
} }
static void GetPathToThisProcess(char* outbuf, size_t maxLen) { static void GetNameOfAndPathToThisProcess(char *nameBuf, size_t nameBufLen, char* outbuf, size_t outBufLen) {
FILE *f; FILE *f;
char buf[256], *p, *q; char buf[256], *p, *q=NULL;
pid_t aPID = getpid(); pid_t aPID = getpid();
size_t nameLen;
*outbuf = '\0'; *outbuf = '\0';
*nameBuf = '\0';
sprintf(buf, "ps -xwo command -p %d", (int)aPID); sprintf(buf, "ps -wo command -p %d", (int)aPID);
f = popen(buf, "r"); f = popen(buf, "r");
if (f == NULL) if (f == NULL)
return; return;
PersistentFGets (outbuf, maxLen, f); // Discard header line PersistentFGets (outbuf, outBufLen, f); // Discard header line
PersistentFGets (outbuf, maxLen, f); PersistentFGets (outbuf, outBufLen, f); // Get the UNIX command which ran us
pclose(f); pclose(f);
sprintf(buf, "ps -p %d -c -o command", aPID);
f = popen(buf, "r");
if (!f)
return;
PersistentFGets(nameBuf, nameBufLen, f); // Discard header line
PersistentFGets(nameBuf, nameBufLen, f); // Get just the name of our application
fclose(f);
// Remove trailing newline if present // Remove trailing newline if present
p = strchr(outbuf, '\n'); p = strchr(nameBuf, '\n');
if (p) if (p)
*p = '\0'; *p = '\0';
// Strip off any arguments // Strip off any arguments
p = strstr(outbuf, " -"); p = outbuf;
q = p; nameLen = strlen(nameBuf);
if (p) { // Find last instance of string nameBuf in string outbuf
while (*p == ' ') { while (p) {
q = p; q = p;
if (--p < outbuf) p = strnstr(q + nameLen, nameBuf, outBufLen);
break;
}
} }
if (q) // Terminate the string immediately after path
if (q) {
q += nameLen;
*q = '\0'; *q = '\0';
}
} }