[launchd-changes] [22988] trunk/launchd/src/launchd.c

[source_changes at macosforge.org]

Revision: 22988
          http://trac.macosforge.org/projects/launchd/changeset/22988
Author:   zarzycki at apple.com
Date:     2006-12-15 14:10:56 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
Better self crash reporting in the case of PID 1.

Modified Paths:
--------------
    trunk/launchd/src/launchd.c

Modified: trunk/launchd/src/launchd.c
===================================================================
--- trunk/launchd/src/launchd.c	2006-12-15 22:10:33 UTC (rev 22987)
+++ trunk/launchd/src/launchd.c	2006-12-15 22:10:56 UTC (rev 22988)
@@ -105,6 +105,7 @@
 static job_t rlcj = NULL;
 static jmp_buf doom_doom_doom;
 static void *crash_addr;
+static pid_t crash_pid;
 static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", /* "bootstrap", */ NULL };
 
 sigset_t blocked_signals = 0;
@@ -297,18 +298,24 @@
 		job_dispatch(fbj, true);
 	}
 
+	char *doom_why = "at instruction";
 	switch (setjmp(doom_doom_doom)) {
+		case 0:
+			break;
+		case SIGBUS:
+		case SIGSEGV:
+			doom_why = "trying to read/write";
 		case SIGILL:
 		case SIGFPE:
-			syslog(LOG_EMERG, "We crashed at instruction: %p", crash_addr);
-			abort();
-		case SIGBUS:
-		case SIGSEGV:
-			syslog(LOG_EMERG, "We crashed trying to read/write: %p", crash_addr);
-			abort();
+			syslog(LOG_EMERG, "We crashed %s: %p (sent by PID %u)", doom_why, crash_addr, crash_pid);
 		default:
-			abort();
-		case 0:
+			sync();
+			sleep(3);
+			/* the kernel will panic() when PID 1 exits */
+			_exit(EXIT_FAILURE);
+			/* we should never get here */
+			reboot(0);
+			/* or here either */
 			break;
 	}
 
@@ -338,10 +345,33 @@
 	launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1);
 }
 
+#define PID1_CRASH_LOGFILE "/var/log/launchd-pid1.crash"
+
 void
 fatal_signal_handler(int sig, siginfo_t *si, void *uap)
 {
+	char *sample_args[] = { "/usr/bin/sample", "1", "1", "-file", PID1_CRASH_LOGFILE, NULL };
+	pid_t sample_p;
+	int wstatus;
+
 	crash_addr = si->si_addr;
+	crash_pid = si->si_pid;
+
+	unlink(PID1_CRASH_LOGFILE);
+
+	switch ((sample_p = vfork())) {
+	case 0:
+		execve(sample_args[0], sample_args, environ);
+		_exit(EXIT_FAILURE);
+		break;
+	default:
+		waitpid(sample_p, &wstatus, 0);
+		sync();
+		break;
+	case -1:
+		break;
+	}
+
 	longjmp(doom_doom_doom, sig);
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20061215/1d038d08/attachment.html