X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/bsd/kern/kern_shutdown.c

diff --git a/bsd/kern/kern_shutdown.c b/bsd/kern/kern_shutdown.c
index 45697a58d..f8568f9be 100644
--- a/bsd/kern/kern_shutdown.c
+++ b/bsd/kern/kern_shutdown.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -56,6 +56,7 @@
 #include <mach/vm_param.h>
 #include <sys/filedesc.h>
 #include <mach/host_reboot.h>
+#include <bsm/audit_kernel.h>
 
 int	waittime = -1;
 
@@ -91,6 +92,8 @@ boot(paniced, howto, command)
 		/* handle live procs (deallocate their root and current directories). */		
 		proc_shutdown();
 
+		audit_shutdown();
+
 		sync(p, (void *)NULL, (int *)NULL);
 
 		/* Release vnodes from the VM object cache */	 
@@ -176,10 +179,15 @@ proc_shutdown()
 	/*
 	 * send SIGTERM to those procs interested in catching one
 	 */
+sigterm_loop:
 	for (p = allproc.lh_first; p; p = p->p_list.le_next) {
-	        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self)) {
-		        if (p->p_sigcatch & sigmask(SIGTERM))
+	        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self) && (p->p_shutdownstate == 0)) {
+		        if (p->p_sigcatch & sigmask(SIGTERM)) {
+			        p->p_shutdownstate = 1;
 			        psignal(p, SIGTERM);
+
+				goto sigterm_loop;
+			}
 		}
 	}
 	/*
@@ -197,21 +205,34 @@ proc_shutdown()
 		TERM_catch = 0;
 
 	        for (p = allproc.lh_first; p; p = p->p_list.le_next) {
-		        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self)) {
-			        if (p->p_sigcatch & sigmask(SIGTERM))
-				        TERM_catch++;
-			}
+		        if (p->p_shutdownstate == 1)
+			        TERM_catch++;
 		}
 		if (TERM_catch == 0)
 		        break;
 	}
+	if (TERM_catch) {
+	        /*
+		 * log the names of the unresponsive tasks
+		 */
+	        for (p = allproc.lh_first; p; p = p->p_list.le_next) {
+		        if (p->p_shutdownstate == 1)
+				  printf("%s[%d]: didn't act on SIGTERM\n", p->p_comm, p->p_pid);
+		}
+		IOSleep(1000 * 5);
+	}
 
 	/*
 	 * send a SIGKILL to all the procs still hanging around
 	 */
+sigkill_loop:
 	for (p = allproc.lh_first; p; p = p->p_list.le_next) {
-	        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self))
+	        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self) && (p->p_shutdownstate != 2)) {
 		        psignal(p, SIGKILL);
+			p->p_shutdownstate = 2;
+			
+			goto sigkill_loop;
+		}
 	}
 	/*
 	 * wait for up to 60 seconds to allow these procs to exit normally
@@ -220,7 +241,7 @@ proc_shutdown()
 		IOSleep(200);  /* double the time from 100 to 200 for NFS requests in particular */
 
 	        for (p = allproc.lh_first; p; p = p->p_list.le_next) {
-		        if (((p->p_flag&P_SYSTEM) == 0) && (p->p_pptr->p_pid != 0) && (p != self))
+		        if (p->p_shutdownstate == 2)
 			        break;
 		}
 		if (!p)
@@ -248,7 +269,7 @@ proc_shutdown()
 			        thread_block(THREAD_CONTINUE_NULL);
 			}
 			else {
-			        p->exit_thread = current_thread();
+			        p->exit_thread = current_act();
 				printf(".");
 				exit1(p, 1, (int *)NULL);
 			}
@@ -259,18 +280,19 @@ proc_shutdown()
 	/*
 	 *	Forcibly free resources of what's left.
 	 */
+#ifdef notyet
 	p = allproc.lh_first;
 	while (p) {
 	/*
 	 * Close open files and release open-file table.
 	 * This may block!
 	 */
-#ifdef notyet
+
 	/* panics on reboot due to "zfree: non-allocated memory in collectable zone" message */
 	fdfree(p);
-#endif /* notyet */
 	p = p->p_list.le_next;
 	}
+#endif /* notyet */
 	/* Wait for the reaper thread to run, and clean up what we have done 
 	 * before we proceed with the hardcore shutdown. This reduces the race
 	 * between kill_tasks and the reaper thread.