From source_changes at macosforge.org  Mon Jan  5 17:41:08 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Mon,  5 Jan 2009 17:41:08 -0800 (PST)
Subject: [launchd-changes] [23769] branches/PR-6469773/
Message-ID: <20090106014108.7F726B53BC9@beta.macosforge.org>

Revision: 23769
          http://trac.macosforge.org/projects/launchd/changeset/23769
Author:   dsorresso at apple.com
Date:     2009-01-05 17:41:08 -0800 (Mon, 05 Jan 2009)
Log Message:
-----------
"Branch for PR-6469773 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    branches/PR-6469773/


Property changes on: branches/PR-6469773
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090105/53b1ac45/attachment.html>

From source_changes at macosforge.org  Wed Jan  7 15:02:37 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Wed,  7 Jan 2009 15:02:37 -0800 (PST)
Subject: [launchd-changes] [23770] trunk/launchd/src/libvproc.c
Message-ID: <20090107230237.DABBFB825D7@beta.macosforge.org>

Revision: 23770
          http://trac.macosforge.org/projects/launchd/changeset/23770
Author:   dsorresso at apple.com
Date:     2009-01-07 15:02:37 -0800 (Wed, 07 Jan 2009)
Log Message:
-----------
<rdar://problem/6469773> SLServer10A242: SFLSharedPrefsTool crashed three times.

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

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2009-01-06 01:41:08 UTC (rev 23769)
+++ trunk/launchd/src/libvproc.c	2009-01-07 23:02:37 UTC (rev 23770)
@@ -76,7 +76,7 @@
 		 * counts if they're being run under a debugger. Moral of the story: Debug
 		 * from the environment you intend to run in.
 		 */
-		void *_vm_addr = malloc(sizeof(struct vproc_shmem_s));
+		void *_vm_addr = calloc(1, sizeof(struct vproc_shmem_s));
 		if( !_vm_addr ) {
 			return;
 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090107/6dd046b0/attachment.html>

From source_changes at macosforge.org  Wed Jan  7 15:05:25 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Wed,  7 Jan 2009 15:05:25 -0800 (PST)
Subject: [launchd-changes] [23771] tags/launchd-295/
Message-ID: <20090107230525.A835FB82698@beta.macosforge.org>

Revision: 23771
          http://trac.macosforge.org/projects/launchd/changeset/23771
Author:   dsorresso at apple.com
Date:     2009-01-07 15:05:25 -0800 (Wed, 07 Jan 2009)
Log Message:
-----------
"Tagging launchd-295 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    tags/launchd-295/


Property changes on: tags/launchd-295
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090107/d3137cfe/attachment.html>

From source_changes at macosforge.org  Thu Jan  8 13:35:05 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu,  8 Jan 2009 13:35:05 -0800 (PST)
Subject: [launchd-changes] [23772] branches/PR-6461138/
Message-ID: <20090108213505.E4420B975E5@beta.macosforge.org>

Revision: 23772
          http://trac.macosforge.org/projects/launchd/changeset/23772
Author:   kvv at apple.com
Date:     2009-01-08 13:35:05 -0800 (Thu, 08 Jan 2009)
Log Message:
-----------
"Branch for PR-6461138 from http://svn.macosforge.org/repository/launchd/tags/launchd-106.20"

Added Paths:
-----------
    branches/PR-6461138/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090108/bc3c6ecb/attachment.html>

From source_changes at macosforge.org  Thu Jan  8 13:36:42 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu,  8 Jan 2009 13:36:42 -0800 (PST)
Subject: [launchd-changes] [23773]
	branches/PR-6461138/launchd/src/StartupItems/NetworkTime
Message-ID: <20090108213642.43BEFB9769F@beta.macosforge.org>

Revision: 23773
          http://trac.macosforge.org/projects/launchd/changeset/23773
Author:   kvv at apple.com
Date:     2009-01-08 13:36:41 -0800 (Thu, 08 Jan 2009)
Log Message:
-----------
rdar://problem/6461138

Modified Paths:
--------------
    branches/PR-6461138/launchd/src/StartupItems/NetworkTime

Modified: branches/PR-6461138/launchd/src/StartupItems/NetworkTime
===================================================================
--- branches/PR-6461138/launchd/src/StartupItems/NetworkTime	2009-01-08 21:35:05 UTC (rev 23772)
+++ branches/PR-6461138/launchd/src/StartupItems/NetworkTime	2009-01-08 21:36:41 UTC (rev 23773)
@@ -22,7 +22,7 @@
 	# Synchronize our clock to the network's time,
 	# then fire off ntpd to keep the clock in sync.
 	ntpdate -bvs
-	ntpd -f /var/run/ntp.drift -p /var/run/ntpd.pid
+	ntpd -c /private/etc/ntp-restrict.conf -f /var/run/ntp.drift -p /var/run/ntpd.pid
     fi
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090108/be1f0d51/attachment.html>

From source_changes at macosforge.org  Thu Jan  8 15:18:14 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu,  8 Jan 2009 15:18:14 -0800 (PST)
Subject: [launchd-changes] [23774] PR-4344661/
Message-ID: <20090108231814.9A7BCB9A29B@beta.macosforge.org>

Revision: 23774
          http://trac.macosforge.org/projects/launchd/changeset/23774
Author:   josborne at apple.com
Date:     2009-01-08 15:18:14 -0800 (Thu, 08 Jan 2009)
Log Message:
-----------
Branch to fix launchd.plist man page

Added Paths:
-----------
    PR-4344661/


Property changes on: PR-4344661
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090108/05d6f0c0/attachment.html>

From source_changes at macosforge.org  Thu Jan  8 15:44:11 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu,  8 Jan 2009 15:44:11 -0800 (PST)
Subject: [launchd-changes] [23775] trunk/launchd/src/launchd.plist.5
Message-ID: <20090108234411.51A94B9A7EE@beta.macosforge.org>

Revision: 23775
          http://trac.macosforge.org/projects/launchd/changeset/23775
Author:   josborne at apple.com
Date:     2009-01-08 15:44:10 -0800 (Thu, 08 Jan 2009)
Log Message:
-----------
Document use fo sysctl in addition to rlimit when running as pid1

Modified Paths:
--------------
    trunk/launchd/src/launchd.plist.5

Modified: trunk/launchd/src/launchd.plist.5
===================================================================
--- trunk/launchd/src/launchd.plist.5	2009-01-08 23:18:14 UTC (rev 23774)
+++ trunk/launchd/src/launchd.plist.5	2009-01-08 23:44:10 UTC (rev 23775)
@@ -279,8 +279,19 @@
 function.
 .It Sy NumberOfFiles <integer>
 The maximum number of open files for this process.
+Setting this value in a system wide daemon will set the 
+.Xr sysctl 3 
+kern.maxfiles (SoftResourceLimits) or kern.maxfilesperproc (HardResourceLimits) value in addition to the
+.Xr setrlimit 2
+values.
 .It Sy NumberOfProcesses <integer>
 The maximum number of simultaneous processes for this user id.
+Setting this value in a system wide daemon will set the 
+.Xr sysctl 3 
+kern.maxproc (SoftResourceLimits) or kern.maxprocperuid (HardResourceLimits) 
+value in addition to the
+.Xr setrlimit 2
+values.
 .It Sy ResidentSetSize <integer>
 The maximum size (in bytes) to which a process's resident set size may grow.
 This imposes a limit on the amount of physical memory to be given to a process;
@@ -451,5 +462,6 @@
 .Sh SEE ALSO 
 .Xr launchctl 1 ,
 .Xr launch 3 ,
+.Xr sysctl 3 ,
 .Xr launchd 8 ,
 .Xr plist 5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090108/ef0d513b/attachment-0001.html>

From source_changes at macosforge.org  Fri Jan  9 16:40:56 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Fri,  9 Jan 2009 16:40:56 -0800 (PST)
Subject: [launchd-changes] [23776] trunk/launchd/src
Message-ID: <20090110004057.59903BC1965@beta.macosforge.org>

Revision: 23776
          http://trac.macosforge.org/projects/launchd/changeset/23776
Author:   dsorresso at apple.com
Date:     2009-01-09 16:40:56 -0800 (Fri, 09 Jan 2009)
Log Message:
-----------
<rdar://problem/6046664> TASK: flatten per-user bootstrap namespaces
<rdar://problem/6241360> Instruments requires SPI for setting environment variables of launchd daemons
Embedded changes.

Modified Paths:
--------------
    trunk/launchd/src/launch_priv.h
    trunk/launchd/src/launchctl.c
    trunk/launchd/src/launchd.c
    trunk/launchd/src/launchd_core_logic.c
    trunk/launchd/src/launchd_core_logic.h
    trunk/launchd/src/launchd_runtime.c
    trunk/launchd/src/launchd_unix_ipc.c
    trunk/launchd/src/libvproc.c
    trunk/launchd/src/protocol_vproc.defs
    trunk/launchd/src/vproc.h
    trunk/launchd/src/vproc_priv.h

Modified: trunk/launchd/src/launch_priv.h
===================================================================
--- trunk/launchd/src/launch_priv.h	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launch_priv.h	2009-01-10 00:40:56 UTC (rev 23776)
@@ -38,7 +38,8 @@
 #define LAUNCH_KEY_SETRESOURCELIMITS					"SetResourceLimits"
 #define LAUNCH_KEY_GETRUSAGESELF						"GetResourceUsageSelf"
 #define LAUNCH_KEY_GETRUSAGECHILDREN					"GetResourceUsageChildren"
-                                                    
+#define LAUNCH_KEY_SETPRIORITYLIST						"SetPriorityList"
+
 #define LAUNCHD_SOCKET_ENV								"LAUNCHD_SOCKET"
 #define LAUNCHD_SOCK_PREFIX								_PATH_VARTMP "launchd"
 #define LAUNCHD_TRUSTED_FD_ENV							"__LAUNCHD_FD"
@@ -46,12 +47,17 @@
 #define LAUNCH_KEY_BATCHCONTROL							"BatchControl"
 #define LAUNCH_KEY_BATCHQUERY							"BatchQuery"
 #define LAUNCHD_DO_APPLE_INTERNAL_LOGGING				"__DoAppleInternalLogging__"
-                                                    
+
+#define LAUNCH_KEY_JETSAMLABEL							"JetsamLabel"
+#define LAUNCH_KEY_JETSAMFRONTMOST						"JetsamFrontmost"
+#define LAUNCH_KEY_JETSAMPRIORITY						"JetsamPriority"
+
 #define LAUNCH_JOBKEY_TRANSACTIONCOUNT					"TransactionCount"
 #define LAUNCH_JOBKEY_QUARANTINEDATA					"QuarantineData"
 #define LAUNCH_JOBKEY_SANDBOXPROFILE					"SandboxProfile"
 #define LAUNCH_JOBKEY_SANDBOXFLAGS						"SandboxFlags"
 #define LAUNCH_JOBKEY_SANDBOX_NAMED						"Named"
+#define LAUNCH_JOBKEY_JETSAMPRIORITY					"JetsamPriority"
 
 #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL		"EnterKernelDebuggerBeforeKill"
 #define LAUNCH_JOBKEY_PERJOBMACHSERVICES				"PerJobMachServices"

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchctl.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -181,6 +181,7 @@
 static int setenv_cmd(int argc, char *const argv[]);
 static int unsetenv_cmd(int argc, char *const argv[]);
 static int getenv_and_export_cmd(int argc, char *const argv[]);
+static int wait4debugger_cmd(int argc, char *const argv[]);
 
 static int limit_cmd(int argc, char *const argv[]);
 static int stdio_cmd(int argc, char *const argv[]);
@@ -216,6 +217,7 @@
 	{ "unsetenv",	unsetenv_cmd,			"Unset an environmental variable in launchd" },
 	{ "getenv",		getenv_and_export_cmd,	"Get an environmental variable from launchd" },
 	{ "export",		getenv_and_export_cmd,	"Export shell settings from launchd" },
+	{ "debug",		wait4debugger_cmd,		"Set the WaitForDebugger flag for the target job to true." },
 	{ "limit",		limit_cmd,				"View and adjust launchd resource limits" },
 	{ "stdout",		stdio_cmd,				"Redirect launchd's standard out to the given path" },
 	{ "stderr",		stdio_cmd,				"Redirect launchd's standard error to the given path" },
@@ -527,6 +529,37 @@
 	return 0;
 }
 
+int
+wait4debugger_cmd(int argc, char * const argv[])
+{
+	if( argc != 3 ) {
+		fprintf(stderr, "%s usage: debug <label> <value>\n", argv[0]);
+		return 1;
+	}
+	
+	int result = 1;
+	int64_t inval = 0;
+	if( strncmp(argv[2], "true", sizeof("true")) == 0 ) {
+		inval = 1;
+	} else if( strncmp(argv[2], "false", sizeof("false")) != 0 ) {
+		inval = atoi(argv[2]);
+		inval &= 1;
+	}
+	
+	vproc_t vp = vprocmgr_lookup_vproc(argv[1]);
+	if( vp ) {
+		vproc_err_t verr = vproc_swap_integer(vp, VPROC_GSK_WAITFORDEBUGGER, &inval, NULL);
+		if( verr ) {
+			fprintf(stderr, "Failed to set WaitForDebugger flag on %s.\n", argv[1]);
+		} else {
+			result = 0;
+		}
+		vproc_release(vp);
+	}
+	
+	return result;
+}
+
 void
 unloadjob(launch_data_t job)
 {

Modified: trunk/launchd/src/launchd.c
===================================================================
--- trunk/launchd/src/launchd.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchd.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -193,6 +193,8 @@
 		if( stat("/var/db/.launchd_flat_per_user_namespace", &sb) == 0 ) {
 			runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "Flat per-user Mach namespaces enabled.");
 		}
+		/* We just wanted to print status about the per-user namespace. PID 1 doesn't have a flat namespace. */
+		g_flat_mach_namespace = false;
 	}
 
 	monitor_networking_state();

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchd_core_logic.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -82,7 +82,21 @@
 #if HAVE_QUARANTINE
 #include <quarantine.h>
 #endif
+#if TARGET_OS_EMBEDDED
+#include <sys/kern_memorystatus.h>
+#else
+/* To make my life easier. */
+typedef struct jetsam_priority_entry {
+    pid_t pid;
+    uint32_t flags;
+} jetsam_priority_entry_t;
 
+enum {
+    kJetsamFlagsFrontmost = (1 << 0),
+    kJetsamFlagsKilled =    (1 << 1)
+};
+#endif
+
 #include "launch.h"
 #include "launch_priv.h"
 #include "launch_internal.h"
@@ -110,10 +124,11 @@
  *   If the job hasn't exited in the given number of seconds after sending
  *   it a SIGTERM, SIGKILL it. Can be overriden in the job plist.
  */
-#define LAUNCHD_MIN_JOB_RUN_TIME 10
-#define LAUNCHD_SAMPLE_TIMEOUT 1
-#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
-#define LAUNCHD_SIGKILL_TIMER 5
+#define LAUNCHD_MIN_JOB_RUN_TIME		10
+#define LAUNCHD_SAMPLE_TIMEOUT			1
+#define LAUNCHD_DEFAULT_EXIT_TIMEOUT	20
+#define LAUNCHD_SIGKILL_TIMER			5
+#define LAUNCHD_JETSAM_PRIORITY_UNSET	0xdead1eebabell
 
 #define SHUTDOWN_LOG_DIR "/var/log/shutdown"
 
@@ -230,6 +245,7 @@
 
 struct envitem {
 	SLIST_ENTRY(envitem) sle;
+	bool one_shot;
 	char *value;
 	union {
 		const char key[0];
@@ -237,9 +253,10 @@
 	};
 };
 
-static bool envitem_new(job_t j, const char *k, const char *v, bool global);
+static bool envitem_new(job_t j, const char *k, const char *v, bool global, bool one_shot);
 static void envitem_delete(job_t j, struct envitem *ei, bool global);
 static void envitem_setup(launch_data_t obj, const char *key, void *context);
+static void envitem_setup_one_shot(launch_data_t obj, const char *key, void *context);
 
 struct limititem {
 	SLIST_ENTRY(limititem) sle;
@@ -306,6 +323,7 @@
 	SLIST_ENTRY(jobmgr_s) sle;
 	SLIST_HEAD(, jobmgr_s) submgrs;
 	LIST_HEAD(, job_s) jobs;
+	LIST_HEAD(, job_s) jetsam_jobs;
 	LIST_HEAD(, job_s) active_jobs[ACTIVE_JOB_HASH_SIZE];
 	LIST_HEAD(, machservice) ms_hash[MACHSERVICE_HASH_SIZE];
 	LIST_HEAD(, job_s) global_env_jobs;
@@ -317,6 +335,7 @@
 	unsigned int global_on_demand_cnt;
 	unsigned int hopefully_first_cnt;
 	unsigned int normal_active_cnt;
+	unsigned int jetsam_jobs_cnt;
 	unsigned int 	sent_stop_to_normal_jobs		:1, 
 					sent_stop_to_hopefully_last_jobs:1, 
 					shutting_down					:1, 
@@ -364,8 +383,9 @@
 #define AUTO_PICK_LEGACY_LABEL (const char *)(~0)
 
 struct job_s {
-	kq_callback kqjob_callback; /* MUST be first element of this structure for benefit of launchd's run loop. */
-	LIST_ENTRY(job_s) sle;
+	kq_callback kqjob_callback;	/* MUST be first element of this structure for benefit of launchd's run loop. */
+	LIST_ENTRY(job_s) sle;								
+	LIST_ENTRY(job_s) jetsam_sle;
 	LIST_ENTRY(job_s) pid_hash_sle;
 	LIST_ENTRY(job_s) label_hash_sle;
 	LIST_ENTRY(job_s) global_env_sle;
@@ -384,7 +404,7 @@
 	cpu_type_t *j_binpref;
 	size_t j_binpref_cnt;
 	mach_port_t j_port;
-	mach_port_t wait_reply_port;	/* we probably should switch to a list of waiters */
+	mach_port_t wait_reply_port; /* we probably should switch to a list of waiters */
 	uid_t mach_uid;
 	jobmgr_t mgr;
 	size_t argc;
@@ -416,6 +436,7 @@
 	int log_redirect_fd;
 	int nice;
 	int stdout_err_fd;
+	long long jetsam_priority;
 	uint32_t timeout;
 	uint32_t exit_timeout;
 	uint64_t sent_signal_time;
@@ -449,6 +470,7 @@
 		    start_pending				:1,	/* an event fired and the job should start, but not necessarily right away */
 		    globargv					:1,	/* man launchd.plist --> EnableGlobbing */
 		    wait4debugger				:1,	/* man launchd.plist --> WaitForDebugger */
+			wait4debugger_oneshot		:1, /* One-shot WaitForDebugger. */
 		    internal_exc_handler		:1,	/* MachExceptionHandler == true */
 		    stall_before_exec			:1,	/* a hack to support an option of spawn_via_launchd() */
 		    only_once 					:1,	/* man launchd.plist --> LaunchOnlyOnce. Note: 5465184 Rename this to "HopefullyNeverExits" */
@@ -476,7 +498,8 @@
 			reap_after_sample			:1,	/* The job exited before sample did, so we should reap it after sample is done. */
 			nosy						:1, /* The job has an OtherJobEnabled KeepAlive criterion. */
 			crashed						:1, /* The job is the default Mach exception handler, and it crashed. */
-			reaped						:1; /* We've received NOTE_EXIT for the job. */
+			reaped						:1, /* We've received NOTE_EXIT for the job. */
+			jetsam_frontmost			:1; /* The job is considered "frontmost" by Jetsam. */
 	mode_t mask;
 	pid_t sample_pid;
 	const char label[0];
@@ -571,6 +594,11 @@
 static void do_unmounts(void);
 void eliminate_double_reboot(void);
 
+/* For Jetsam. */
+static void jetsam_priority_from_job(job_t j, bool front, jetsam_priority_entry_t *jp);
+static int job_cmp(const job_t *lhs, const job_t *rhs);
+int launchd_set_jetsam_priorities(launch_data_t priorities);
+
 /* file local globals */
 static size_t total_children;
 static size_t total_anon_children;
@@ -1175,9 +1203,15 @@
 		/* Not a big deal if this fails. It means that the timer's already been freed. */
 		kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
 	}
-
+	
+	if( j->jetsam_priority != LAUNCHD_JETSAM_PRIORITY_UNSET ) {
+		LIST_REMOVE(j, jetsam_sle);
+		j->mgr->jetsam_jobs_cnt--;
+	}
+	
 	kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
-
+	kevent_mod((uintptr_t)j, EVFILT_PROC, EV_DELETE, 0, 0, NULL);
+	
 	LIST_REMOVE(j, sle);
 	LIST_REMOVE(j, label_hash_sle);
 
@@ -1497,7 +1531,8 @@
 	j->currently_ignored = true;
 	j->ondemand = true;
 	j->checkedin = true;
-
+	j->jetsam_priority = LAUNCHD_JETSAM_PRIORITY_UNSET;
+	
 	if (prog) {
 		j->prog = strdup(prog);
 		if (!job_assumes(j, j->prog != NULL)) {
@@ -1836,6 +1871,15 @@
 			}
 		}
 		break;
+	case 'j':
+	case 'J':
+		if( strcasecmp(key, LAUNCH_JOBKEY_JETSAMPRIORITY) == 0 ) {
+			job_log(j, LOG_DEBUG, "Importing job with priority: %lld", value);
+			j->jetsam_priority = (typeof(j->jetsam_priority))value;
+			LIST_INSERT_HEAD(&j->mgr->jetsam_jobs, j, jetsam_sle);
+			j->mgr->jetsam_jobs_cnt++;
+		}
+		break;
 	case 'n':
 	case 'N':
 		if (strcasecmp(key, LAUNCH_JOBKEY_NICE) == 0) {
@@ -2345,7 +2389,6 @@
 	struct ldcred *ldc = runtime_get_caller_creds();
 	job_t jr;
 
-
 	jr = job_mig_intran2(root_jobmgr, p, ldc->pid);
 
 	if (!jobmgr_assumes(root_jobmgr, jr != NULL)) {
@@ -2487,6 +2530,8 @@
 		job_mig_swap_integer(j, VPROC_GSK_WEIRD_BOOTSTRAP, 0, 0, &junk);
 	}
 
+	j->wait4debugger_oneshot = false;
+
 	if (j->log_redirect_fd && !j->legacy_LS_job) {
 		job_log_stdouterr(j); /* one last chance */
 
@@ -2633,6 +2678,13 @@
 		}
 	}
 	
+	struct envitem *ei = NULL, *et = NULL;
+	SLIST_FOREACH_SAFE( ei, &j->env, sle, et ) {
+		if( ei->one_shot ) {
+			SLIST_REMOVE(&j->env, ei, envitem, sle);
+		}
+	}
+	
 	if (j->hopefully_exits_first) {
 		j->mgr->hopefully_first_cnt--;
 	} else if (!j->anonymous && !j->hopefully_exits_last) {
@@ -3487,7 +3539,7 @@
 		argv++;
 	}
 
-	if (unlikely(j->wait4debugger)) {
+	if (unlikely(j->wait4debugger || j->wait4debugger_oneshot)) {
 		job_log(j, LOG_WARNING, "Spawned and waiting for the debugger to attach before continuing...");
 		spflags |= POSIX_SPAWN_START_SUSPENDED;
 	}
@@ -4624,7 +4676,7 @@
 }
 
 bool
-envitem_new(job_t j, const char *k, const char *v, bool global)
+envitem_new(job_t j, const char *k, const char *v, bool global, bool one_shot)
 {
 	struct envitem *ei = calloc(1, sizeof(struct envitem) + strlen(k) + 1 + strlen(v) + 1);
 
@@ -4635,6 +4687,7 @@
 	strcpy(ei->key_init, k);
 	ei->value = ei->key_init + strlen(k) + 1;
 	strcpy(ei->value, v);
+	ei->one_shot = one_shot;
 
 	if (global) {
 		if (SLIST_EMPTY(&j->global_env)) {
@@ -4675,12 +4728,28 @@
 	}
 
 	if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) != 0 ) {
-		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env);
+		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env, false);
 	} else {
 		job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
 	}
 }
 
+void
+envitem_setup_one_shot(launch_data_t obj, const char *key, void *context)
+{
+	job_t j = context;
+	
+	if (launch_data_get_type(obj) != LAUNCH_DATA_STRING) {
+		return;
+	}
+	
+	if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) != 0 ) {
+		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env, true);
+	} else {
+		job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
+	}	
+}
+
 bool
 limititem_update(job_t j, int w, rlim_t r)
 {
@@ -5544,7 +5613,7 @@
 
 		/* <rdar://problem/5042202> launchd-201: can't ssh in with AFP OD account (hangs) */
 		snprintf(buf, sizeof(buf), "0x%X:0:0", getuid());
-		envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false);
+		envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false, false);
 		bootstrapper->weird_bootstrap = true;
 		jobmgr_assumes(jm, job_setup_machport(bootstrapper));
 	} else if( bootstrapper && strncmp(session_type, VPROCMGR_SESSION_SYSTEM, sizeof(VPROCMGR_SESSION_SYSTEM)) == 0 ) {
@@ -6423,7 +6492,7 @@
 		vm_offset_t *outval, mach_msg_type_number_t *outvalCnt) 
 {
 	const char *action;
-	launch_data_t input_obj, output_obj;
+	launch_data_t input_obj = NULL, output_obj = NULL;
 	size_t data_offset = 0;
 	size_t packed_size;
 	struct ldcred *ldc = runtime_get_caller_creds();
@@ -6495,8 +6564,13 @@
 	}
 
 	if (invalCnt) switch (inkey) {
-	case VPROC_GSK_ENVIRONMENT:
-		
+	case VPROC_GSK_ENVIRONMENT:	
+		if( launch_data_get_type(input_obj) == LAUNCH_DATA_DICTIONARY ) {
+			if( j->p ) {
+				job_log(j, LOG_NOTICE, "Setting environment for a currently active job. This environment will take effect on the next invocation of the job.");
+			}
+			launch_data_dict_iterate(input_obj, envitem_setup_one_shot, j);
+		}
 		break;
 	case 0:
 		break;
@@ -6587,6 +6661,9 @@
 		job_log(j, LOG_DEBUG, "Reading transaction model status.");
 		*outval = j->kill_via_shmem;
 		break;
+	case VPROC_GSK_WAITFORDEBUGGER:
+		*outval = j->wait4debugger;
+		break;
 	case 0:
 		*outval = 0;
 		break;
@@ -6660,6 +6737,7 @@
 			j->kill_via_shmem = (bool)inval;
 			job_log(j, LOG_DEBUG, "j->kill_via_shmem = %s", j->kill_via_shmem ? "true" : "false");
 		}
+		break;
 	case VPROC_GSK_WEIRD_BOOTSTRAP:
 		if( job_assumes(j, j->weird_bootstrap) ) {
 			job_log(j, LOG_DEBUG, "Unsetting weird bootstrap.");
@@ -6673,6 +6751,10 @@
 			job_assumes(j, runtime_add_mport(j->mgr->jm_port, protocol_vproc_server, mxmsgsz) == KERN_SUCCESS);
 			j->weird_bootstrap = false;
 		}
+		break;
+	case VPROC_GSK_WAITFORDEBUGGER:
+		j->wait4debugger_oneshot = inval;
+		break;
 	case 0:
 		break;
 	default:
@@ -7349,6 +7431,31 @@
 	return BOOTSTRAP_SUCCESS;
 }
 
+kern_return_t
+job_mig_port_for_label(job_t j __attribute__((unused)), name_t label, mach_port_t *mp)
+{
+	struct ldcred *ldc = runtime_get_caller_creds();
+	kern_return_t kr = BOOTSTRAP_NOT_PRIVILEGED;
+	
+	mach_port_t _mp = MACH_PORT_NULL;
+	if( ldc->euid == 0 || ldc->euid == geteuid() ) {
+		job_t target_j = job_find(label);
+		if( jobmgr_assumes(root_jobmgr, target_j != NULL) ) {
+			if( target_j->j_port == MACH_PORT_NULL ) {
+				job_assumes(target_j, job_setup_machport(target_j) == true);
+			}
+			
+			_mp = target_j->j_port;
+			kr = _mp != MACH_PORT_NULL ? BOOTSTRAP_SUCCESS : BOOTSTRAP_NO_MEMORY;
+		} else {
+			kr = BOOTSTRAP_NO_MEMORY;
+		}
+	}
+
+	*mp = _mp;
+	return kr;
+}
+
 jobmgr_t 
 jobmgr_find_by_name(jobmgr_t jm, const char *where)
 {
@@ -8189,3 +8296,120 @@
 		}
 	}
 }
+
+static void
+jetsam_priority_from_job(job_t j, bool front, jetsam_priority_entry_t *jp)
+{
+	jp->pid = j->p;
+	jp->flags |= front ? kJetsamFlagsFrontmost : 0;
+}
+
+static int
+job_cmp(const job_t *lhs, const job_t *rhs)
+{
+	job_t _lhs = *lhs;
+	job_t _rhs = *rhs;
+	/* Sort in descending order. (Priority correlates to the soonishness with which you will be killed.) */
+	if( _lhs->jetsam_priority > _rhs->jetsam_priority ) {
+		return -1;
+	} else if( _lhs->jetsam_priority < _rhs->jetsam_priority ) {
+		return 1;
+	}
+	
+	return 0;
+}
+
+int
+launchd_set_jetsam_priorities(launch_data_t priorities)
+{
+	if( !launchd_assumes(launch_data_get_type(priorities) == LAUNCH_DATA_ARRAY) ) {
+		return EINVAL;
+	}
+	
+	jobmgr_t jm = NULL;
+#if !TARGET_OS_EMBEDDED
+	/* For testing. */
+	jm = jobmgr_find_by_name(root_jobmgr, VPROCMGR_SESSION_AQUA);
+	if( !launchd_assumes(jm != NULL) ) {
+		return EINVAL;
+	}
+#else
+	/* Since this is for embedded, we can assume that the root job manager holds the Jetsam jobs. */
+	jm = root_jobmgr;
+#endif
+		
+	size_t npris = launch_data_array_get_count(priorities);
+
+	job_t ji = NULL;
+	size_t i = 0;
+	for( i = 0; i < npris; i++ ) {
+		launch_data_t ldi = launch_data_array_get_index(priorities, i);
+		if( !launchd_assumes(launch_data_get_type(ldi) == LAUNCH_DATA_DICTIONARY) ) {
+			continue;
+		}
+		
+		launch_data_t label = NULL;
+		if( !launchd_assumes(label = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMLABEL)) ) {
+			continue;
+		}
+		const char *_label = launch_data_get_string(label);
+		
+		ji = job_find(_label);
+		if( !launchd_assumes(ji != NULL) ) {
+			continue;
+		}
+		
+		launch_data_t pri;
+		long long _pri = 0;
+		if( !launchd_assumes(pri = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMPRIORITY)) ) {
+			continue;
+		}
+		_pri = launch_data_get_integer(pri);
+		
+		if( ji->jetsam_priority == LAUNCHD_JETSAM_PRIORITY_UNSET ) {
+			LIST_INSERT_HEAD(&ji->mgr->jetsam_jobs, ji, jetsam_sle);
+			ji->mgr->jetsam_jobs_cnt++;
+		}
+		ji->jetsam_priority = _pri;
+		
+		launch_data_t frontmost = NULL;
+		if( !(frontmost = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMFRONTMOST)) ) {
+			ji->jetsam_frontmost = false;
+			continue;
+		}
+		ji->jetsam_frontmost = launch_data_get_bool(frontmost);
+	}
+	
+	i = 0;
+	job_t *jobs = (job_t *)calloc(jm->jetsam_jobs_cnt, sizeof(job_t));
+	LIST_FOREACH( ji, &jm->jetsam_jobs, jetsam_sle ) {
+		if( ji->p ) {
+			jobs[i] = ji;
+			i++;
+		}
+	}
+	size_t totalpris = i;
+	
+	int result = EINVAL;
+	if( launchd_assumes(totalpris > 0) ) {
+		qsort((void *)jobs, totalpris, sizeof(job_t), (int (*)(const void *, const void *))job_cmp);
+		
+		jetsam_priority_entry_t *jpris = (jetsam_priority_entry_t *)calloc(totalpris, sizeof(jetsam_priority_entry_t));
+		if( !launchd_assumes(jpris != NULL) ) {
+			result = ENOMEM;
+		} else {
+			for( i = 0; i < totalpris; i++ ) {
+				jetsam_priority_from_job(jobs[i], jobs[i]->jetsam_frontmost, &jpris[i]);
+			}
+			
+			int _result = 0;
+			launchd_assumes((_result = sysctlbyname("kern.memorystatus_priority_list", NULL, NULL, &jpris[0], totalpris * sizeof(jetsam_priority_entry_t))) != -1);
+			result = _result != 0 ? errno : 0;
+			
+			free(jpris);
+		}
+	}
+	free(jobs);
+	
+	return result;
+}

Modified: trunk/launchd/src/launchd_core_logic.h
===================================================================
--- trunk/launchd/src/launchd_core_logic.h	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchd_core_logic.h	2009-01-10 00:40:56 UTC (rev 23776)
@@ -56,4 +56,6 @@
 void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
 void job_set_pid_crashed(pid_t p);
 
+int launchd_set_jetsam_priorities(launch_data_t priorities);
+
 #endif

Modified: trunk/launchd/src/launchd_runtime.c
===================================================================
--- trunk/launchd/src/launchd_runtime.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchd_runtime.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -131,7 +131,7 @@
 bool do_apple_internal_logging;
 bool low_level_debug;
 bool g_force_old_kill_path = false;
-bool g_flat_mach_namespace = false;
+bool g_flat_mach_namespace = true;
 
 mach_port_t
 runtime_get_kernel_port(void)
@@ -1743,7 +1743,7 @@
 		g_force_old_kill_path = true;
 	}
 	
-	if( !pid1_magic && stat("/var/db/.launchd_flat_per_user_namespace", &sb) == 0 ) {
-		g_flat_mach_namespace = true;
+	if( !pid1_magic && stat("/var/db/.launchd_no_flat_per_user_namespace", &sb) == 0 ) {
+		g_flat_mach_namespace = false;
 	}
 }

Modified: trunk/launchd/src/launchd_unix_ipc.c
===================================================================
--- trunk/launchd/src/launchd_unix_ipc.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/launchd_unix_ipc.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -415,6 +415,8 @@
 			resp = job_export(j);
 			ipc_revoke_fds(resp);
 		}
+	} else if( !strcmp(cmd, LAUNCH_KEY_SETPRIORITYLIST) ) {
+		resp = launch_data_new_errno(launchd_set_jetsam_priorities(data));
 	}
 
 	rmc->resp = resp;

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/libvproc.c	2009-01-10 00:40:56 UTC (rev 23776)
@@ -34,6 +34,8 @@
 #include <pthread.h>
 #include <signal.h>
 #include <assert.h>
+#include <libkern/OSAtomic.h>
+
 #if HAVE_QUARANTINE
 #include <quarantine.h>
 #endif
@@ -59,6 +61,55 @@
 static pthread_once_t shmem_inited = PTHREAD_ONCE_INIT;
 static uint64_t s_cached_transactions_enabled = 0;
 
+struct vproc_s {
+	int32_t refcount;
+	mach_port_t j_port;
+};
+
+vproc_t vprocmgr_lookup_vproc(const char *label)
+{
+	struct vproc_s *vp = NULL;
+	
+	mach_port_t mp = MACH_PORT_NULL;
+	kern_return_t kr = vproc_mig_port_for_label(bootstrap_port, (char *)label, &mp);
+	if( kr == BOOTSTRAP_SUCCESS ) {
+		vp = (struct vproc_s *)calloc(1, sizeof(struct vproc_s));
+		if( vp ) {
+			vp->refcount = 1;
+			mach_port_mod_refs(mach_task_self(), mp, MACH_PORT_RIGHT_SEND, 1);
+			vp->j_port = mp;
+		}
+		mach_port_mod_refs(mach_task_self(), mp, MACH_PORT_RIGHT_SEND, -1);
+	}
+	
+	return vp;
+}
+
+vproc_t vproc_retain(vproc_t vp)
+{
+	int32_t orig = OSAtomicAdd32(1, &vp->refcount) - 1;	
+	if( orig <= 0 ) {
+		/* We've gone from 0 to 1, which means that this object was due to be freed. */
+		__crashreporter_info__ = "Under-retain / over-release of vproc_t.";
+		abort();
+	}
+	
+	return vp;
+}
+
+void vproc_release(vproc_t vp)
+{
+	int32_t newval = OSAtomicAdd32(-1, &vp->refcount);
+	if( newval < 0 ) {
+		/* We're in negative numbers, which is bad. */
+		__crashreporter_info__ = "Over-release of vproc_t.";
+		abort();
+	} else if( newval == 0 ) {
+		mach_port_deallocate(mach_task_self(), vp->j_port);
+		free(vp);
+	}
+}
+
 static void
 vproc_shmem_init(void)
 {
@@ -746,7 +797,7 @@
 }
 
 vproc_err_t
-vproc_swap_integer(vproc_t vp __attribute__((unused)), vproc_gsk_t key, int64_t *inval, int64_t *outval)
+vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval)
 {
 	static int64_t cached_is_managed = -1;
 	int64_t dummyval = 0;
@@ -785,7 +836,8 @@
 		break;
 	}
 
-	if (vproc_mig_swap_integer(bootstrap_port, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) {
+	mach_port_t mp = vp ? vp->j_port : bootstrap_port;
+	if (vproc_mig_swap_integer(mp, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) {
 		switch (key) {
 		case VPROC_GSK_MGR_PID:
 			cached_pid = outval ? *outval : dummyval;
@@ -832,7 +884,7 @@
 }
 
 vproc_err_t
-vproc_swap_complex(vproc_t vp __attribute__((unused)), vproc_gsk_t key, launch_data_t inval, launch_data_t *outval)
+vproc_swap_complex(vproc_t vp, vproc_gsk_t key, launch_data_t inval, launch_data_t *outval)
 {
 	size_t data_offset = 0, good_enough_size = 10*1024*1024;
 	mach_msg_type_number_t indata_cnt = 0, outdata_cnt;
@@ -853,7 +905,8 @@
 		indata = (vm_offset_t)buf;
 	}
 
-	if (vproc_mig_swap_complex(bootstrap_port, inval ? key : 0, outval ? key : 0, indata, indata_cnt, &outdata, &outdata_cnt) != 0) {
+	mach_port_t mp = vp ? vp->j_port : bootstrap_port;
+	if (vproc_mig_swap_complex(mp, inval ? key : 0, outval ? key : 0, indata, indata_cnt, &outdata, &outdata_cnt) != 0) {
 		goto out;
 	}
 

Modified: trunk/launchd/src/protocol_vproc.defs
===================================================================
--- trunk/launchd/src/protocol_vproc.defs	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/protocol_vproc.defs	2009-01-10 00:40:56 UTC (rev 23776)
@@ -199,3 +199,7 @@
 				__pid				: pid_t;
 out				__managed			: boolean_t);
 
+routine port_for_label(
+				__bs_port			: job_t;
+				__label				: name_t;
+out				__mp				: mach_port_make_send_t);

Modified: trunk/launchd/src/vproc.h
===================================================================
--- trunk/launchd/src/vproc.h	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/vproc.h	2009-01-10 00:40:56 UTC (rev 23776)
@@ -34,7 +34,7 @@
 
 typedef void * vproc_err_t;
 
-typedef void * vproc_t;
+typedef struct vproc_s * vproc_t;
 typedef void * vprocmgr_t;
 
 const char *vproc_strerror(vproc_err_t r);

Modified: trunk/launchd/src/vproc_priv.h
===================================================================
--- trunk/launchd/src/vproc_priv.h	2009-01-08 23:44:10 UTC (rev 23775)
+++ trunk/launchd/src/vproc_priv.h	2009-01-10 00:40:56 UTC (rev 23776)
@@ -59,12 +59,17 @@
 	VPROC_GSK_ABANDON_PROCESS_GROUP,
 	VPROC_GSK_TRANSACTIONS_ENABLED,
 	VPROC_GSK_WEIRD_BOOTSTRAP,
+	VPROC_GSK_WAITFORDEBUGGER,
 } vproc_gsk_t;
 
 typedef unsigned int vproc_flags_t;
 /* For _vproc_kickstart_by_label() -- instructs launchd to kickstart the job to stall before exec(2). */
 #define VPROCFLAG_STALL_JOB_EXEC	1 << 1
 
+vproc_t vprocmgr_lookup_vproc(const char *label);
+vproc_t vproc_retain(vproc_t vp);
+void vproc_release(vproc_t vp);
+
 vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);
 vproc_err_t vproc_swap_complex(vproc_t vp, vproc_gsk_t key, launch_data_t inval, launch_data_t *outval);
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090109/6a474945/attachment-0001.html>

From source_changes at macosforge.org  Fri Jan  9 16:53:43 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Fri,  9 Jan 2009 16:53:43 -0800 (PST)
Subject: [launchd-changes] [23777] tags/launchd-296/
Message-ID: <20090110005343.9174ABC254F@beta.macosforge.org>

Revision: 23777
          http://trac.macosforge.org/projects/launchd/changeset/23777
Author:   dsorresso at apple.com
Date:     2009-01-09 16:53:42 -0800 (Fri, 09 Jan 2009)
Log Message:
-----------
"Tagging launchd-296 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    tags/launchd-296/


Property changes on: tags/launchd-296
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090109/f5bad753/attachment.html>

From source_changes at macosforge.org  Tue Jan 13 11:15:50 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 11:15:50 -0800 (PST)
Subject: [launchd-changes] [23778] branches/launchd-SUTiger
Message-ID: <20090113191551.0CCC1C2C15B@beta.macosforge.org>

Revision: 23778
          http://trac.macosforge.org/projects/launchd/changeset/23778
Author:   kvv at apple.com
Date:     2009-01-13 11:15:50 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
Merged PR-6461138

Modified Paths:
--------------
    branches/launchd-SUTiger/launchd/src/StartupItems/NetworkTime

Property Changed:
----------------
    branches/launchd-SUTiger/


Property changes on: branches/launchd-SUTiger
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/PR-6461138:23773-23777

Modified: branches/launchd-SUTiger/launchd/src/StartupItems/NetworkTime
===================================================================
--- branches/launchd-SUTiger/launchd/src/StartupItems/NetworkTime	2009-01-10 00:53:42 UTC (rev 23777)
+++ branches/launchd-SUTiger/launchd/src/StartupItems/NetworkTime	2009-01-13 19:15:50 UTC (rev 23778)
@@ -22,7 +22,7 @@
 	# Synchronize our clock to the network's time,
 	# then fire off ntpd to keep the clock in sync.
 	ntpdate -bvs
-	ntpd -f /var/run/ntp.drift -p /var/run/ntpd.pid
+	ntpd -c /private/etc/ntp-restrict.conf -f /var/run/ntp.drift -p /var/run/ntpd.pid
     fi
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/0926f6c4/attachment.html>

From source_changes at macosforge.org  Tue Jan 13 11:16:04 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 11:16:04 -0800 (PST)
Subject: [launchd-changes] [23779] tags/launchd-106.21/
Message-ID: <20090113191604.2574DC2C1A9@beta.macosforge.org>

Revision: 23779
          http://trac.macosforge.org/projects/launchd/changeset/23779
Author:   kvv at apple.com
Date:     2009-01-13 11:16:03 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
"Tagging launchd-106.21 from http://svn.macosforge.org/repository/launchd/branches/launchd-SUTiger"

Added Paths:
-----------
    tags/launchd-106.21/


Property changes on: tags/launchd-106.21
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/PR-6461138:23773-23777
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/27ea4570/attachment.html>

From source_changes at macosforge.org  Tue Jan 13 14:18:50 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 14:18:50 -0800 (PST)
Subject: [launchd-changes] [23780] trunk/launchd/src
Message-ID: <20090113221851.B5CC5C3103D@beta.macosforge.org>

Revision: 23780
          http://trac.macosforge.org/projects/launchd/changeset/23780
Author:   dsorresso at apple.com
Date:     2009-01-13 14:18:50 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
<rdar://problem/4344661> DOC: Launchd documentation needs updating
<rdar://problem/5665637> launchd needs to read: ~/.MacOSX/environment.plist
<rdar://problem/6252612> DOC: SystemStarter: man page doesn't reflect its deprecation
<rdar://problem/6311035> Investigate flattening the per-PID Mach namespace to let FileSyncAgent work in a flat Mach namespace world
<rdar://problem/6317143> Tweak HopefullyExitsLast behavior to SIGTERM and not wait for jobs to die
<rdar://problem/6444742> _vproc_transaction_count_for_pid() has a stack-butchering type mismatch.
<rdar://problem/6452938> Reconsider sync() and unmounts in launchd's shutdown path
<rdar://problem/6454800> launchd's logging about what looks like a bug in it.
<rdar://problem/6485062> 10A245: launchd logging errors about Bug: launchd_core_logic.c:2902
<rdar://problem/6485067> 10A245: launchd logging errors about Bug: launchd_core_logic.c:3051
<rdar://problem/6486016> 10A245: launchd logging many exited/killed message to system.log
<rdar://problem/6487997> vproc functions log too much.

Modified Paths:
--------------
    trunk/launchd/src/launchctl.c
    trunk/launchd/src/launchd.c
    trunk/launchd/src/launchd_core_logic.c
    trunk/launchd/src/libvproc.c

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2009-01-13 19:16:03 UTC (rev 23779)
+++ trunk/launchd/src/launchctl.c	2009-01-13 22:18:50 UTC (rev 23780)
@@ -116,6 +116,7 @@
 static launch_data_t CF2launch_data(CFTypeRef);
 static launch_data_t read_plist_file(const char *file, bool editondisk, bool load);
 static CFPropertyListRef CreateMyPropertyListFromFile(const char *);
+static CFPropertyListRef CFPropertyListCreateFromFile(CFURLRef plistURL);
 static void WriteMyPropertyListToFile(CFPropertyListRef, const char *);
 static bool path_goodness_check(const char *path, bool forceload);
 static void readpath(const char *, struct load_unload_state *);
@@ -158,6 +159,7 @@
 static void do_single_user_mode(bool);
 static bool do_single_user_mode2(void);
 static void read_launchd_conf(void);
+static void read_environment_dot_plist(void);
 static bool job_disabled_logic(launch_data_t obj);
 static void fix_bogus_file_metadata(void);
 static void do_file_init(void) __attribute__((constructor));
@@ -415,6 +417,96 @@
 	fclose(f);
 }
 
+CFPropertyListRef CFPropertyListCreateFromFile(CFURLRef plistURL)
+{	
+	CFReadStreamRef plistReadStream = CFReadStreamCreateWithFile(NULL, plistURL);
+	
+	CFErrorRef streamErr = NULL;
+	if( !CFReadStreamOpen(plistReadStream) ) {
+		streamErr = CFReadStreamCopyError(plistReadStream);
+		CFStringRef errString = CFErrorCopyDescription(streamErr);
+		
+		CFShow(errString);
+		
+		CFRelease(errString);
+		CFRelease(streamErr);
+	}
+	
+	CFPropertyListRef plist = NULL;
+	if( plistReadStream ) {
+		CFStringRef errString = NULL;
+		CFPropertyListFormat plistFormat = 0;
+		plist = CFPropertyListCreateFromStream(NULL, plistReadStream, 0, kCFPropertyListImmutable, &plistFormat, &errString);
+		if( !plist ) {
+			CFShow(errString);
+			CFRelease(errString);
+		}
+	}
+	
+	CFReadStreamClose(plistReadStream);
+	CFRelease(plistReadStream);
+	
+	return plist;
+}
+
+#define CFReleaseIfNotNULL(cf) if( cf ) CFRelease(cf);
+void
+read_environment_dot_plist(void)
+{
+	CFStringRef plistPath = NULL;
+	CFURLRef plistURL = NULL;
+	CFDictionaryRef envPlist = NULL;
+	launch_data_t req = NULL, launch_env_dict = NULL, resp = NULL;
+	
+	plistPath = CFStringCreateWithFormat(NULL, NULL, CFSTR("%s/.MacOSX/environment.plist"), getenv("HOME"));
+	if( !assumes(plistPath != NULL) ) {
+		goto out;
+	}
+	
+	plistURL = CFURLCreateWithFileSystemPath(NULL, plistPath, kCFURLPOSIXPathStyle, false);
+	if( !assumes(plistURL != NULL) ) {
+		goto out;
+	}
+	
+	envPlist = (CFDictionaryRef)CFPropertyListCreateFromFile(plistURL);
+	if( !assumes(envPlist != NULL) ) {
+		goto out;
+	}
+	
+	launch_env_dict = CF2launch_data(envPlist);
+	if( !assumes(launch_env_dict != NULL) ) {
+		goto out;
+	}
+	
+	req = launch_data_alloc(LAUNCH_DATA_DICTIONARY);
+	if( !assumes(req != NULL) ) {
+		goto out;
+	}
+	
+	launch_data_dict_insert(req, launch_env_dict, LAUNCH_KEY_SETUSERENVIRONMENT);
+	resp = launch_msg(req);
+	if( !assumes(resp != NULL) ) {
+		goto out;
+	}
+	
+	if( !assumes(launch_data_get_type(resp) == LAUNCH_DATA_ERRNO) ) {
+		goto out;
+	}
+
+	assumes(launch_data_get_errno(resp) == 0);
+out:
+	CFReleaseIfNotNULL(plistPath);
+	CFReleaseIfNotNULL(plistURL);
+	CFReleaseIfNotNULL(envPlist);	
+	if( req ) {
+		launch_data_free(req);
+	}
+	
+	if( resp ) {
+		launch_data_free(resp);
+	}
+}
+
 int
 unsetenv_cmd(int argc, char *const argv[])
 {
@@ -1897,7 +1989,7 @@
 		if (is_safeboot()) {
 			load_launchd_items[4] = "system";
 		}
-
+		
 		if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0 || strcasecmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
 			load_launchd_items[4] = "system";
 			if (!is_safeboot()) {
@@ -1937,6 +2029,18 @@
 			 * agents.
 			 */
 			the_argc_user = 5;
+			
+			/* We want to read environment.plist, which is in the user's home directory.
+			 * Since the dance to mount a network home directory is fairly complex, all we
+			 * can do is try and read environment.plist when bootstrapping the Aqua session,
+			 * which is when we assume the home directory is present.
+			 *
+			 * The drawback here is that jobs bootstrapped in the Background session won't
+			 * get the new environment until they quit and relaunch. But then again, they 
+			 * won't get the updated HOME directory or anything either. This is just a messy
+			 * problem.
+			 */
+			read_environment_dot_plist();
 		} else if (strcasecmp(session_type, VPROCMGR_SESSION_AQUA) == 0) {
 			/* If we're bootstrapping the StandardIO session, bootstrap the user's Background
 			 * agents.

Modified: trunk/launchd/src/launchd.c
===================================================================
--- trunk/launchd/src/launchd.c	2009-01-13 19:16:03 UTC (rev 23779)
+++ trunk/launchd/src/launchd.c	2009-01-13 22:18:50 UTC (rev 23780)
@@ -175,15 +175,13 @@
 		ipc_server_init();
 		
 		runtime_log_push();
-
-		int64_t now = runtime_get_wall_time();
 		
 		struct passwd *pwent = getpwuid(getuid());
 		if( pwent ) {
 			strlcpy(g_username, pwent->pw_name, sizeof(g_username) - 1);
 		}
 		
-		runtime_syslog(LOG_NOTICE, "Per-user launchd for UID %u (%s) began at: %lld.%06llu", getuid(), g_username, now / USEC_PER_SEC, now % USEC_PER_SEC);
+		runtime_syslog(LOG_DEBUG, "Per-user launchd for UID %u (%s) has begun.", getuid(), g_username);
 	}
 
 	if( pid1_magic ) {

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2009-01-13 19:16:03 UTC (rev 23779)
+++ trunk/launchd/src/launchd_core_logic.c	2009-01-13 22:18:50 UTC (rev 23780)
@@ -336,9 +336,7 @@
 	unsigned int hopefully_first_cnt;
 	unsigned int normal_active_cnt;
 	unsigned int jetsam_jobs_cnt;
-	unsigned int 	sent_stop_to_normal_jobs		:1, 
-					sent_stop_to_hopefully_last_jobs:1, 
-					shutting_down					:1, 
+	unsigned int 	shutting_down					:1,
 					session_initialized				:1, 
 					killed_hopefully_first_jobs		:1,
 					killed_normal_jobs				:1,
@@ -357,16 +355,19 @@
 static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
 static job_t jobmgr_import2(jobmgr_t jm, launch_data_t pload);
 static jobmgr_t jobmgr_parent(jobmgr_t jm);
+static jobmgr_t jobmgr_do_hopefully_first_shutdown_phase(jobmgr_t jm);
+static jobmgr_t jobmgr_do_normal_shutdown_phase(jobmgr_t jm);
+static jobmgr_t jobmgr_do_hopefully_last_shutdown_phase(jobmgr_t jm);
 static jobmgr_t jobmgr_do_garbage_collection(jobmgr_t jm);
 static bool jobmgr_label_test(jobmgr_t jm, const char *str);
 static void jobmgr_reap_bulk(jobmgr_t jm, struct kevent *kev);
-static void jobmgr_log_stray_children(jobmgr_t jm);
+static void jobmgr_log_stray_children(jobmgr_t jm, bool kill_strays);
 static void jobmgr_kill_stray_child(jobmgr_t jm, pid_t p);
 static void jobmgr_remove(jobmgr_t jm, bool expect_real_jobs);
 static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack);
 static void jobmgr_dequeue_next_sample(jobmgr_t jm);
 static job_t jobmgr_init_session(jobmgr_t jm, const char *session_type, bool sflag);
-static job_t jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p);
+static job_t jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p, bool anon_okay);
 static job_t jobmgr_find_by_pid(jobmgr_t jm, pid_t p, bool create_anon);
 static jobmgr_t jobmgr_find_by_name(jobmgr_t jm, const char *where);
 static job_t job_mig_intran2(jobmgr_t jm, mach_port_t mport, pid_t upid);
@@ -499,6 +500,7 @@
 			nosy						:1, /* The job has an OtherJobEnabled KeepAlive criterion. */
 			crashed						:1, /* The job is the default Mach exception handler, and it crashed. */
 			reaped						:1, /* We've received NOTE_EXIT for the job. */
+			stopped						:1, /* job_stop() was called. */
 			jetsam_frontmost			:1; /* The job is considered "frontmost" by Jetsam. */
 	mode_t mask;
 	pid_t sample_pid;
@@ -591,7 +593,6 @@
 static size_t our_strhash(const char *s) __attribute__((pure));
 static void extract_rcsid_substr(const char *i, char *o, size_t osz);
 static void do_first_per_user_launchd_hack(void);
-static void do_unmounts(void);
 void eliminate_double_reboot(void);
 
 /* For Jetsam. */
@@ -737,6 +738,8 @@
 
 		job_log(j, LOG_DEBUG, "Sent SIGTERM signal%s", extralog);
 	}
+	
+	j->stopped = true;
 }
 
 launch_data_t
@@ -894,88 +897,12 @@
 {
 	jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Still alive with %lu/%lu (normal/anonymous) children", total_children, total_anon_children);
 	jobmgr_log_active_jobs(jm);
-	
-	if( pid1_magic && jm == root_jobmgr ) {
-		/* Take the opportunity to shut the system down if it presents itself. */
-		if( total_children == 0 ) {
-			jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "No more non-anonymous children left. Shutting down the system.");
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, false);
-		}
-		
-		unsigned int unkilled_jobs = 0;
-		job_t ji = NULL;
-		char *type = NULL;
-		if( !jm->killed_hopefully_first_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( ji->hopefully_exits_first && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Hopefully First job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "hopefully first";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_hopefully_first_jobs = true;
-			}
-		} else if( !jm->killed_normal_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( !ji->hopefully_exits_first && !ji->hopefully_exits_last && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Normal job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "normal";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_normal_jobs = true;
-			}
-		} else if( !jm->killed_hopefully_last_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( ji->hopefully_exits_last && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Hopefully Last job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "hopefully last";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_hopefully_last_jobs = true;
-			}
-		}
-
-		/* Our club-over-the-head solution to rdar://problem/5054857.
-		 * If all remaining jobs in the PID 1 launchd have been sent SIGKILL, wash our hands of them. This way,
-		 * unkillable processes don't hold up shutdown for customers. Disable this behavior for AppleInternal,
-		 * since we still want to catch kernel bugs and processes that don't properly terminate when receiving
-		 * SIGKILL. See jobmgr_do_garbage_collection() for the rest.
-		 */
-		if( unkilled_jobs == 0 && jm->killed_hopefully_last_jobs ) {
-			if( !do_apple_internal_logging ) {
-				jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1);
-				jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "All remaining non-anonymous jobs have died or been sent SIGKILL. Shutting down the system.");
-				jobmgr_log_stray_children(jm);
-				runtime_closelog(); /* hack to flush logs */
-				jobmgr_remove(jm, true);
-			} else {
-				jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "All remaining non-anonymous jobs have died or been sent SIGKILL. On a customer-facing system, we would call reboot() at this point.");
-			}
-		} else if( unkilled_jobs != 0 ) {
-			jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Still have %u %s non-anonymous job%s that %s not been sent SIGKILL.", unkilled_jobs, type, unkilled_jobs > 1 ? "s" : "", unkilled_jobs > 1 ? "have" : "has");
-		} else {
-			jobmgr_do_garbage_collection(jm);
-		}
-	}
-
-	runtime_closelog(); /* hack to flush logs */
 }
 
 jobmgr_t
 jobmgr_shutdown(jobmgr_t jm)
 {
 	jobmgr_t jmi, jmn;
-	job_t ji;
-
 	jobmgr_log(jm, LOG_DEBUG, "Beginning job manager shutdown with flags: %s", reboot_flags_to_C_names(jm->reboot_flags));
 
 	jm->shutting_down = true;
@@ -983,15 +910,7 @@
 	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
 		jobmgr_shutdown(jmi);
 	}
-
-	if (jm->hopefully_first_cnt) {
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (ji->p && ji->hopefully_exits_first) {
-				job_stop(ji);
-			}
-		}
-	}
-
+	
 	if (jm->parentmgr == NULL && pid1_magic) {
 		jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 5, jm));
 	}
@@ -1013,11 +932,11 @@
 	}
 
 	while( (ji = LIST_FIRST(&jm->jobs)) ) {
-		if( !expect_real_jobs && !job_assumes(ji, ji->anonymous) ) {
+		if( !expect_real_jobs && ji->p && !job_assumes(ji, ji->anonymous) ) {
 			job_log(ji, LOG_WARNING | LOG_CONSOLE, "%s() called incorrectly with non-anonymous job still active. Forcing removal.", __func__);
 			job_remove(ji, true);
 		} else {
-			if( !ji->anonymous ) {
+			if( !ji->anonymous && ji->p ) {
 				job_log(ji, LOG_WARNING | LOG_CONSOLE, "Job has overstayed its welcome. Forcing removal.");
 				job_remove(ji, true);
 			} else {
@@ -1039,18 +958,13 @@
 		SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
 	} else if (pid1_magic) {
 		eliminate_double_reboot();
-		jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "About to call: sync()");
-		sync(); /* We're are going to rely on log timestamps to benchmark this call */
-		jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "Unmounting all filesystems except / and /dev");
-		do_unmounts();
 		launchd_log_vm_stats();
 		jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "About to call: reboot(%s).", reboot_flags_to_C_names(jm->reboot_flags));
 		runtime_closelog();
 		jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1);
-		runtime_closelog();
 	} else {
-		runtime_closelog();
 		jobmgr_log(jm, LOG_DEBUG, "About to exit");
+		runtime_closelog();
 		exit(EXIT_SUCCESS);
 	}
 	
@@ -1198,12 +1112,10 @@
 	if (j->poll_for_vfs_changes) {
 		job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1);
 	}
-
 	if( j->exit_timeout ) {
 		/* Not a big deal if this fails. It means that the timer's already been freed. */
 		kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
 	}
-	
 	if( j->jetsam_priority != LAUNCHD_JETSAM_PRIORITY_UNSET ) {
 		LIST_REMOVE(j, jetsam_sle);
 		j->mgr->jetsam_jobs_cnt--;
@@ -2323,18 +2235,18 @@
 
 /* Should try and consolidate with job_mig_intran2() and jobmgr_find_by_pid(). */
 job_t
-jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p)
+jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p, bool anon_okay)
 {
 	job_t ji = NULL;
 	LIST_FOREACH( ji, &jm->active_jobs[ACTIVE_JOB_HASH(p)], pid_hash_sle ) {
-		if (ji->p == p && !ji->anonymous) {
+		if (ji->p == p && (!ji->anonymous || (ji->anonymous && anon_okay)) ) {
 			return ji;
 		}
 	}
 
 	jobmgr_t jmi = NULL;
 	SLIST_FOREACH( jmi, &jm->submgrs, sle ) {
-		if( (ji = jobmgr_find_by_pid_deep(jmi, p)) ) {
+		if( (ji = jobmgr_find_by_pid_deep(jmi, p, anon_okay)) ) {
 			break;
 		}
 	}
@@ -2642,7 +2554,7 @@
 
 	if (WIFSIGNALED(status)) {
 		int s = WTERMSIG(status);
-		if (SIGKILL == s || SIGTERM == s) {
+		if ((SIGKILL == s || SIGTERM == s) && !j->stopped) {
 			job_log(j, LOG_NOTICE, "Exited: %s", strsignal(s));
 		} else {
 			switch( s ) {
@@ -2699,6 +2611,10 @@
 	j->lastlookup_gennum = 0;
 	j->p = 0;
 
+	if( !j->anonymous ) {
+		jobmgr_do_garbage_collection(j->mgr);
+	}
+
 	/*
 	 * We need to someday evaluate other jobs and find those who wish to track the
 	 * active/inactive state of this job. The current job_dispatch() logic makes
@@ -2951,7 +2867,7 @@
 	if (unlikely(rsz == 0)) {
 		job_log(j, LOG_DEBUG, "Standard out/error pipe closed");
 		close_log_redir = true;
-	} else if (!job_assumes(j, rsz != -1)) {
+	} else if (!job_assumes(j, rsz != -1 && errno != EAGAIN)) {
 		close_log_redir = true;
 	} else {
 		buf[rsz] = '\0';
@@ -3099,8 +3015,8 @@
 			struct kinfo_proc kp;
 			size_t len = sizeof(kp);
 
-			if (job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)
-					&& job_assumes(j, len == sizeof(kp))) {
+			/* Sometimes, the kernel says it succeeded but really didn't. */
+			if (job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1) && len == sizeof(kp)) {
 				char newlabel[1000];
 
 				snprintf(newlabel, sizeof(newlabel), "%p.%s", j, kp.kp_proc.p_comm);
@@ -3212,6 +3128,7 @@
 				}
 				job_log(j, LOG_WARNING | LOG_CONSOLE, "Exit timeout elapsed (%u seconds). Killing", j->exit_timeout);
 				job_kill(j);
+				jobmgr_do_garbage_collection(j->mgr);
 			}
 		}
 	} else {
@@ -3433,7 +3350,8 @@
 		j->start_pending = false;
 		j->reaped = false;
 		j->crashed = false;
-
+		j->stopped = false;
+			
 		runtime_add_ref();
 		total_children++;
 		LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
@@ -4171,9 +4089,17 @@
 	newmsg = alloca(newmsgsz);
 
 	if (err) {
+	#if !TARGET_OS_EMBEDDED
 		snprintf(newmsg, newmsgsz, "%s: %s", msg, strerror(err));
+	#else
+		snprintf(newmsg, newmsgsz, "(%s) %s: %s", j->label, msg, strerror(err));
+	#endif
 	} else {
+	#if !TARGET_OS_EMBEDDED
 		snprintf(newmsg, newmsgsz, "%s", msg);
+	#else
+		snprintf(newmsg, newmsgsz, "(%s) %s", j->label, msg);
+	#endif
 	}
 
 	if (unlikely(j->debug)) {
@@ -5001,7 +4927,6 @@
 job_active(job_t j)
 {
 	struct machservice *ms;
-
 	if (j->p) {
 		return "PID is still valid";
 	}
@@ -5267,90 +5192,182 @@
 }
 
 jobmgr_t
-jobmgr_do_garbage_collection(jobmgr_t jm)
+jobmgr_do_hopefully_first_shutdown_phase(jobmgr_t jm)
 {
-	jobmgr_t jmi, jmn;
-	job_t ji, jn;
-
-	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
-		jobmgr_do_garbage_collection(jmi);
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (likely(!jm->shutting_down)) {
-		return jm;
+	
+	bool should_proceed = !jm->killed_hopefully_first_jobs;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing first phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
+			}
+			if( ji->hopefully_exits_first ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
+		}
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_hopefully_first_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_hopefully_first_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	jobmgr_log(jm, LOG_DEBUG, "Garbage collecting.");
-
-	if (jm->hopefully_first_cnt && !jm->killed_hopefully_first_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->hopefully_first_cnt = %u, jm->killed_hopefully_first_jobs = %s", jm->hopefully_first_cnt, jm->killed_hopefully_first_jobs ? "true" : "false");
-		return jm;
+jobmgr_t
+jobmgr_do_normal_shutdown_phase(jobmgr_t jm)
+{
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (jm->parentmgr && jm->parentmgr->shutting_down && jm->parentmgr->hopefully_first_cnt) {
-		return jm;
-	}
-
-	if (!jm->sent_stop_to_normal_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "Asking \"normal\" jobs to exit.");
-
-		LIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
-			if (!job_active(ji)) {
-				job_remove(ji, false);
-			} else if (!ji->hopefully_exits_last) {
-				job_stop(ji);
+	
+	bool should_proceed = !jm->killed_normal_jobs;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing second phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
 			}
+			
+			if( !(ji->hopefully_exits_first || ji->hopefully_exits_last) && !ji->anonymous ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
 		}
-
-		jm->sent_stop_to_normal_jobs = true;
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_normal_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_normal_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	if (jm->normal_active_cnt && !jm->killed_normal_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->normal_active_cnt = %u, jm->killed_normal_jobs = %s", jm->normal_active_cnt, jm->killed_normal_jobs ? "true" : "false");
-		return jm;
+jobmgr_t
+jobmgr_do_hopefully_last_shutdown_phase(jobmgr_t jm)
+{
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (!jm->sent_stop_to_hopefully_last_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "Asking \"hopefully last\" jobs to exit.");
-
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (ji->p && ji->anonymous) {
-				continue;
-			} else if (ji->p && job_assumes(ji, ji->hopefully_exits_last)) {
-				job_stop(ji);
+	
+	static bool killed_stray_jobs = false;
+	if( !killed_stray_jobs ) {
+		jobmgr_log_stray_children(jm, true);
+		killed_stray_jobs = true;
+	}
+	
+	bool should_proceed = !jm->killed_hopefully_last_jobs && total_children != 0;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing third phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
 			}
+			if( ji->hopefully_exits_last ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
 		}
-
-		jm->sent_stop_to_hopefully_last_jobs = true;
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_hopefully_last_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_hopefully_last_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	if (!SLIST_EMPTY(&jm->submgrs)) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->submgrs not empty!");
+jobmgr_t
+jobmgr_do_garbage_collection(jobmgr_t jm)
+{
+	if( !jm->shutting_down ) {
 		return jm;
 	}
-
-	jobmgr_t retval = NULL;
-	if( pid1_magic && jm == root_jobmgr ) {
-		if( total_children > 0 && !jm->killed_hopefully_last_jobs ) {
-			retval = jm;
-		} else {
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, total_children == 0 ? false : true);
-		}
-	} else {
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (!ji->anonymous) {
-				retval = jm;
+	
+	jobmgr_t jmi = NULL, jmn = NULL;
+	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
+		jobmgr_do_garbage_collection(jmi);
+	}
+	
+	jobmgr_t _jm = jobmgr_do_hopefully_first_shutdown_phase(jm);
+	if( !_jm ) {
+		_jm = jobmgr_do_normal_shutdown_phase(jm) ? : jobmgr_do_hopefully_last_shutdown_phase(jm);
+	}
+	
+	if( !_jm ) {
+		jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Removing.");
+		jobmgr_log_stray_children(jm, false);
+		
+		job_t ji = NULL;
+		LIST_FOREACH( ji, &jm->jobs, sle ) {
+			if( !job_assumes(ji, (ji->anonymous || ji->sent_sigkill) && ji->p) ) {
+				job_log(ji, LOG_NOTICE | LOG_CONSOLE, "Job should be gone but is not.");
 			}
 		}
 		
-		if( !retval ) {
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, false);
-		}
+		jobmgr_remove(jm, total_children != 0);
 	}
 	
-	return retval;
+	return _jm;
 }
 
 void
@@ -5402,16 +5419,12 @@
 }
 
 void
-jobmgr_log_stray_children(jobmgr_t jm)
+jobmgr_log_stray_children(jobmgr_t jm, bool kill_strays)
 {
 	int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
 	size_t i, kp_cnt = 0, kp_skipped = 0, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
 	struct kinfo_proc *kp;
 
-	if (!do_apple_internal_logging) {
-		return;
-	}
-
 	if (likely(jm->parentmgr || !pid1_magic)) {
 		return;
 	}
@@ -5443,10 +5456,9 @@
 		/* We might have some jobs hanging around that we've decided to shut down in spite of. */
 		job_t j = jobmgr_find_by_pid(jm, p_i, false);
 		if( !j || (j && j->anonymous) ) {
-			jobmgr_log(jm, LOG_WARNING, "Stray %s %s at shutdown: PID %u PPID %u PGID %u %s", z, j ? "anonymous job" : "process", p_i, pp_i, pg_i, n);
+			jobmgr_log(jm, LOG_WARNING | LOG_CONSOLE, "Stray %s %s at shutdown: PID %u PPID %u PGID %u %s", z, j ? "anonymous job" : "process", p_i, pp_i, pg_i, n);
 			
-			/* <rdar://problem/6399100> Let the kernel clean up the stragglers. */
-			if( 0 ) {
+			if( kill_strays ) {
 				jobmgr_kill_stray_child(jm, p_i);
 			}
 		}
@@ -5680,18 +5692,29 @@
 	struct machservice *ms;
 	job_t target_j;
 
+	jobmgr_log(jm, LOG_DEBUG, "Looking up %sservice %s", target_pid ? "per-PID " : "", name);
+
 	if (target_pid) {
-		//jobmgr_assumes(jm, !check_parent);
-		if (unlikely((target_j = jobmgr_find_by_pid(jm, target_pid, false)) == NULL)) {
-			return NULL;
+		/* This is a hack to let FileSyncAgent look up per-PID Mach services from the Background
+		 * bootstrap in other bootstraps.
+		 */
+		
+		/* Start in the given bootstrap. */
+		if( unlikely((target_j = jobmgr_find_by_pid(jm, target_pid, false)) == NULL) ) {
+			/* If we fail, do a deep traversal. */
+			if (unlikely((target_j = jobmgr_find_by_pid_deep(root_jobmgr, target_pid, true)) == NULL)) {
+				jobmgr_log(jm, LOG_DEBUG, "Didn't find PID %i", target_pid);
+				return NULL;
+			}
 		}
-
+		
 		SLIST_FOREACH(ms, &target_j->machservices, sle) {
 			if (ms->per_pid && strcmp(name, ms->name) == 0) {
 				return ms;
 			}
 		}
 
+		job_log(target_j, LOG_DEBUG, "Didn't find per-PID Mach service: %s", name);
 		return NULL;
 	}
 	
@@ -6309,7 +6332,7 @@
 	}
 
 	if (unlikely(j->anonymous)) {
-		job_log(j, LOG_ERR, "Anonymous job tried to setup shared memory");
+		job_log(j, LOG_DEBUG, "Anonymous job tried to setup shared memory");
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 
@@ -7261,7 +7284,7 @@
 	
 	struct ldcred *ldc = runtime_get_caller_creds();
 	
-	/* Only allow root processes to look up children, even if we're in the per-user laucnhd.
+	/* Only allow root processes to look up children, even if we're in the per-user launchd.
 	 * Otherwise, this could be used to cross sessions, which counts as a security vulnerability
 	 * in a non-flat namespace.
 	 */
@@ -7389,7 +7412,7 @@
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 	
-	job_t j_for_pid = jobmgr_find_by_pid_deep(j->mgr, p);
+	job_t j_for_pid = jobmgr_find_by_pid_deep(j->mgr, p, false);
 	if( j_for_pid ) {
 		if( j_for_pid->kill_via_shmem ) {
 			if( j_for_pid->shmem ) {
@@ -7423,7 +7446,7 @@
 	/* This is so loginwindow doesn't try to quit GUI apps that have been launched
 	 * directly by launchd as agents.
 	 */
-	job_t j_for_pid = jobmgr_find_by_pid_deep(root_jobmgr, p);
+	job_t j_for_pid = jobmgr_find_by_pid_deep(root_jobmgr, p, false);
 	if( j_for_pid && !j_for_pid->anonymous && !j_for_pid->legacy_LS_job ) {
 		*managed = true;
 	}
@@ -7493,8 +7516,6 @@
 			}
 		}
 	}
-
-	launchd_assumes(jmi != NULL);
 	
 jm_found:
 	return jmi;
@@ -8198,39 +8219,6 @@
 	free(w4r);
 }
 
-void
-do_unmounts(void)
-{
-	struct statfs buf[250];
-	int r, i, found, returned;
-
-	do {
-		returned = getfsstat(buf, (int) sizeof(buf), MNT_NOWAIT);
-		found = 0;
-
-		if (!launchd_assumes(returned != -1)) {
-			return;
-		}
-
-		/* Work backwards due to mounts on top of mounts */
-		for (i = returned - 1; i >= 0; i--) {
-			if (strcmp(buf[i].f_mntonname, "/") == 0) {
-				continue;
-			} else if (strncmp(buf[i].f_mntonname, "/dev", strlen("/dev")) == 0) {
-				continue;
-			}
-
-			r = unmount(buf[i].f_mntonname, 0);
-
-			runtime_syslog(LOG_DEBUG, "unmount(\"%s\", 0): %s", buf[i].f_mntonname, r == -1 ? strerror(errno) : "Success");
-
-			if (r != -1) {
-				found++;
-			}
-		}
-	} while ((returned == (sizeof(buf) / sizeof(buf[0]))) && (found > 0));
-}
-
 size_t
 get_kern_max_proc(void)
 {

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2009-01-13 19:16:03 UTC (rev 23779)
+++ trunk/launchd/src/libvproc.c	2009-01-13 22:18:50 UTC (rev 23780)
@@ -131,15 +131,7 @@
 		if( !_vm_addr ) {
 			return;
 		}
-		
-		_vproc_log(LOG_WARNING,
-					"Using private memory for transactions. You are likely running under a launchd agent or daemon under a debugger.\n"
-					"Please keep the following considerations in mind.\n"
-					"0. This process is not actually participating in Instant Off. It will only be able to keep track of its transaction count.\n"
-					"1. This process will not die after cleaning up its last transaction after it has received SIGTERM.\n"
-					"2. You are debugging your program in an environment that is very different from the one it will run under.\n"
-					"3. You can use the WaitForDebugger key to stall execution of your daemon or agent so that you can attach to it. See launchd.plist(5). "
-					"This only applies if you are debugging a launchd daemon or agent. If you are debugging a GUI application under Xcode, this consideration does not apply.\n");
+
 		vm_addr = (vm_address_t)_vm_addr;
 	} else {
 		kr = vm_map(mach_task_self(), &vm_addr, getpagesize(), 0, true, shmem_port, 0, false,
@@ -245,7 +237,12 @@
 _vproc_transaction_count_for_pid(pid_t p, int32_t *count, bool *condemned)
 {
 	boolean_t _condemned = false;
-	return vproc_mig_transaction_count_for_pid(bootstrap_port, p, count, (boolean_t *)condemned ? : &_condemned);
+	kern_return_t kr = vproc_mig_transaction_count_for_pid(bootstrap_port, p, count, &_condemned);
+	if( kr == KERN_SUCCESS ) {
+		*condemned = _condemned ? true : false;
+	}
+	
+	return kr;
 }
 
 void
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/c9707de9/attachment-0001.html>

From source_changes at macosforge.org  Tue Jan 13 14:19:42 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 14:19:42 -0800 (PST)
Subject: [launchd-changes] [23781] tags/launchd-297/
Message-ID: <20090113221942.A1379C3106F@beta.macosforge.org>

Revision: 23781
          http://trac.macosforge.org/projects/launchd/changeset/23781
Author:   dsorresso at apple.com
Date:     2009-01-13 14:19:42 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
"Tagging launchd-297 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    tags/launchd-297/


Property changes on: tags/launchd-297
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/abfd6f85/attachment.html>

From source_changes at macosforge.org  Tue Jan 13 15:11:05 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 15:11:05 -0800 (PST)
Subject: [launchd-changes] [23782] trunk/launchd/src/libvproc.c
Message-ID: <20090113231106.BFB66C31E5A@beta.macosforge.org>

Revision: 23782
          http://trac.macosforge.org/projects/launchd/changeset/23782
Author:   dsorresso at apple.com
Date:     2009-01-13 15:11:00 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
Caught a NULL pointer dereference in the fix for <rdar://problem/6444742>.

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

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2009-01-13 22:19:42 UTC (rev 23781)
+++ trunk/launchd/src/libvproc.c	2009-01-13 23:11:00 UTC (rev 23782)
@@ -238,7 +238,7 @@
 {
 	boolean_t _condemned = false;
 	kern_return_t kr = vproc_mig_transaction_count_for_pid(bootstrap_port, p, count, &_condemned);
-	if( kr == KERN_SUCCESS ) {
+	if( kr == KERN_SUCCESS && condemned ) {
 		*condemned = _condemned ? true : false;
 	}
 	
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/f9608052/attachment.html>

From source_changes at macosforge.org  Tue Jan 13 15:11:14 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 13 Jan 2009 15:11:14 -0800 (PST)
Subject: [launchd-changes] [23783] tags/launchd-297.1/
Message-ID: <20090113231114.63FC8C31E82@beta.macosforge.org>

Revision: 23783
          http://trac.macosforge.org/projects/launchd/changeset/23783
Author:   dsorresso at apple.com
Date:     2009-01-13 15:11:13 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
"Tagging launchd-297.1 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    tags/launchd-297.1/


Property changes on: tags/launchd-297.1
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090113/acce62a1/attachment.html>

From source_changes at macosforge.org  Mon Jan 19 19:58:33 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Mon, 19 Jan 2009 19:58:33 -0800 (PST)
Subject: [launchd-changes] [23784] branches/PR-6424345
Message-ID: <20090120035837.240E1C9EC93@beta.macosforge.org>

Revision: 23784
          http://trac.macosforge.org/projects/launchd/changeset/23784
Author:   nectar at apple.com
Date:     2009-01-19 19:58:30 -0800 (Mon, 19 Jan 2009)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/PR-6424345/launchd/src/launch_priv.h
    branches/PR-6424345/launchd/src/launchctl.c
    branches/PR-6424345/launchd/src/launchd.c
    branches/PR-6424345/launchd/src/launchd.plist.5
    branches/PR-6424345/launchd/src/launchd_core_logic.c
    branches/PR-6424345/launchd/src/launchd_core_logic.h
    branches/PR-6424345/launchd/src/launchd_runtime.c
    branches/PR-6424345/launchd/src/launchd_unix_ipc.c
    branches/PR-6424345/launchd/src/libbootstrap.c
    branches/PR-6424345/launchd/src/liblaunch.c
    branches/PR-6424345/launchd/src/libvproc.c
    branches/PR-6424345/launchd/src/protocol_vproc.defs
    branches/PR-6424345/launchd/src/vproc.h
    branches/PR-6424345/launchd/src/vproc_priv.h
    branches/PR-6424345/launchd.xcodeproj/project.pbxproj

Property Changed:
----------------
    branches/PR-6424345/


Property changes on: branches/PR-6424345
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
/trunk:23759-23783

Modified: branches/PR-6424345/launchd/src/launch_priv.h
===================================================================
--- branches/PR-6424345/launchd/src/launch_priv.h	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launch_priv.h	2009-01-20 03:58:30 UTC (rev 23784)
@@ -38,7 +38,8 @@
 #define LAUNCH_KEY_SETRESOURCELIMITS					"SetResourceLimits"
 #define LAUNCH_KEY_GETRUSAGESELF						"GetResourceUsageSelf"
 #define LAUNCH_KEY_GETRUSAGECHILDREN					"GetResourceUsageChildren"
-                                                    
+#define LAUNCH_KEY_SETPRIORITYLIST						"SetPriorityList"
+
 #define LAUNCHD_SOCKET_ENV								"LAUNCHD_SOCKET"
 #define LAUNCHD_SOCK_PREFIX								_PATH_VARTMP "launchd"
 #define LAUNCHD_TRUSTED_FD_ENV							"__LAUNCHD_FD"
@@ -46,12 +47,17 @@
 #define LAUNCH_KEY_BATCHCONTROL							"BatchControl"
 #define LAUNCH_KEY_BATCHQUERY							"BatchQuery"
 #define LAUNCHD_DO_APPLE_INTERNAL_LOGGING				"__DoAppleInternalLogging__"
-                                                    
+
+#define LAUNCH_KEY_JETSAMLABEL							"JetsamLabel"
+#define LAUNCH_KEY_JETSAMFRONTMOST						"JetsamFrontmost"
+#define LAUNCH_KEY_JETSAMPRIORITY						"JetsamPriority"
+
 #define LAUNCH_JOBKEY_TRANSACTIONCOUNT					"TransactionCount"
 #define LAUNCH_JOBKEY_QUARANTINEDATA					"QuarantineData"
 #define LAUNCH_JOBKEY_SANDBOXPROFILE					"SandboxProfile"
 #define LAUNCH_JOBKEY_SANDBOXFLAGS						"SandboxFlags"
 #define LAUNCH_JOBKEY_SANDBOX_NAMED						"Named"
+#define LAUNCH_JOBKEY_JETSAMPRIORITY					"JetsamPriority"
 
 #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL		"EnterKernelDebuggerBeforeKill"
 #define LAUNCH_JOBKEY_PERJOBMACHSERVICES				"PerJobMachServices"

Modified: branches/PR-6424345/launchd/src/launchctl.c
===================================================================
--- branches/PR-6424345/launchd/src/launchctl.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchctl.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -113,6 +113,9 @@
 };
 
 static void myCFDictionaryApplyFunction(const void *key, const void *value, void *context);
+static CFTypeRef CFTypeCreateFromLaunchData(launch_data_t obj);
+static CFArrayRef CFArrayCreateFromLaunchArray(launch_data_t arr);
+static CFDictionaryRef CFDictionaryCreateFromLaunchDictionary(launch_data_t dict);
 static bool launch_data_array_append(launch_data_t a, launch_data_t o);
 static void distill_jobs(launch_data_t);
 static void distill_config_file(launch_data_t);
@@ -121,6 +124,7 @@
 static launch_data_t CF2launch_data(CFTypeRef);
 static launch_data_t read_plist_file(const char *file, bool editondisk, bool load);
 static CFPropertyListRef CreateMyPropertyListFromFile(const char *);
+static CFPropertyListRef CFPropertyListCreateFromFile(CFURLRef plistURL);
 static void WriteMyPropertyListToFile(CFPropertyListRef, const char *);
 static bool path_goodness_check(const char *path, bool forceload);
 static void readpath(const char *, struct load_unload_state *);
@@ -163,9 +167,11 @@
 static void do_single_user_mode(bool);
 static bool do_single_user_mode2(void);
 static void read_launchd_conf(void);
+static void read_environment_dot_plist(void);
 static bool job_disabled_logic(launch_data_t obj);
 static void fix_bogus_file_metadata(void);
 static void do_file_init(void) __attribute__((constructor));
+static void setup_system_context(void);
 
 typedef enum {
 	BOOTCACHE_START = 1,
@@ -185,6 +191,7 @@
 static int setenv_cmd(int argc, char *const argv[]);
 static int unsetenv_cmd(int argc, char *const argv[]);
 static int getenv_and_export_cmd(int argc, char *const argv[]);
+static int wait4debugger_cmd(int argc, char *const argv[]);
 
 static int limit_cmd(int argc, char *const argv[]);
 static int stdio_cmd(int argc, char *const argv[]);
@@ -197,7 +204,8 @@
 static int bslist_cmd(int argc, char *const argv[]);
 static int _bstree_cmd(mach_port_t bsport, unsigned int depth);
 static int bstree_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
-
+static int managerpid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
+static int manageruid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
 static int exit_cmd(int argc, char *const argv[]) __attribute__((noreturn));
 static int help_cmd(int argc, char *const argv[]);
 
@@ -206,39 +214,44 @@
 	int (*func)(int argc, char *const argv[]);
 	const char *desc;
 } cmds[] = {
-	{ "load",	load_and_unload_cmd,	"Load configuration files and/or directories" },
-	{ "unload",	load_and_unload_cmd,	"Unload configuration files and/or directories" },
-//	{ "reload",	reload_cmd,		"Reload configuration files and/or directories" },
-	{ "start",	start_stop_remove_cmd,	"Start specified job" },
-	{ "stop",	start_stop_remove_cmd,	"Stop specified job" },
-	{ "submit",	submit_cmd,		"Submit a job from the command line" },
-	{ "remove",	start_stop_remove_cmd,	"Remove specified job" },
-	{ "bootstrap",	bootstrap_cmd,		"Bootstrap launchd" },
-	{ "list",	list_cmd,		"List jobs and information about jobs" },
-	{ "setenv",	setenv_cmd,		"Set an environmental variable in launchd" },
-	{ "unsetenv",	unsetenv_cmd,		"Unset an environmental variable in launchd" },
-	{ "getenv",	getenv_and_export_cmd,	"Get an environmental variable from launchd" },
-	{ "export",	getenv_and_export_cmd,	"Export shell settings from launchd" },
-	{ "limit",	limit_cmd,		"View and adjust launchd resource limits" },
-	{ "stdout",	stdio_cmd,		"Redirect launchd's standard out to the given path" },
-	{ "stderr",	stdio_cmd,		"Redirect launchd's standard error to the given path" },
-	{ "shutdown",	fyi_cmd,		"Prepare for system shutdown" },
-	{ "singleuser",	fyi_cmd,		"Switch to single-user mode" },
-	{ "getrusage",	getrusage_cmd,		"Get resource usage statistics from launchd" },
-	{ "log",	logupdate_cmd,		"Adjust the logging level or mask of launchd" },
-	{ "umask",	umask_cmd,		"Change launchd's umask" },
-	{ "bsexec",	bsexec_cmd,		"Execute a process within a different Mach bootstrap subset" },
-	{ "bslist",	bslist_cmd,		"List Mach bootstrap services and optional servers" },
-	{ "bstree",	bstree_cmd,		"Show the entire Mach bootstrap tree. Requires root privileges." },
-	{ "exit",	exit_cmd,		"Exit the interactive invocation of launchctl" },
-	{ "quit",	exit_cmd,		"Quit the interactive invocation of launchctl" },
-	{ "help",	help_cmd,		"This help output" },
+	{ "load",		load_and_unload_cmd,	"Load configuration files and/or directories" },
+	{ "unload",		load_and_unload_cmd,	"Unload configuration files and/or directories" },
+//	{ "reload",		reload_cmd,				"Reload configuration files and/or directories" },
+	{ "start",		start_stop_remove_cmd,	"Start specified job" },
+	{ "stop",		start_stop_remove_cmd,	"Stop specified job" },
+	{ "submit",		submit_cmd,				"Submit a job from the command line" },
+	{ "remove",		start_stop_remove_cmd,	"Remove specified job" },
+	{ "bootstrap",	bootstrap_cmd,			"Bootstrap launchd" },
+	{ "list",		list_cmd,				"List jobs and information about jobs" },
+	{ "setenv",		setenv_cmd,				"Set an environmental variable in launchd" },
+	{ "unsetenv",	unsetenv_cmd,			"Unset an environmental variable in launchd" },
+	{ "getenv",		getenv_and_export_cmd,	"Get an environmental variable from launchd" },
+	{ "export",		getenv_and_export_cmd,	"Export shell settings from launchd" },
+	{ "debug",		wait4debugger_cmd,		"Set the WaitForDebugger flag for the target job to true." },
+	{ "limit",		limit_cmd,				"View and adjust launchd resource limits" },
+	{ "stdout",		stdio_cmd,				"Redirect launchd's standard out to the given path" },
+	{ "stderr",		stdio_cmd,				"Redirect launchd's standard error to the given path" },
+	{ "shutdown",	fyi_cmd,				"Prepare for system shutdown" },
+	{ "singleuser",	fyi_cmd,				"Switch to single-user mode" },
+	{ "getrusage",	getrusage_cmd,			"Get resource usage statistics from launchd" },
+	{ "log",		logupdate_cmd,			"Adjust the logging level or mask of launchd" },
+	{ "umask",		umask_cmd,				"Change launchd's umask" },
+	{ "bsexec",		bsexec_cmd,				"Execute a process within a different Mach bootstrap subset" },
+	{ "bslist",		bslist_cmd,				"List Mach bootstrap services and optional servers" },
+	{ "bstree",		bstree_cmd,				"Show the entire Mach bootstrap tree. Requires root privileges." },
+	{ "managerpid",	managerpid_cmd,			"Print the PID of the launchd managing this Mach bootstrap." },
+	{ "manageruid",	manageruid_cmd,			"Print the UID of the launchd managing this Mach bootstrap." },
+	{ "exit",		exit_cmd,				"Exit the interactive invocation of launchctl" },
+	{ "quit",		exit_cmd,				"Quit the interactive invocation of launchctl" },
+	{ "help",		help_cmd,				"This help output" },
 };
 
 static bool istty;
 static bool verbose;
 static bool is_managed;
 static bool do_apple_internal_magic;
+static bool system_context;
+static bool rootuser_context;
 
 int
 main(int argc, char *const argv[])
@@ -249,18 +262,10 @@
 	if (vproc_swap_integer(NULL, VPROC_GSK_IS_MANAGED, NULL, &is_managed_val) == NULL && is_managed_val) {
 		is_managed = true;
 	}
-
-	if (getuid() == 0 && !is_managed) {
-		mach_port_t root_bs = str2bsport("/");
-		task_set_bootstrap_port(mach_task_self(), root_bs);
-		mach_port_deallocate(mach_task_self(), bootstrap_port);
-		bootstrap_port = root_bs;
-	}
-
+	
 	istty = isatty(STDIN_FILENO);
-
 	argc--, argv++;
-
+	
 	if (argc > 0 && argv[0][0] == '-') {
 		char *flago;
 
@@ -269,6 +274,22 @@
 			case 'v':
 				verbose = true;
 				break;
+			case 'u':
+				if( argc > 1 ) {
+					if( strncmp(argv[1], "root", sizeof("root")) == 0 ) {
+						rootuser_context = true;
+					} else {
+						fprintf(stderr, "Unknown user: %s\n", argv[1]);
+						exit(EXIT_FAILURE);
+					}
+					argc--, argv++;
+				} else {
+					fprintf(stderr, "-u option requires an argument. Currently, only \"root\" is supported.\n");
+				}
+				break;
+			case '1':
+				system_context = true;
+				break;
 			default:
 				fprintf(stderr, "Unknown argument: '-%c'\n", *flago);
 				break;
@@ -277,6 +298,38 @@
 		argc--, argv++;
 	}
 
+	/* Running in the context of the root user's per-user launchd is only supported ... well
+	 * in the root user's per-user context. I know it's confusing. I'm genuinely sorry.
+	 */
+	if( rootuser_context ) {
+		int64_t manager_uid = -1, manager_pid = -1;
+		if( vproc_swap_integer(NULL, VPROC_GSK_MGR_UID, NULL, &manager_uid) == NULL ) {
+			if( vproc_swap_integer(NULL, VPROC_GSK_MGR_PID, NULL, &manager_pid) == NULL ) {
+				if( manager_uid || manager_uid == 1 ) {
+					fprintf(stderr, "Running in the root user's per-user context is not supported outside of the root user's bootstrap.\n");
+					exit(EXIT_FAILURE);
+				}
+			}
+		}
+	} else if( !(system_context || rootuser_context) ) {
+		/* Running in the system context is implied when we're running as root and not running as a bootstrapper. */
+		system_context = ( !is_managed && getuid() == 0 );
+	}
+
+	if( system_context ) {
+		if( getuid() == 0 ) {
+			setup_system_context();
+		} else {
+			fprintf(stderr, "You must be root to run in the system context.\n");
+			exit(EXIT_FAILURE);
+		}
+	} else if( rootuser_context ) {
+		if( getuid() != 0 ) {
+			fprintf(stderr, "You must be root to run in the root user context.\n");
+			exit(EXIT_FAILURE);
+		}
+	}
+
 	if (NULL == readline) {
 		fprintf(stderr, "missing library: readline\n");
 		exit(EXIT_FAILURE);
@@ -320,7 +373,7 @@
 
 	optind = 1;
 	optreset = 1;
-
+	
 	for (i = 0; i < (sizeof cmds / sizeof cmds[0]); i++) {
 		if (!strcmp(cmds[i].name, argv[0])) {
 			return cmds[i].func(argc, argv);
@@ -372,6 +425,96 @@
 	fclose(f);
 }
 
+CFPropertyListRef CFPropertyListCreateFromFile(CFURLRef plistURL)
+{	
+	CFReadStreamRef plistReadStream = CFReadStreamCreateWithFile(NULL, plistURL);
+	
+	CFErrorRef streamErr = NULL;
+	if( !CFReadStreamOpen(plistReadStream) ) {
+		streamErr = CFReadStreamCopyError(plistReadStream);
+		CFStringRef errString = CFErrorCopyDescription(streamErr);
+		
+		CFShow(errString);
+		
+		CFRelease(errString);
+		CFRelease(streamErr);
+	}
+	
+	CFPropertyListRef plist = NULL;
+	if( plistReadStream ) {
+		CFStringRef errString = NULL;
+		CFPropertyListFormat plistFormat = 0;
+		plist = CFPropertyListCreateFromStream(NULL, plistReadStream, 0, kCFPropertyListImmutable, &plistFormat, &errString);
+		if( !plist ) {
+			CFShow(errString);
+			CFRelease(errString);
+		}
+	}
+	
+	CFReadStreamClose(plistReadStream);
+	CFRelease(plistReadStream);
+	
+	return plist;
+}
+
+#define CFReleaseIfNotNULL(cf) if( cf ) CFRelease(cf);
+void
+read_environment_dot_plist(void)
+{
+	CFStringRef plistPath = NULL;
+	CFURLRef plistURL = NULL;
+	CFDictionaryRef envPlist = NULL;
+	launch_data_t req = NULL, launch_env_dict = NULL, resp = NULL;
+	
+	plistPath = CFStringCreateWithFormat(NULL, NULL, CFSTR("%s/.MacOSX/environment.plist"), getenv("HOME"));
+	if( !assumes(plistPath != NULL) ) {
+		goto out;
+	}
+	
+	plistURL = CFURLCreateWithFileSystemPath(NULL, plistPath, kCFURLPOSIXPathStyle, false);
+	if( !assumes(plistURL != NULL) ) {
+		goto out;
+	}
+	
+	envPlist = (CFDictionaryRef)CFPropertyListCreateFromFile(plistURL);
+	if( !assumes(envPlist != NULL) ) {
+		goto out;
+	}
+	
+	launch_env_dict = CF2launch_data(envPlist);
+	if( !assumes(launch_env_dict != NULL) ) {
+		goto out;
+	}
+	
+	req = launch_data_alloc(LAUNCH_DATA_DICTIONARY);
+	if( !assumes(req != NULL) ) {
+		goto out;
+	}
+	
+	launch_data_dict_insert(req, launch_env_dict, LAUNCH_KEY_SETUSERENVIRONMENT);
+	resp = launch_msg(req);
+	if( !assumes(resp != NULL) ) {
+		goto out;
+	}
+	
+	if( !assumes(launch_data_get_type(resp) == LAUNCH_DATA_ERRNO) ) {
+		goto out;
+	}
+
+	assumes(launch_data_get_errno(resp) == 0);
+out:
+	CFReleaseIfNotNULL(plistPath);
+	CFReleaseIfNotNULL(plistURL);
+	CFReleaseIfNotNULL(envPlist);	
+	if( req ) {
+		launch_data_free(req);
+	}
+	
+	if( resp ) {
+		launch_data_free(resp);
+	}
+}
+
 int
 unsetenv_cmd(int argc, char *const argv[])
 {
@@ -486,6 +629,37 @@
 	return 0;
 }
 
+int
+wait4debugger_cmd(int argc, char * const argv[])
+{
+	if( argc != 3 ) {
+		fprintf(stderr, "%s usage: debug <label> <value>\n", argv[0]);
+		return 1;
+	}
+	
+	int result = 1;
+	int64_t inval = 0;
+	if( strncmp(argv[2], "true", sizeof("true")) == 0 ) {
+		inval = 1;
+	} else if( strncmp(argv[2], "false", sizeof("false")) != 0 ) {
+		inval = atoi(argv[2]);
+		inval &= 1;
+	}
+	
+	vproc_t vp = vprocmgr_lookup_vproc(argv[1]);
+	if( vp ) {
+		vproc_err_t verr = vproc_swap_integer(vp, VPROC_GSK_WAITFORDEBUGGER, &inval, NULL);
+		if( verr ) {
+			fprintf(stderr, "Failed to set WaitForDebugger flag on %s.\n", argv[1]);
+		} else {
+			result = 0;
+		}
+		vproc_release(vp);
+	}
+	
+	return result;
+}
+
 void
 unloadjob(launch_data_t job)
 {
@@ -1229,6 +1403,149 @@
 	}
 }
 
+static inline Boolean __is_launch_data_t(launch_data_t obj) 
+{
+	Boolean result = true;
+	
+	switch( launch_data_get_type(obj) ) {
+		case LAUNCH_DATA_STRING		: break;
+		case LAUNCH_DATA_INTEGER	: break;
+		case LAUNCH_DATA_REAL		: break;
+		case LAUNCH_DATA_BOOL		: break;
+		case LAUNCH_DATA_ARRAY		: break;
+		case LAUNCH_DATA_DICTIONARY	: break;
+		case LAUNCH_DATA_FD 		: break;
+		case LAUNCH_DATA_MACHPORT	: break;
+		default						: result = false;
+	}
+	
+	return result;
+}
+
+static void __launch_data_iterate(launch_data_t obj, const char *key, CFMutableDictionaryRef dict)
+{
+	if( obj && __is_launch_data_t(obj) ) {
+		CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingUTF8);
+		CFTypeRef cfVal = CFTypeCreateFromLaunchData(obj);
+		
+		if( cfVal ) {
+			CFDictionarySetValue(dict, cfKey, cfVal);
+			CFRelease(cfVal);
+		}
+		CFRelease(cfKey);
+	}
+}
+
+static CFTypeRef CFTypeCreateFromLaunchData(launch_data_t obj)
+{
+	CFTypeRef cfObj = NULL;
+	
+	switch( launch_data_get_type(obj) ) {
+		case LAUNCH_DATA_STRING			:
+		{
+			const char *str = launch_data_get_string(obj);			
+			cfObj = CFStringCreateWithCString(NULL, str, kCFStringEncodingUTF8);
+			
+			break;
+		}			
+		case LAUNCH_DATA_INTEGER		:
+		{
+			long long integer = launch_data_get_integer(obj);
+			cfObj = CFNumberCreate(NULL, kCFNumberLongLongType, &integer);
+			
+			break;
+		}
+		case LAUNCH_DATA_REAL			:
+		{
+			double real = launch_data_get_real(obj);
+			cfObj = CFNumberCreate(NULL, kCFNumberDoubleType, &real);
+			
+			break;
+		}
+		case LAUNCH_DATA_BOOL			:
+		{
+			bool yesno = launch_data_get_bool(obj);
+			cfObj = yesno ? kCFBooleanTrue : kCFBooleanFalse;
+			
+			break;
+		}
+		case LAUNCH_DATA_ARRAY			:
+		{
+			cfObj = (CFTypeRef)CFArrayCreateFromLaunchArray(obj);
+			
+			break;
+		}
+		case LAUNCH_DATA_DICTIONARY		:
+		{
+			cfObj = (CFTypeRef)CFDictionaryCreateFromLaunchDictionary(obj);
+			
+			break;
+		}
+		case LAUNCH_DATA_FD				:
+		{
+			int fd = launch_data_get_fd(obj);
+			cfObj = CFNumberCreate(NULL, kCFNumberIntType, &fd);
+			
+			break;
+		}
+		case LAUNCH_DATA_MACHPORT		:
+		{
+			mach_port_t port = launch_data_get_machport(obj);
+			cfObj = CFNumberCreate(NULL, kCFNumberIntType, &port);
+			
+			break;
+		}
+		default							: break;
+	}
+	
+	return cfObj;
+}
+
+#pragma mark CFArray
+CFArrayRef CFArrayCreateFromLaunchArray(launch_data_t arr)
+{
+	CFArrayRef result = NULL;	
+	CFMutableArrayRef mutResult = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+	
+	if( launch_data_get_type(arr) == LAUNCH_DATA_ARRAY ) {
+		unsigned int count = launch_data_array_get_count(arr);
+		unsigned int i = 0;
+		
+		for( i = 0; i < count; i++ ) {
+			launch_data_t launch_obj = launch_data_array_get_index(arr, i);
+			CFTypeRef obj = CFTypeCreateFromLaunchData(launch_obj);
+			
+			if( obj ) {
+				CFArrayAppendValue(mutResult, obj);
+				CFRelease(obj);
+			}
+		}
+		
+		result = CFArrayCreateCopy(NULL, mutResult);
+		
+		CFRelease(mutResult);
+	}
+	
+	return result;
+}
+
+#pragma mark CFDictionary / CFPropertyList
+static CFDictionaryRef CFDictionaryCreateFromLaunchDictionary(launch_data_t dict)
+{
+	CFDictionaryRef result = NULL;
+	
+	if( launch_data_get_type(dict) == LAUNCH_DATA_DICTIONARY ) {
+		CFMutableDictionaryRef mutResult = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+		
+		launch_data_dict_iterate(dict, (void (*)(launch_data_t, const char *, void *))__launch_data_iterate, mutResult);
+		
+		result = CFDictionaryCreateCopy(NULL, mutResult);
+		CFRelease(mutResult);	
+	}
+	
+	return result;
+}
+
 void
 myCFDictionaryApplyFunction(const void *key, const void *value, void *context)
 {
@@ -1495,6 +1812,26 @@
 		assumes(fwexec(rccleanup_tool, NULL) != -1);
 	}
 
+	if( path_check("/etc/rc.deferredinstall") ) {
+		int status = 0;
+		const char *deferredinstall_tool[] = { _PATH_BSHELL, "/etc/rc.deferredinstall", NULL };
+		if( assumes(fwexec(deferredinstall_tool, &status) != -1) ) {
+			if( WEXITSTATUS(status) == EXIT_SUCCESS ) {
+				if( do_apple_internal_magic ) {
+					fprintf(stdout, "Deferred install script completed successfully. Rebooting in 3 seconds...\n");
+					sleep(3);
+				}
+				
+				assumes(remove(deferredinstall_tool[1]) != -1);
+				assumes(reboot(RB_AUTOBOOT) != -1);
+				exit(EXIT_FAILURE);
+			} else {
+				fprintf(stdout, "Deferred install script exited with status %i. Continuing boot and hoping it'll work...\n", WEXITSTATUS(status));
+				assumes(remove(deferredinstall_tool[1]) != -1);
+			}
+		}
+	}
+	
 	empty_dir(_PATH_VARRUN, NULL);
 	empty_dir(_PATH_TMP, NULL);
 	remove(_PATH_NOLOGIN);
@@ -1505,7 +1842,9 @@
 	}
 
 	assumes(touch_file(_PATH_UTMPX, DEFFILEMODE) != -1);
+#if !TARGET_OS_EMBEDDED
 	assumes(touch_file(_PATH_VARRUN "/.systemStarterRunning", DEFFILEMODE) != -1);
+#endif
 
 #if HAVE_LIBAUDITD
 	/*
@@ -1528,17 +1867,20 @@
 
 	_vproc_set_global_on_demand(true);
 
-	char *load_launchd_items[] = { "load", "-D", "all", "/etc/mach_init.d",
-#if TARGET_OS_EMBEDDED
-		"/var/mobile/Library/LaunchAgents",
+	
+#if !TARGET_OS_EMBEDDED
+	char *load_launchd_items[] = { "load", "-D", "all", "/etc/mach_init.d", NULL };
+	int load_launchd_items_cnt = 4;
+#else
+	char *load_launchd_items[] = { "load", "-D", "all", "/etc/mach_init.d",	"/var/mobile/Library/LaunchAgents", NULL };
+	int load_launchd_items_cnt = 5;
 #endif
-		NULL };
 
 	if (is_safeboot()) {
 		load_launchd_items[2] = "system";
 	}
 
-	assumes(load_and_unload_cmd(4, load_launchd_items) == 0);
+	assumes(load_and_unload_cmd(load_launchd_items_cnt, load_launchd_items) == 0);
 
 	/*
 	 * 5066316
@@ -1668,7 +2010,7 @@
 		if (is_safeboot()) {
 			load_launchd_items[4] = "system";
 		}
-
+		
 		if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0 || strcasecmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
 			load_launchd_items[4] = "system";
 			if (!is_safeboot()) {
@@ -1708,6 +2050,18 @@
 			 * agents.
 			 */
 			the_argc_user = 5;
+			
+			/* We want to read environment.plist, which is in the user's home directory.
+			 * Since the dance to mount a network home directory is fairly complex, all we
+			 * can do is try and read environment.plist when bootstrapping the Aqua session,
+			 * which is when we assume the home directory is present.
+			 *
+			 * The drawback here is that jobs bootstrapped in the Background session won't
+			 * get the new environment until they quit and relaunch. But then again, they 
+			 * won't get the updated HOME directory or anything either. This is just a messy
+			 * problem.
+			 */
+			read_environment_dot_plist();
 		} else if (strcasecmp(session_type, VPROCMGR_SESSION_AQUA) == 0) {
 			/* If we're bootstrapping the StandardIO session, bootstrap the user's Background
 			 * agents.
@@ -2115,39 +2469,68 @@
 int
 list_cmd(int argc, char *const argv[])
 {
-	launch_data_t resp, msg;
+	launch_data_t resp, msg = NULL;
 	int r = 0;
 
-	if (argc > 2) {
-		fprintf(stderr, "usage: %s list [label]\n", getprogname());
+	bool plist_output = false;
+	char *label = NULL;	
+	if (argc > 3) {
+		fprintf(stderr, "usage: %s list [-x] [label]\n", getprogname());
 		return 1;
-	} else if (argc == 2) {
+	} else if( argc >= 2 ) {
+		plist_output = ( strncmp(argv[1], "-x", sizeof("-x")) == 0 );
+		label = plist_output ? argv[2] : argv[1];
+	}
+	
+	if( label ) {
 		msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY);
-		launch_data_dict_insert(msg, launch_data_new_string(argv[1]), LAUNCH_KEY_GETJOB);
-	} else if (vproc_swap_complex(NULL, VPROC_GSK_ALLJOBS, NULL, &resp) == NULL) {
+		launch_data_dict_insert(msg, launch_data_new_string(label), LAUNCH_KEY_GETJOB);
+		
+		resp = launch_msg(msg);
+		launch_data_free(msg);
+		
+		if (resp == NULL) {
+			fprintf(stderr, "launch_msg(): %s\n", strerror(errno));
+			r = 1;
+		} else if (launch_data_get_type(resp) == LAUNCH_DATA_DICTIONARY) {
+			if( plist_output ) {
+				CFDictionaryRef respDict = CFDictionaryCreateFromLaunchDictionary(resp);
+				CFStringRef plistStr = NULL;
+				if( respDict ) {
+					CFDataRef plistData = CFPropertyListCreateXMLData(NULL, (CFPropertyListRef)respDict);
+					CFRelease(respDict);
+					if( plistData ) {
+						plistStr = CFStringCreateWithBytes(NULL, CFDataGetBytePtr(plistData), CFDataGetLength(plistData), kCFStringEncodingUTF8, false);
+						CFRelease(plistData);
+					} else {
+						r = 1;
+					}
+				} else {
+					r = 1;
+				}
+				
+				if( plistStr ) {
+					CFShow(plistStr);
+					r = 0;
+				}
+			} else {
+				print_obj(resp, NULL, NULL);
+				r = 0;
+			}
+		} else {
+			fprintf(stderr, "%s %s returned unknown response\n", getprogname(), argv[0]);
+			r = 1;
+		}
+		
+		launch_data_free(resp);
+	} else if( vproc_swap_complex(NULL, VPROC_GSK_ALLJOBS, NULL, &resp) == NULL ) {
 		fprintf(stdout, "PID\tStatus\tLabel\n");
 		launch_data_dict_iterate(resp, print_jobs, NULL);
 		launch_data_free(resp);
-		return 0;
-	} else {
-		return 1;
+		
+		r = 0;
 	}
 
-	resp = launch_msg(msg);
-	launch_data_free(msg);
-
-	if (resp == NULL) {
-		fprintf(stderr, "launch_msg(): %s\n", strerror(errno));
-		return 1;
-	} else if (launch_data_get_type(resp) == LAUNCH_DATA_DICTIONARY) {
-		print_obj(resp, NULL, NULL);
-	} else {
-		fprintf(stderr, "%s %s returned unknown response\n", getprogname(), argv[0]);
-		r = 1;
-	}
-
-	launch_data_free(resp);
-
 	return r;
 }
 
@@ -2494,6 +2877,24 @@
 	}
 }
 
+void
+setup_system_context(void)
+{
+	if( geteuid() != 0 ) {
+		fprintf(stderr, "You must be the root user to perform this operation.\n");
+		return;
+	}
+	
+	/* Use the system launchd's socket. */
+	setenv("__USE_SYSTEM_LAUNCHD", "1", 0);
+	
+	/* Put ourselves in the system launchd's bootstrap. */
+	mach_port_t rootbs = str2bsport("/");
+	mach_port_deallocate(mach_task_self(), bootstrap_port);
+	task_set_bootstrap_port(mach_task_self(), rootbs);
+	bootstrap_port = rootbs;
+}
+
 int
 submit_cmd(int argc, char *const argv[])
 {
@@ -2720,7 +3121,7 @@
 		return 1;
 	}
 	
-	#define bport_state(x)	(((x) == BOOTSTRAP_STATUS_ACTIVE) ? "A" : ((x) == BOOTSTRAP_STATUS_ON_DEMAND) ? "D" : "I")
+#define bport_state(x)	(((x) == BOOTSTRAP_STATUS_ACTIVE) ? "A" : ((x) == BOOTSTRAP_STATUS_ON_DEMAND) ? "D" : "I")
 	
 	for (i = 0; i < service_cnt ; i++) {
 		fprintf(stdout, "%*s%-3s%s\n", depth, "", bport_state((service_actives[i])), service_names[i]);
@@ -2796,6 +3197,34 @@
 	return _bstree_cmd(str2bsport("/"), 4);
 }
 
+int
+managerpid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)))
+{
+	int64_t manager_pid = 0;
+	vproc_err_t verr = vproc_swap_integer(NULL, VPROC_GSK_MGR_PID, NULL, (int64_t *)&manager_pid);
+	if( verr ) {
+		fprintf(stdout, "Unknown job manager!\n");
+		return 1;
+	}
+	
+	fprintf(stdout, "%d\n", (pid_t)manager_pid);
+	return 0;
+}
+
+int
+manageruid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)))
+{
+	int64_t manager_uid = 0;
+	vproc_err_t verr = vproc_swap_integer(NULL, VPROC_GSK_MGR_UID, NULL, (int64_t *)&manager_uid);
+	if( verr ) {
+		fprintf(stdout, "Unknown job manager!\n");
+		return 1;
+	}
+	
+	fprintf(stdout, "%lli\n", manager_uid);
+	return 0;
+}
+
 bool
 is_legacy_mach_job(launch_data_t obj)
 {
@@ -2950,7 +3379,7 @@
 			goto out;
 		}
 #endif
-		fprintf(stderr, "Running fsck on the boot volume...\n");
+		fprintf(stdout, "Running fsck on the boot volume...\n");
 		if (fwexec(fsck_tool, NULL) != -1) {
 			goto out;
 		}
@@ -2960,7 +3389,7 @@
 		goto out;
 	}
 
-	fprintf(stderr, "fsck failed!\n");
+	fprintf(stdout, "fsck failed!\n");
 
 	/* someday, we should keep booting read-only, but as of today, other sub-systems cannot handle that scenario */
 	assumes(reboot(RB_HALT) != -1);
@@ -2979,7 +3408,7 @@
 #if TARGET_OS_EMBEDDED
 	if (path_check("/etc/fstab")) {
 		const char *mount_tool[] = { "mount", "-vat", "nonfs", NULL };
-		assumes(fwexec(mount_tool, true) != -1);
+		assumes(fwexec(mount_tool, NULL) != -1);
 	} else
 #endif
 	{
@@ -2998,10 +3427,12 @@
 		const gid_t group;
 		const mode_t needed_bits;
 		const mode_t bad_bits;
+		const bool create;
 	} f[] = {
-		{ "/sbin/launchd", 0, 0, S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, S_ISUID|S_ISGID|S_ISVTX|S_IWOTH },
-		{ _PATH_TMP, 0, 0, S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO, S_ISUID|S_ISGID },
-		{ _PATH_VARTMP, 0, 0, S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO, S_ISUID|S_ISGID },
+		{ "/sbin/launchd", 0, 0, S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH, S_ISUID|S_ISGID|S_ISVTX|S_IWOTH, false },
+		{ _PATH_TMP, 0, 0, S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO, S_ISUID|S_ISGID, true },
+		{ _PATH_VARTMP, 0, 0, S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO, S_ISUID|S_ISGID, true },
+		{ "/var/folders", 0, 0, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH, S_ISUID | S_ISGID, true },
 	};
 	struct stat sb;
 	size_t i;
@@ -3013,7 +3444,16 @@
 		bool fix_id = false;
 
 		if (!assumes(stat(f[i].path, &sb) != -1)) {
-			continue;
+			fprintf(stdout, "Crucial filesystem check: Path not present: %s. %s\n", f[i].path, f[i].create ? "Will create." : "");
+			if( f[i].create ) {
+				if( !assumes(mkdir(f[i].path, f[i].needed_bits) != -1) ) {
+					continue;
+				} else if( !assumes(stat(f[i].path, &sb) != -1) ) {
+					continue;
+				}
+			} else {
+				continue;
+			}
 		}
 
 		i_needed_bits = ~sb.st_mode & f[i].needed_bits;

Modified: branches/PR-6424345/launchd/src/launchd.c
===================================================================
--- branches/PR-6424345/launchd/src/launchd.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -179,15 +179,13 @@
 		ipc_server_init();
 		
 		runtime_log_push();
-
-		int64_t now = runtime_get_wall_time();
 		
 		struct passwd *pwent = getpwuid(getuid());
 		if( pwent ) {
 			strlcpy(g_username, pwent->pw_name, sizeof(g_username) - 1);
 		}
 		
-		runtime_syslog(LOG_NOTICE, "Per-user launchd for UID %u (%s) began at: %lld.%06llu", getuid(), g_username, now / USEC_PER_SEC, now % USEC_PER_SEC);
+		runtime_syslog(LOG_DEBUG, "Per-user launchd for UID %u (%s) has begun.", getuid(), g_username);
 	}
 
 	if( pid1_magic ) {
@@ -197,6 +195,8 @@
 		if( stat("/var/db/.launchd_flat_per_user_namespace", &sb) == 0 ) {
 			runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "Flat per-user Mach namespaces enabled.");
 		}
+		/* We just wanted to print status about the per-user namespace. PID 1 doesn't have a flat namespace. */
+		g_flat_mach_namespace = false;
 	}
 
 	monitor_networking_state();
@@ -204,9 +204,11 @@
 	if (pid1_magic) {
 		handle_pid1_crashes_separately();
 	} else {
+	#if !TARGET_OS_EMBEDDED
 		/* prime shared memory before the 'bootstrap_port' global is set to zero */
 		_vproc_transaction_begin();
 		_vproc_transaction_end();
+	#endif
 	}
 
 	if( pid1_magic ) {
@@ -217,7 +219,7 @@
 	}
 
 	jobmgr_init(sflag);
-
+	
 	launchd_runtime_init2();
 
 	launchd_runtime();

Modified: branches/PR-6424345/launchd/src/launchd.plist.5
===================================================================
--- branches/PR-6424345/launchd/src/launchd.plist.5	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd.plist.5	2009-01-20 03:58:30 UTC (rev 23784)
@@ -279,8 +279,19 @@
 function.
 .It Sy NumberOfFiles <integer>
 The maximum number of open files for this process.
+Setting this value in a system wide daemon will set the 
+.Xr sysctl 3 
+kern.maxfiles (SoftResourceLimits) or kern.maxfilesperproc (HardResourceLimits) value in addition to the
+.Xr setrlimit 2
+values.
 .It Sy NumberOfProcesses <integer>
 The maximum number of simultaneous processes for this user id.
+Setting this value in a system wide daemon will set the 
+.Xr sysctl 3 
+kern.maxproc (SoftResourceLimits) or kern.maxprocperuid (HardResourceLimits) 
+value in addition to the
+.Xr setrlimit 2
+values.
 .It Sy ResidentSetSize <integer>
 The maximum size (in bytes) to which a process's resident set size may grow.
 This imposes a limit on the amount of physical memory to be given to a process;
@@ -451,5 +462,6 @@
 .Sh SEE ALSO 
 .Xr launchctl 1 ,
 .Xr launch 3 ,
+.Xr sysctl 3 ,
 .Xr launchd 8 ,
 .Xr plist 5

Modified: branches/PR-6424345/launchd/src/launchd_core_logic.c
===================================================================
--- branches/PR-6424345/launchd/src/launchd_core_logic.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd_core_logic.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -82,7 +82,21 @@
 #if HAVE_QUARANTINE
 #include <quarantine.h>
 #endif
+#if TARGET_OS_EMBEDDED
+#include <sys/kern_memorystatus.h>
+#else
+/* To make my life easier. */
+typedef struct jetsam_priority_entry {
+    pid_t pid;
+    uint32_t flags;
+} jetsam_priority_entry_t;
 
+enum {
+    kJetsamFlagsFrontmost = (1 << 0),
+    kJetsamFlagsKilled =    (1 << 1)
+};
+#endif
+
 #include "launch.h"
 #include "launch_priv.h"
 #include "launch_internal.h"
@@ -110,10 +124,11 @@
  *   If the job hasn't exited in the given number of seconds after sending
  *   it a SIGTERM, SIGKILL it. Can be overriden in the job plist.
  */
-#define LAUNCHD_MIN_JOB_RUN_TIME 10
-#define LAUNCHD_SAMPLE_TIMEOUT 1
-#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
-#define LAUNCHD_SIGKILL_TIMER 5
+#define LAUNCHD_MIN_JOB_RUN_TIME		10
+#define LAUNCHD_SAMPLE_TIMEOUT			1
+#define LAUNCHD_DEFAULT_EXIT_TIMEOUT	20
+#define LAUNCHD_SIGKILL_TIMER			5
+#define LAUNCHD_JETSAM_PRIORITY_UNSET	0xdead1eebabell
 
 #define SHUTDOWN_LOG_DIR "/var/log/shutdown"
 
@@ -230,6 +245,7 @@
 
 struct envitem {
 	SLIST_ENTRY(envitem) sle;
+	bool one_shot;
 	char *value;
 	union {
 		const char key[0];
@@ -237,9 +253,10 @@
 	};
 };
 
-static bool envitem_new(job_t j, const char *k, const char *v, bool global);
+static bool envitem_new(job_t j, const char *k, const char *v, bool global, bool one_shot);
 static void envitem_delete(job_t j, struct envitem *ei, bool global);
 static void envitem_setup(launch_data_t obj, const char *key, void *context);
+static void envitem_setup_one_shot(launch_data_t obj, const char *key, void *context);
 
 struct limititem {
 	SLIST_ENTRY(limititem) sle;
@@ -306,6 +323,7 @@
 	SLIST_ENTRY(jobmgr_s) sle;
 	SLIST_HEAD(, jobmgr_s) submgrs;
 	LIST_HEAD(, job_s) jobs;
+	LIST_HEAD(, job_s) jetsam_jobs;
 	LIST_HEAD(, job_s) active_jobs[ACTIVE_JOB_HASH_SIZE];
 	LIST_HEAD(, machservice) ms_hash[MACHSERVICE_HASH_SIZE];
 	LIST_HEAD(, job_s) global_env_jobs;
@@ -317,9 +335,8 @@
 	unsigned int global_on_demand_cnt;
 	unsigned int hopefully_first_cnt;
 	unsigned int normal_active_cnt;
-	unsigned int 	sent_stop_to_normal_jobs		:1, 
-					sent_stop_to_hopefully_last_jobs:1, 
-					shutting_down					:1, 
+	unsigned int jetsam_jobs_cnt;
+	unsigned int 	shutting_down					:1,
 					session_initialized				:1, 
 					killed_hopefully_first_jobs		:1,
 					killed_normal_jobs				:1,
@@ -338,16 +355,19 @@
 static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
 static job_t jobmgr_import2(jobmgr_t jm, launch_data_t pload);
 static jobmgr_t jobmgr_parent(jobmgr_t jm);
+static jobmgr_t jobmgr_do_hopefully_first_shutdown_phase(jobmgr_t jm);
+static jobmgr_t jobmgr_do_normal_shutdown_phase(jobmgr_t jm);
+static jobmgr_t jobmgr_do_hopefully_last_shutdown_phase(jobmgr_t jm);
 static jobmgr_t jobmgr_do_garbage_collection(jobmgr_t jm);
 static bool jobmgr_label_test(jobmgr_t jm, const char *str);
 static void jobmgr_reap_bulk(jobmgr_t jm, struct kevent *kev);
-static void jobmgr_log_stray_children(jobmgr_t jm);
+static void jobmgr_log_stray_children(jobmgr_t jm, bool kill_strays);
 static void jobmgr_kill_stray_child(jobmgr_t jm, pid_t p);
 static void jobmgr_remove(jobmgr_t jm, bool expect_real_jobs);
 static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack);
 static void jobmgr_dequeue_next_sample(jobmgr_t jm);
 static job_t jobmgr_init_session(jobmgr_t jm, const char *session_type, bool sflag);
-static job_t jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p);
+static job_t jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p, bool anon_okay);
 static job_t jobmgr_find_by_pid(jobmgr_t jm, pid_t p, bool create_anon);
 static jobmgr_t jobmgr_find_by_name(jobmgr_t jm, const char *where);
 static job_t job_mig_intran2(jobmgr_t jm, mach_port_t mport, pid_t upid);
@@ -364,8 +384,9 @@
 #define AUTO_PICK_LEGACY_LABEL (const char *)(~0)
 
 struct job_s {
-	kq_callback kqjob_callback; /* MUST be first element of this structure for benefit of launchd's run loop. */
-	LIST_ENTRY(job_s) sle;
+	kq_callback kqjob_callback;	/* MUST be first element of this structure for benefit of launchd's run loop. */
+	LIST_ENTRY(job_s) sle;								
+	LIST_ENTRY(job_s) jetsam_sle;
 	LIST_ENTRY(job_s) pid_hash_sle;
 	LIST_ENTRY(job_s) label_hash_sle;
 	LIST_ENTRY(job_s) global_env_sle;
@@ -384,7 +405,7 @@
 	cpu_type_t *j_binpref;
 	size_t j_binpref_cnt;
 	mach_port_t j_port;
-	mach_port_t wait_reply_port;	/* we probably should switch to a list of waiters */
+	mach_port_t wait_reply_port; /* we probably should switch to a list of waiters */
 	uid_t mach_uid;
 	jobmgr_t mgr;
 	size_t argc;
@@ -416,6 +437,7 @@
 	int log_redirect_fd;
 	int nice;
 	int stdout_err_fd;
+	long long jetsam_priority;
 	uint32_t timeout;
 	uint32_t exit_timeout;
 	uint64_t sent_signal_time;
@@ -449,6 +471,7 @@
 		    start_pending				:1,	/* an event fired and the job should start, but not necessarily right away */
 		    globargv					:1,	/* man launchd.plist --> EnableGlobbing */
 		    wait4debugger				:1,	/* man launchd.plist --> WaitForDebugger */
+			wait4debugger_oneshot		:1, /* One-shot WaitForDebugger. */
 		    internal_exc_handler		:1,	/* MachExceptionHandler == true */
 		    stall_before_exec			:1,	/* a hack to support an option of spawn_via_launchd() */
 		    only_once 					:1,	/* man launchd.plist --> LaunchOnlyOnce. Note: 5465184 Rename this to "HopefullyNeverExits" */
@@ -476,7 +499,9 @@
 			reap_after_sample			:1,	/* The job exited before sample did, so we should reap it after sample is done. */
 			nosy						:1, /* The job has an OtherJobEnabled KeepAlive criterion. */
 			crashed						:1, /* The job is the default Mach exception handler, and it crashed. */
-			reaped						:1; /* We've received NOTE_EXIT for the job. */
+			reaped						:1, /* We've received NOTE_EXIT for the job. */
+			stopped						:1, /* job_stop() was called. */
+			jetsam_frontmost			:1; /* The job is considered "frontmost" by Jetsam. */
 	mode_t mask;
 	pid_t sample_pid;
 	const char label[0];
@@ -568,8 +593,13 @@
 static size_t our_strhash(const char *s) __attribute__((pure));
 static void extract_rcsid_substr(const char *i, char *o, size_t osz);
 static void do_first_per_user_launchd_hack(void);
-static void do_unmounts(void);
+void eliminate_double_reboot(void);
 
+/* For Jetsam. */
+static void jetsam_priority_from_job(job_t j, bool front, jetsam_priority_entry_t *jp);
+static int job_cmp(const job_t *lhs, const job_t *rhs);
+int launchd_set_jetsam_priorities(launch_data_t priorities);
+
 /* file local globals */
 static size_t total_children;
 static size_t total_anon_children;
@@ -652,7 +682,8 @@
 	if (unlikely(!j->p || j->anonymous)) {
 		return;
 	}
-
+	
+#if !TARGET_OS_EMBEDDED
 	if (j->kill_via_shmem && !g_force_old_kill_path) {
 		if (j->shmem) {
 			if (!j->sent_kill_via_shmem) {
@@ -668,6 +699,7 @@
 	} else if( j->kill_via_shmem ) {
 		job_log(j, LOG_DEBUG, "Stopping transactional job the old-fashioned way.");
 	}
+#endif
 
 	j->sent_signal_time = runtime_get_opaque_time();
 
@@ -706,6 +738,8 @@
 
 		job_log(j, LOG_DEBUG, "Sent SIGTERM signal%s", extralog);
 	}
+	
+	j->stopped = true;
 }
 
 launch_data_t
@@ -863,88 +897,12 @@
 {
 	jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Still alive with %lu/%lu (normal/anonymous) children", total_children, total_anon_children);
 	jobmgr_log_active_jobs(jm);
-	
-	if( pid1_magic && jm == root_jobmgr ) {
-		/* Take the opportunity to shut the system down if it presents itself. */
-		if( total_children == 0 ) {
-			jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "No more non-anonymous children left. Shutting down the system.");
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, false);
-		}
-		
-		unsigned int unkilled_jobs = 0;
-		job_t ji = NULL;
-		char *type = NULL;
-		if( !jm->killed_hopefully_first_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( ji->hopefully_exits_first && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Hopefully First job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "hopefully first";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_hopefully_first_jobs = true;
-			}
-		} else if( !jm->killed_normal_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( !ji->hopefully_exits_first && !ji->hopefully_exits_last && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Normal job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "normal";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_normal_jobs = true;
-			}
-		} else if( !jm->killed_hopefully_last_jobs ) {
-			LIST_FOREACH( ji, &jm->jobs, sle ) {
-				if( ji->hopefully_exits_last && !ji->sent_sigkill && !ji->anonymous ) {
-					job_log(ji, LOG_DEBUG | LOG_CONSOLE, "Hopefully Last job has not yet been sent SIGKILL.");
-					unkilled_jobs++;
-				}
-			}
-
-			type = "hopefully last";
-			if( unkilled_jobs == 0 ) {
-				jm->killed_hopefully_last_jobs = true;
-			}
-		}
-
-		/* Our club-over-the-head solution to rdar://problem/5054857.
-		 * If all remaining jobs in the PID 1 launchd have been sent SIGKILL, wash our hands of them. This way,
-		 * unkillable processes don't hold up shutdown for customers. Disable this behavior for AppleInternal,
-		 * since we still want to catch kernel bugs and processes that don't properly terminate when receiving
-		 * SIGKILL. See jobmgr_do_garbage_collection() for the rest.
-		 */
-		if( unkilled_jobs == 0 && jm->killed_hopefully_last_jobs ) {
-			if( !do_apple_internal_logging ) {
-				jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1);
-				jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "All remaining non-anonymous jobs have died or been sent SIGKILL. Shutting down the system.");
-				jobmgr_log_stray_children(jm);
-				runtime_closelog(); /* hack to flush logs */
-				jobmgr_remove(jm, true);
-			} else {
-				jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "All remaining non-anonymous jobs have died or been sent SIGKILL. On a customer-facing system, we would call reboot() at this point.");
-			}
-		} else if( unkilled_jobs != 0 ) {
-			jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Still have %u %s non-anonymous job%s that %s not been sent SIGKILL.", unkilled_jobs, type, unkilled_jobs > 1 ? "s" : "", unkilled_jobs > 1 ? "have" : "has");
-		} else {
-			jobmgr_do_garbage_collection(jm);
-		}
-	}
-
-	runtime_closelog(); /* hack to flush logs */
 }
 
 jobmgr_t
 jobmgr_shutdown(jobmgr_t jm)
 {
 	jobmgr_t jmi, jmn;
-	job_t ji;
-
 	jobmgr_log(jm, LOG_DEBUG, "Beginning job manager shutdown with flags: %s", reboot_flags_to_C_names(jm->reboot_flags));
 
 	jm->shutting_down = true;
@@ -952,15 +910,7 @@
 	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
 		jobmgr_shutdown(jmi);
 	}
-
-	if (jm->hopefully_first_cnt) {
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (ji->p && ji->hopefully_exits_first) {
-				job_stop(ji);
-			}
-		}
-	}
-
+	
 	if (jm->parentmgr == NULL && pid1_magic) {
 		jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 5, jm));
 	}
@@ -982,11 +932,11 @@
 	}
 
 	while( (ji = LIST_FIRST(&jm->jobs)) ) {
-		if( !expect_real_jobs && !job_assumes(ji, ji->anonymous) ) {
+		if( !expect_real_jobs && ji->p && !job_assumes(ji, ji->anonymous) ) {
 			job_log(ji, LOG_WARNING | LOG_CONSOLE, "%s() called incorrectly with non-anonymous job still active. Forcing removal.", __func__);
 			job_remove(ji, true);
 		} else {
-			if( !ji->anonymous ) {
+			if( !ji->anonymous && ji->p ) {
 				job_log(ji, LOG_WARNING | LOG_CONSOLE, "Job has overstayed its welcome. Forcing removal.");
 				job_remove(ji, true);
 			} else {
@@ -1007,18 +957,14 @@
 		runtime_del_weak_ref();
 		SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
 	} else if (pid1_magic) {
-		jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "About to call: sync()");
-		sync(); /* We're are going to rely on log timestamps to benchmark this call */
-		jobmgr_log(jm, LOG_DEBUG | LOG_CONSOLE, "Unmounting all filesystems except / and /dev");
-		do_unmounts();
+		eliminate_double_reboot();
 		launchd_log_vm_stats();
+		jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "About to call: reboot(%s).", reboot_flags_to_C_names(jm->reboot_flags));
 		runtime_closelog();
-		jobmgr_log(root_jobmgr, LOG_NOTICE | LOG_CONSOLE, "About to call: reboot(%s).", reboot_flags_to_C_names(jm->reboot_flags));
 		jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1);
-		runtime_closelog();
 	} else {
+		jobmgr_log(jm, LOG_DEBUG, "About to exit");
 		runtime_closelog();
-		jobmgr_log(jm, LOG_DEBUG, "About to exit");
 		exit(EXIT_SUCCESS);
 	}
 	
@@ -1166,14 +1112,18 @@
 	if (j->poll_for_vfs_changes) {
 		job_assumes(j, kevent_mod((uintptr_t)&j->semaphores, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1);
 	}
-
 	if( j->exit_timeout ) {
 		/* Not a big deal if this fails. It means that the timer's already been freed. */
 		kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
 	}
-
+	if( j->jetsam_priority != LAUNCHD_JETSAM_PRIORITY_UNSET ) {
+		LIST_REMOVE(j, jetsam_sle);
+		j->mgr->jetsam_jobs_cnt--;
+	}
+	
 	kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
-
+	kevent_mod((uintptr_t)j, EVFILT_PROC, EV_DELETE, 0, 0, NULL);
+	
 	LIST_REMOVE(j, sle);
 	LIST_REMOVE(j, label_hash_sle);
 
@@ -1493,7 +1443,8 @@
 	j->currently_ignored = true;
 	j->ondemand = true;
 	j->checkedin = true;
-
+	j->jetsam_priority = LAUNCHD_JETSAM_PRIORITY_UNSET;
+	
 	if (prog) {
 		j->prog = strdup(prog);
 		if (!job_assumes(j, j->prog != NULL)) {
@@ -1832,6 +1783,15 @@
 			}
 		}
 		break;
+	case 'j':
+	case 'J':
+		if( strcasecmp(key, LAUNCH_JOBKEY_JETSAMPRIORITY) == 0 ) {
+			job_log(j, LOG_DEBUG, "Importing job with priority: %lld", value);
+			j->jetsam_priority = (typeof(j->jetsam_priority))value;
+			LIST_INSERT_HEAD(&j->mgr->jetsam_jobs, j, jetsam_sle);
+			j->mgr->jetsam_jobs_cnt++;
+		}
+		break;
 	case 'n':
 	case 'N':
 		if (strcasecmp(key, LAUNCH_JOBKEY_NICE) == 0) {
@@ -2275,18 +2235,18 @@
 
 /* Should try and consolidate with job_mig_intran2() and jobmgr_find_by_pid(). */
 job_t
-jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p)
+jobmgr_find_by_pid_deep(jobmgr_t jm, pid_t p, bool anon_okay)
 {
 	job_t ji = NULL;
 	LIST_FOREACH( ji, &jm->active_jobs[ACTIVE_JOB_HASH(p)], pid_hash_sle ) {
-		if (ji->p == p && !ji->anonymous) {
+		if (ji->p == p && (!ji->anonymous || (ji->anonymous && anon_okay)) ) {
 			return ji;
 		}
 	}
 
 	jobmgr_t jmi = NULL;
 	SLIST_FOREACH( jmi, &jm->submgrs, sle ) {
-		if( (ji = jobmgr_find_by_pid_deep(jmi, p)) ) {
+		if( (ji = jobmgr_find_by_pid_deep(jmi, p, anon_okay)) ) {
 			break;
 		}
 	}
@@ -2341,7 +2301,6 @@
 	struct ldcred *ldc = runtime_get_caller_creds();
 	job_t jr;
 
-
 	jr = job_mig_intran2(root_jobmgr, p, ldc->pid);
 
 	if (!jobmgr_assumes(root_jobmgr, jr != NULL)) {
@@ -2483,6 +2442,8 @@
 		job_mig_swap_integer(j, VPROC_GSK_WEIRD_BOOTSTRAP, 0, 0, &junk);
 	}
 
+	j->wait4debugger_oneshot = false;
+
 	if (j->log_redirect_fd && !j->legacy_LS_job) {
 		job_log_stdouterr(j); /* one last chance */
 
@@ -2567,7 +2528,7 @@
 		td_sec = td / NSEC_PER_SEC;
 		td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC;
 
-		job_log(j, LOG_NOTICE, "Exited %llu.%06llu seconds after the first signal was sent", td_sec, td_usec);
+		job_log(j, LOG_DEBUG, "Exited %llu.%06llu seconds after the first signal was sent", td_sec, td_usec);
 	}
 
 	timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime);
@@ -2593,7 +2554,7 @@
 
 	if (WIFSIGNALED(status)) {
 		int s = WTERMSIG(status);
-		if (SIGKILL == s || SIGTERM == s) {
+		if ((SIGKILL == s || SIGTERM == s) && !j->stopped) {
 			job_log(j, LOG_NOTICE, "Exited: %s", strsignal(s));
 		} else {
 			switch( s ) {
@@ -2629,6 +2590,13 @@
 		}
 	}
 	
+	struct envitem *ei = NULL, *et = NULL;
+	SLIST_FOREACH_SAFE( ei, &j->env, sle, et ) {
+		if( ei->one_shot ) {
+			SLIST_REMOVE(&j->env, ei, envitem, sle);
+		}
+	}
+	
 	if (j->hopefully_exits_first) {
 		j->mgr->hopefully_first_cnt--;
 	} else if (!j->anonymous && !j->hopefully_exits_last) {
@@ -2643,6 +2611,10 @@
 	j->lastlookup_gennum = 0;
 	j->p = 0;
 
+	if( !j->anonymous ) {
+		jobmgr_do_garbage_collection(j->mgr);
+	}
+
 	/*
 	 * We need to someday evaluate other jobs and find those who wish to track the
 	 * active/inactive state of this job. The current job_dispatch() logic makes
@@ -2895,7 +2867,7 @@
 	if (unlikely(rsz == 0)) {
 		job_log(j, LOG_DEBUG, "Standard out/error pipe closed");
 		close_log_redir = true;
-	} else if (!job_assumes(j, rsz != -1)) {
+	} else if (!job_assumes(j, rsz != -1 && errno != EAGAIN)) {
 		close_log_redir = true;
 	} else {
 		buf[rsz] = '\0';
@@ -3043,8 +3015,8 @@
 			struct kinfo_proc kp;
 			size_t len = sizeof(kp);
 
-			if (job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)
-					&& job_assumes(j, len == sizeof(kp))) {
+			/* Sometimes, the kernel says it succeeded but really didn't. */
+			if (job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1) && len == sizeof(kp)) {
 				char newlabel[1000];
 
 				snprintf(newlabel, sizeof(newlabel), "%p.%s", j, kp.kp_proc.p_comm);
@@ -3097,6 +3069,9 @@
 		j->start_pending = true;
 		job_dispatch(j, false);
 	} else if (&j->exit_timeout == ident) {
+		if( !job_assumes(j, j->p != 0) ) {
+			return;
+		}
 		/*
 		 * This block might be executed up to 3 times for a given (slow) job
 		 *  - once for the SAMPLE_TIMEOUT timer, at which point sampling is triggered
@@ -3153,6 +3128,7 @@
 				}
 				job_log(j, LOG_WARNING | LOG_CONSOLE, "Exit timeout elapsed (%u seconds). Killing", j->exit_timeout);
 				job_kill(j);
+				jobmgr_do_garbage_collection(j->mgr);
 			}
 		}
 	} else {
@@ -3374,7 +3350,8 @@
 		j->start_pending = false;
 		j->reaped = false;
 		j->crashed = false;
-
+		j->stopped = false;
+			
 		runtime_add_ref();
 		total_children++;
 		LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
@@ -3480,7 +3457,7 @@
 		argv++;
 	}
 
-	if (unlikely(j->wait4debugger)) {
+	if (unlikely(j->wait4debugger || j->wait4debugger_oneshot)) {
 		job_log(j, LOG_WARNING, "Spawned and waiting for the debugger to attach before continuing...");
 		spflags |= POSIX_SPAWN_START_SUSPENDED;
 	}
@@ -4112,9 +4089,17 @@
 	newmsg = alloca(newmsgsz);
 
 	if (err) {
+	#if !TARGET_OS_EMBEDDED
 		snprintf(newmsg, newmsgsz, "%s: %s", msg, strerror(err));
+	#else
+		snprintf(newmsg, newmsgsz, "(%s) %s: %s", j->label, msg, strerror(err));
+	#endif
 	} else {
+	#if !TARGET_OS_EMBEDDED
 		snprintf(newmsg, newmsgsz, "%s", msg);
+	#else
+		snprintf(newmsg, newmsgsz, "(%s) %s", j->label, msg);
+	#endif
 	}
 
 	if (unlikely(j->debug)) {
@@ -4221,7 +4206,6 @@
 semaphoreitem_watch(job_t j, struct semaphoreitem *si)
 {
 	char *parentdir, tmp_path[PATH_MAX];
-	const char *which_path = si->what;
 	int saved_errno = 0;
 	int fflags = NOTE_DELETE|NOTE_RENAME;
 
@@ -4249,20 +4233,18 @@
 	/* See 5321044 for why we do the do-while loop and 5415523 for why ENOENT is checked */
 	do {
 		if (si->fd == -1) {
-			if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) {
-				which_path = parentdir;
-				si->watching_parent = true;
-				si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
+			if ((si->fd = _fd(open(si->what, O_EVTONLY|O_NOCTTY))) == -1) {
+				si->watching_parent = job_assumes(j, (si->fd = _fd(open(parentdir, O_EVTONLY|O_NOCTTY))) != -1);
 			} else {
 				si->watching_parent = false;
 			}
 		}
 
 		if (si->fd == -1) {
-			return job_log_error(j, LOG_ERR, "Path monitoring failed on \"%s\"%s", si->what, si->watching_parent ? " (Could not monitor parent directory)" : "");
+			return job_log_error(j, LOG_ERR, "Path monitoring failed on \"%s\"", si->what);
 		}
 
-		job_log(j, LOG_DEBUG, "Watching %svnode: %d", si->watching_parent ? "parent ": "", si->fd);
+		job_log(j, LOG_DEBUG, "Watching %svnode (%s): %d", si->watching_parent ? "parent ": "", si->what, si->fd);
 
 		if (kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) == -1) {
 			saved_errno = errno;
@@ -4304,6 +4286,7 @@
 		case PATH_EXISTS:
 		case PATH_MISSING:
 		case DIR_NOT_EMPTY:
+			job_log(j, LOG_DEBUG, "P%s changed (%u): %s", si->watching_parent ? "arent path" : "ath", si->why, si->what);
 			break;
 		default:
 			continue;
@@ -4345,21 +4328,15 @@
 	}
 
 	if( !si->watching_parent ) {
-		job_log(j, LOG_DEBUG, "Watch path modified: %s", si->what);
-
 		if (si->why == PATH_CHANGES) {
 			j->start_pending = true;
 		}
 	} else { /* Something happened to the parent directory. See if our target file appeared. */
-		if( !invalidation_reason[0] ){
+		if( !invalidation_reason[0] ) {
 			job_assumes(j, runtime_close(si->fd) == 0);
 			si->fd = -1; /* this will get fixed in semaphoreitem_watch() */
 			semaphoreitem_watch(j, si);
 		}
-		
-		if( !si->watching_parent ) {
-			j->start_pending = true;
-		}
 	}
 	
 	job_dispatch(j, false);
@@ -4625,7 +4602,7 @@
 }
 
 bool
-envitem_new(job_t j, const char *k, const char *v, bool global)
+envitem_new(job_t j, const char *k, const char *v, bool global, bool one_shot)
 {
 	struct envitem *ei = calloc(1, sizeof(struct envitem) + strlen(k) + 1 + strlen(v) + 1);
 
@@ -4636,6 +4613,7 @@
 	strcpy(ei->key_init, k);
 	ei->value = ei->key_init + strlen(k) + 1;
 	strcpy(ei->value, v);
+	ei->one_shot = one_shot;
 
 	if (global) {
 		if (SLIST_EMPTY(&j->global_env)) {
@@ -4676,12 +4654,28 @@
 	}
 
 	if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) != 0 ) {
-		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env);
+		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env, false);
 	} else {
 		job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
 	}
 }
 
+void
+envitem_setup_one_shot(launch_data_t obj, const char *key, void *context)
+{
+	job_t j = context;
+	
+	if (launch_data_get_type(obj) != LAUNCH_DATA_STRING) {
+		return;
+	}
+	
+	if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) != 0 ) {
+		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env, true);
+	} else {
+		job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
+	}	
+}
+
 bool
 limititem_update(job_t j, int w, rlim_t r)
 {
@@ -4897,12 +4891,20 @@
 			wanted_state = true;
 		case PATH_MISSING:
 			if ((bool)(stat(si->what, &sb) == 0) == wanted_state) {
-				if (si->fd != -1) {
-					job_assumes(j, runtime_close(si->fd) == 0);
-					si->fd = -1;
+				job_log(j, LOG_NOTICE, "KeepAlive: The following path %s: %s", wanted_state ? "exists" : "is missing", si->what);
+				return true;
+			} else {
+				if( wanted_state ) { /* File is not there but we wish it was. */
+					if( si->fd != -1 && !si->watching_parent ) { /* Need to be watching the parent now. */
+						job_assumes(j, runtime_close(si->fd) == 0);
+						si->fd = -1;
+					}
+				} else { /* File is there but we wish it wasn't. */
+					if( si->fd != -1 && si->watching_parent ) { /* Need to watch the file now. */
+						job_assumes(j, runtime_close(si->fd) == 0);
+						si->fd = -1;
+					}
 				}
-				job_log(j, LOG_DEBUG, "KeepAlive: The following path %s: %s", wanted_state ? "exists" : "is missing", si->what);
-				return true;
 			}
 			break;
 		case PATH_CHANGES:
@@ -4925,7 +4927,6 @@
 job_active(job_t j)
 {
 	struct machservice *ms;
-
 	if (j->p) {
 		return "PID is still valid";
 	}
@@ -5191,90 +5192,182 @@
 }
 
 jobmgr_t
-jobmgr_do_garbage_collection(jobmgr_t jm)
+jobmgr_do_hopefully_first_shutdown_phase(jobmgr_t jm)
 {
-	jobmgr_t jmi, jmn;
-	job_t ji, jn;
-
-	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
-		jobmgr_do_garbage_collection(jmi);
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (likely(!jm->shutting_down)) {
-		return jm;
+	
+	bool should_proceed = !jm->killed_hopefully_first_jobs;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing first phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
+			}
+			if( ji->hopefully_exits_first ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
+		}
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_hopefully_first_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_hopefully_first_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	jobmgr_log(jm, LOG_DEBUG, "Garbage collecting.");
-
-	if (jm->hopefully_first_cnt && !jm->killed_hopefully_first_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->hopefully_first_cnt = %u, jm->killed_hopefully_first_jobs = %s", jm->hopefully_first_cnt, jm->killed_hopefully_first_jobs ? "true" : "false");
-		return jm;
+jobmgr_t
+jobmgr_do_normal_shutdown_phase(jobmgr_t jm)
+{
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (jm->parentmgr && jm->parentmgr->shutting_down && jm->parentmgr->hopefully_first_cnt) {
-		return jm;
-	}
-
-	if (!jm->sent_stop_to_normal_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "Asking \"normal\" jobs to exit.");
-
-		LIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
-			if (!job_active(ji)) {
-				job_remove(ji, false);
-			} else if (!ji->hopefully_exits_last) {
-				job_stop(ji);
+	
+	bool should_proceed = !jm->killed_normal_jobs;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing second phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
 			}
+			
+			if( !(ji->hopefully_exits_first || ji->hopefully_exits_last) && !ji->anonymous ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
 		}
-
-		jm->sent_stop_to_normal_jobs = true;
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_normal_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_normal_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	if (jm->normal_active_cnt && !jm->killed_normal_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->normal_active_cnt = %u, jm->killed_normal_jobs = %s", jm->normal_active_cnt, jm->killed_normal_jobs ? "true" : "false");
-		return jm;
+jobmgr_t
+jobmgr_do_hopefully_last_shutdown_phase(jobmgr_t jm)
+{
+	jobmgr_t _jm = jm;
+	if( !jm->shutting_down ) {
+		return _jm;
 	}
-
-	if (!jm->sent_stop_to_hopefully_last_jobs) {
-		jobmgr_log(jm, LOG_DEBUG, "Asking \"hopefully last\" jobs to exit.");
-
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (ji->p && ji->anonymous) {
-				continue;
-			} else if (ji->p && job_assumes(ji, ji->hopefully_exits_last)) {
-				job_stop(ji);
+	
+	static bool killed_stray_jobs = false;
+	if( !killed_stray_jobs ) {
+		jobmgr_log_stray_children(jm, true);
+		killed_stray_jobs = true;
+	}
+	
+	bool should_proceed = !jm->killed_hopefully_last_jobs && total_children != 0;
+	
+	job_t ji = NULL, jn = NULL;
+	if( should_proceed ) {
+		jobmgr_log(jm, LOG_DEBUG, "Doing third phase of garbage collection.");
+		uint32_t unkilled_cnt = 0;
+		LIST_FOREACH_SAFE( ji, &jm->jobs, sle, jn ) {
+			if( jm->parentmgr ) {
+				job_log(ji, LOG_DEBUG, "Examining...");
 			}
+			if( ji->hopefully_exits_last ) {
+				bool active = job_active(ji);
+				if( active && !ji->stopped ) {
+					job_stop(ji);
+					
+					/* We may have sent SIGKILL to the job in job_stop(). */
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( ji->stopped ) {
+					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+				} else if( !active ) {
+					job_remove(ji, false);
+				}
+			}
 		}
-
-		jm->sent_stop_to_hopefully_last_jobs = true;
+		
+		/* If we've killed everyone, move on. */
+		if( unkilled_cnt == 0 ) {
+			jm->killed_hopefully_last_jobs = true;
+			_jm = NULL;
+		}
+	} else {
+		jm->killed_hopefully_last_jobs = true;
+		_jm = NULL;
 	}
+	
+	return _jm;
+}
 
-	if (!SLIST_EMPTY(&jm->submgrs)) {
-		jobmgr_log(jm, LOG_DEBUG, "jm->submgrs not empty!");
+jobmgr_t
+jobmgr_do_garbage_collection(jobmgr_t jm)
+{
+	if( !jm->shutting_down ) {
 		return jm;
 	}
-
-	jobmgr_t retval = NULL;
-	if( pid1_magic && jm == root_jobmgr ) {
-		if( total_children > 0 && !jm->killed_hopefully_last_jobs ) {
-			retval = jm;
-		} else {
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, total_children == 0 ? false : true);
-		}
-	} else {
-		LIST_FOREACH(ji, &jm->jobs, sle) {
-			if (!ji->anonymous) {
-				retval = jm;
+	
+	jobmgr_t jmi = NULL, jmn = NULL;
+	SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
+		jobmgr_do_garbage_collection(jmi);
+	}
+	
+	jobmgr_t _jm = jobmgr_do_hopefully_first_shutdown_phase(jm);
+	if( !_jm ) {
+		_jm = jobmgr_do_normal_shutdown_phase(jm) ? : jobmgr_do_hopefully_last_shutdown_phase(jm);
+	}
+	
+	if( !_jm ) {
+		jobmgr_log(jm, LOG_NOTICE | LOG_CONSOLE, "Removing.");
+		jobmgr_log_stray_children(jm, false);
+		
+		job_t ji = NULL;
+		LIST_FOREACH( ji, &jm->jobs, sle ) {
+			if( !job_assumes(ji, (ji->anonymous || ji->sent_sigkill) && ji->p) ) {
+				job_log(ji, LOG_NOTICE | LOG_CONSOLE, "Job should be gone but is not.");
 			}
 		}
 		
-		if( !retval ) {
-			jobmgr_log_stray_children(jm);
-			jobmgr_remove(jm, false);
-		}
+		jobmgr_remove(jm, total_children != 0);
 	}
 	
-	return retval;
+	return _jm;
 }
 
 void
@@ -5326,16 +5419,12 @@
 }
 
 void
-jobmgr_log_stray_children(jobmgr_t jm)
+jobmgr_log_stray_children(jobmgr_t jm, bool kill_strays)
 {
 	int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
 	size_t i, kp_cnt = 0, kp_skipped = 0, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
 	struct kinfo_proc *kp;
 
-	if (!do_apple_internal_logging) {
-		return;
-	}
-
 	if (likely(jm->parentmgr || !pid1_magic)) {
 		return;
 	}
@@ -5364,11 +5453,14 @@
 			continue;
 		}
 		
-		/* We might have some jobs hanging around that we've decided to shut down in spite of. If so, don't bother trying to kill them again. */
+		/* We might have some jobs hanging around that we've decided to shut down in spite of. */
 		job_t j = jobmgr_find_by_pid(jm, p_i, false);
 		if( !j || (j && j->anonymous) ) {
-			jobmgr_log(jm, LOG_WARNING, "Stray %s %s at shutdown: PID %u PPID %u PGID %u %s", z, j ? "anonymous job" : "process", p_i, pp_i, pg_i, n);
-			jobmgr_kill_stray_child(jm, p_i);
+			jobmgr_log(jm, LOG_WARNING | LOG_CONSOLE, "Stray %s %s at shutdown: PID %u PPID %u PGID %u %s", z, j ? "anonymous job" : "process", p_i, pp_i, pg_i, n);
+			
+			if( kill_strays ) {
+				jobmgr_kill_stray_child(jm, p_i);
+			}
 		}
 	}
 
@@ -5533,11 +5625,19 @@
 
 		/* <rdar://problem/5042202> launchd-201: can't ssh in with AFP OD account (hangs) */
 		snprintf(buf, sizeof(buf), "0x%X:0:0", getuid());
-		envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false);
+		envitem_new(bootstrapper, "__CF_USER_TEXT_ENCODING", buf, false, false);
 		bootstrapper->weird_bootstrap = true;
 		jobmgr_assumes(jm, job_setup_machport(bootstrapper));
+	} else if( bootstrapper && strncmp(session_type, VPROCMGR_SESSION_SYSTEM, sizeof(VPROCMGR_SESSION_SYSTEM)) == 0 ) {
+		if( jobmgr_assumes(jm, pid1_magic) ) {
+			/* Have our system bootstrapper print out to the console. */
+			bootstrapper->stdoutpath = strdup(_PATH_CONSOLE);
+		#if TARGET_OS_EMBEDDED
+			bootstrapper->stderrpath = strdup(_PATH_CONSOLE);
+		#endif
+		}
 	}
-
+	
 	jm->session_initialized = true;
 
 	return bootstrapper;
@@ -5592,18 +5692,29 @@
 	struct machservice *ms;
 	job_t target_j;
 
+	jobmgr_log(jm, LOG_DEBUG, "Looking up %sservice %s", target_pid ? "per-PID " : "", name);
+
 	if (target_pid) {
-		//jobmgr_assumes(jm, !check_parent);
-		if (unlikely((target_j = jobmgr_find_by_pid(jm, target_pid, false)) == NULL)) {
-			return NULL;
+		/* This is a hack to let FileSyncAgent look up per-PID Mach services from the Background
+		 * bootstrap in other bootstraps.
+		 */
+		
+		/* Start in the given bootstrap. */
+		if( unlikely((target_j = jobmgr_find_by_pid(jm, target_pid, false)) == NULL) ) {
+			/* If we fail, do a deep traversal. */
+			if (unlikely((target_j = jobmgr_find_by_pid_deep(root_jobmgr, target_pid, true)) == NULL)) {
+				jobmgr_log(jm, LOG_DEBUG, "Didn't find PID %i", target_pid);
+				return NULL;
+			}
 		}
-
+		
 		SLIST_FOREACH(ms, &target_j->machservices, sle) {
 			if (ms->per_pid && strcmp(name, ms->name) == 0) {
 				return ms;
 			}
 		}
 
+		job_log(target_j, LOG_DEBUG, "Didn't find per-PID Mach service: %s", name);
 		return NULL;
 	}
 	
@@ -5708,7 +5819,7 @@
 	}
 
 	if (ms->recv && job_assumes(j, !machservice_active(ms))) {
-		job_log(j, LOG_NOTICE, "Closing receive right for %s", ms->name);
+		job_log(j, LOG_DEBUG, "Closing receive right for %s", ms->name);
 		job_assumes(j, launchd_mport_close_recv(ms->port) == KERN_SUCCESS);
 	}
 
@@ -5718,7 +5829,7 @@
 		the_exception_server = 0;
 	}
 
-	job_log(j, LOG_NOTICE, "Mach service deleted%s: %s", port_died ? " (port died)" : "", ms->name);
+	job_log(j, LOG_DEBUG, "Mach service deleted%s: %s", port_died ? " (port died)" : "", ms->name);
 
 	if (ms->special_port_num) {
 		SLIST_REMOVE(&special_ports, ms, machservice, special_port_sle);
@@ -6221,7 +6332,7 @@
 	}
 
 	if (unlikely(j->anonymous)) {
-		job_log(j, LOG_ERR, "Anonymous job tried to setup shared memory");
+		job_log(j, LOG_DEBUG, "Anonymous job tried to setup shared memory");
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 
@@ -6350,14 +6461,14 @@
 			job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1);
 			return 0;
 		}
-
+	#if !TARGET_OS_EMBEDDED
 		if (__sync_bool_compare_and_swap(&j->shmem->vp_shmem_transaction_cnt, 0, -1)) {
 			j->shmem->vp_shmem_flags |= VPROC_SHMEM_EXITING;
 			j->sent_kill_via_shmem = true;
 			job_assumes(j, runtime_kill(otherj->p, SIGKILL) != -1);
 			return 0;
 		}
-
+	#endif
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	} else if (otherj->p) {
 		job_assumes(j, runtime_kill(otherj->p, sig) != -1);
@@ -6404,7 +6515,7 @@
 		vm_offset_t *outval, mach_msg_type_number_t *outvalCnt) 
 {
 	const char *action;
-	launch_data_t input_obj, output_obj;
+	launch_data_t input_obj = NULL, output_obj = NULL;
 	size_t data_offset = 0;
 	size_t packed_size;
 	struct ldcred *ldc = runtime_get_caller_creds();
@@ -6476,8 +6587,13 @@
 	}
 
 	if (invalCnt) switch (inkey) {
-	case VPROC_GSK_ENVIRONMENT:
-		
+	case VPROC_GSK_ENVIRONMENT:	
+		if( launch_data_get_type(input_obj) == LAUNCH_DATA_DICTIONARY ) {
+			if( j->p ) {
+				job_log(j, LOG_NOTICE, "Setting environment for a currently active job. This environment will take effect on the next invocation of the job.");
+			}
+			launch_data_dict_iterate(input_obj, envitem_setup_one_shot, j);
+		}
 		break;
 	case 0:
 		break;
@@ -6568,6 +6684,9 @@
 		job_log(j, LOG_DEBUG, "Reading transaction model status.");
 		*outval = j->kill_via_shmem;
 		break;
+	case VPROC_GSK_WAITFORDEBUGGER:
+		*outval = j->wait4debugger;
+		break;
 	case 0:
 		*outval = 0;
 		break;
@@ -6641,9 +6760,10 @@
 			j->kill_via_shmem = (bool)inval;
 			job_log(j, LOG_DEBUG, "j->kill_via_shmem = %s", j->kill_via_shmem ? "true" : "false");
 		}
+		break;
 	case VPROC_GSK_WEIRD_BOOTSTRAP:
 		if( job_assumes(j, j->weird_bootstrap) ) {
-			job_log(j, LOG_NOTICE, "Unsetting weird bootstrap.");
+			job_log(j, LOG_DEBUG, "Unsetting weird bootstrap.");
 			
 			mach_msg_size_t mxmsgsz = (typeof(mxmsgsz)) sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
 			
@@ -6654,6 +6774,10 @@
 			job_assumes(j, runtime_add_mport(j->mgr->jm_port, protocol_vproc_server, mxmsgsz) == KERN_SUCCESS);
 			j->weird_bootstrap = false;
 		}
+		break;
+	case VPROC_GSK_WAITFORDEBUGGER:
+		j->wait4debugger_oneshot = inval;
+		break;
 	case 0:
 		break;
 	default:
@@ -7160,7 +7284,7 @@
 	
 	struct ldcred *ldc = runtime_get_caller_creds();
 	
-	/* Only allow root processes to look up children, even if we're in the per-user laucnhd.
+	/* Only allow root processes to look up children, even if we're in the per-user launchd.
 	 * Otherwise, this could be used to cross sessions, which counts as a security vulnerability
 	 * in a non-flat namespace.
 	 */
@@ -7288,7 +7412,7 @@
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 	
-	job_t j_for_pid = jobmgr_find_by_pid_deep(j->mgr, p);
+	job_t j_for_pid = jobmgr_find_by_pid_deep(j->mgr, p, false);
 	if( j_for_pid ) {
 		if( j_for_pid->kill_via_shmem ) {
 			if( j_for_pid->shmem ) {
@@ -7322,7 +7446,7 @@
 	/* This is so loginwindow doesn't try to quit GUI apps that have been launched
 	 * directly by launchd as agents.
 	 */
-	job_t j_for_pid = jobmgr_find_by_pid_deep(root_jobmgr, p);
+	job_t j_for_pid = jobmgr_find_by_pid_deep(root_jobmgr, p, false);
 	if( j_for_pid && !j_for_pid->anonymous && !j_for_pid->legacy_LS_job ) {
 		*managed = true;
 	}
@@ -7330,6 +7454,31 @@
 	return BOOTSTRAP_SUCCESS;
 }
 
+kern_return_t
+job_mig_port_for_label(job_t j __attribute__((unused)), name_t label, mach_port_t *mp)
+{
+	struct ldcred *ldc = runtime_get_caller_creds();
+	kern_return_t kr = BOOTSTRAP_NOT_PRIVILEGED;
+	
+	mach_port_t _mp = MACH_PORT_NULL;
+	if( ldc->euid == 0 || ldc->euid == geteuid() ) {
+		job_t target_j = job_find(label);
+		if( jobmgr_assumes(root_jobmgr, target_j != NULL) ) {
+			if( target_j->j_port == MACH_PORT_NULL ) {
+				job_assumes(target_j, job_setup_machport(target_j) == true);
+			}
+			
+			_mp = target_j->j_port;
+			kr = _mp != MACH_PORT_NULL ? BOOTSTRAP_SUCCESS : BOOTSTRAP_NO_MEMORY;
+		} else {
+			kr = BOOTSTRAP_NO_MEMORY;
+		}
+	}
+
+	*mp = _mp;
+	return kr;
+}
+
 jobmgr_t 
 jobmgr_find_by_name(jobmgr_t jm, const char *where)
 {
@@ -7367,8 +7516,6 @@
 			}
 		}
 	}
-
-	launchd_assumes(jmi != NULL);
 	
 jm_found:
 	return jmi;
@@ -7506,19 +7653,32 @@
 }
 
 kern_return_t
-job_mig_detach_from_console(job_t j, mach_port_t *new_bsport)
+job_mig_switch_to_session(job_t j, mach_port_t requestor_port, name_t session_name, mach_port_t *new_bsport)
 {
-	if( j->mgr == root_jobmgr ) {
+	job_log(j, LOG_NOTICE, "Job wants to move to %s session.", session_name);
+	
+	if( !job_assumes(j, pid1_magic == false) ) {
+		job_log(j, LOG_WARNING, "Switching sessions is not allowed in the system Mach bootstrap.");
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 	
 	if( !j->anonymous ) {
-		job_log(j, LOG_NOTICE, "Non-anonymous job tried to move to Background session. Please set LimitLoadToSessionType in the launchd property list to \"Background\" instead.");
+		job_log(j, LOG_NOTICE, "Non-anonymous job tried to switch sessions. Please use LimitLoadToSessionType instead.");
 		return BOOTSTRAP_NOT_PRIVILEGED;
 	}
 	
-	job_log(j, LOG_NOTICE, "Detaching from console session.");
+	jobmgr_t target_jm = jobmgr_find_by_name(root_jobmgr, session_name);
+	if( target_jm == j->mgr ) {
+		job_log(j, LOG_WARNING, "Job tried to switch to its current session (%s).", session_name);
+		return BOOTSTRAP_NOT_PRIVILEGED;
+	}
 	
+	target_jm = target_jm ? : jobmgr_new(j->mgr, requestor_port, MACH_PORT_NULL, false, session_name);
+	if( !job_assumes(j, target_jm != NULL) ) {
+		job_log(j, LOG_WARNING, "Could not find %s session!", session_name);
+		return BOOTSTRAP_NO_MEMORY;
+	}
+	
 	/* Remove the job from it's current job manager. */
 	LIST_REMOVE(j, sle);
 	LIST_REMOVE(j, pid_hash_sle);
@@ -7531,25 +7691,25 @@
 		}
 	}
 	
-	/* Put the job into the background job manager. */
-	LIST_INSERT_HEAD(&root_jobmgr->jobs, j, sle);
-	LIST_INSERT_HEAD(&root_jobmgr->active_jobs[ACTIVE_JOB_HASH(j->p)], j, pid_hash_sle);
+	/* Put the job into the target job manager. */
+	LIST_INSERT_HEAD(&target_jm->jobs, j, sle);
+	LIST_INSERT_HEAD(&target_jm->active_jobs[ACTIVE_JOB_HASH(j->p)], j, pid_hash_sle);
 	
 	if( ji ) {
-		LIST_INSERT_HEAD(&root_jobmgr->global_env_jobs, j, global_env_sle);
+		LIST_INSERT_HEAD(&target_jm->global_env_jobs, j, global_env_sle);
 	}
 	
-	/* Move our Mach services over. */
+	/* Move our Mach services over if we're not in a flat namespace. */
 	if( !g_flat_mach_namespace && !SLIST_EMPTY(&j->machservices) ) {
 		struct machservice *msi = NULL, *msit = NULL;
 		SLIST_FOREACH_SAFE( msi, &j->machservices, sle, msit ) {
 			LIST_REMOVE(msi, name_hash_sle);
-			LIST_INSERT_HEAD(&root_jobmgr->ms_hash[hash_ms(msi->name)], msi, name_hash_sle);
+			LIST_INSERT_HEAD(&target_jm->ms_hash[hash_ms(msi->name)], msi, name_hash_sle);
 		}
 	}
 	
-	j->mgr = root_jobmgr;
-	*new_bsport = root_jobmgr->jm_port;
+	j->mgr = target_jm;
+	*new_bsport = target_jm->jm_port;
 	
 	return KERN_SUCCESS;
 }
@@ -7726,7 +7886,7 @@
 	*subsetportp = jmr->jm_port;
 	jmr->created_via_subset = true;
 	
-	job_log(j, LOG_NOTICE, "Job created a subset named \"%s\"", jmr->name);
+	job_log(j, LOG_DEBUG, "Job created a subset named \"%s\"", jmr->name);
 	return BOOTSTRAP_SUCCESS;
 }
 
@@ -8059,47 +8219,185 @@
 	free(w4r);
 }
 
+size_t
+get_kern_max_proc(void)
+{
+	int mib[] = { CTL_KERN, KERN_MAXPROC };
+	int max = 100;
+	size_t max_sz = sizeof(max);
+	
+	launchd_assumes(sysctl(mib, 2, &max, &max_sz, NULL, 0) != -1);
+	
+	return max;
+}
+
+/* See rdar://problem/6271234 */
 void
-do_unmounts(void)
+eliminate_double_reboot(void)
 {
-	struct statfs buf[250];
-	int r, i, found, returned;
-
-	do {
-		returned = getfsstat(buf, (int) sizeof(buf), MNT_NOWAIT);
-		found = 0;
-
-		if (!launchd_assumes(returned != -1)) {
-			return;
+	if( unlikely(!pid1_magic) ) {
+		return;
+	}
+	
+	struct stat sb;
+	const char *argv[] = { "/etc/rc.deferredinstall", NULL };
+	char *try_again = "Will try again at next boot.";
+	int result = ~0;
+	
+	if( unlikely(stat(argv[0], &sb) != -1) ) {
+		jobmgr_log(root_jobmgr, LOG_DEBUG | LOG_CONSOLE, "Going to run deferred install script.");
+		
+		int wstatus;
+		pid_t p;
+		
+		jobmgr_assumes(root_jobmgr, (errno = posix_spawnp(&p, argv[0], NULL, NULL, (char **)argv, environ)) == 0);
+		
+		if (errno) {
+			jobmgr_log(root_jobmgr, LOG_WARNING | LOG_CONSOLE, "Couldn't run deferred install script! %s", try_again);
+			goto out;
 		}
-
-		/* Work backwards due to mounts on top of mounts */
-		for (i = returned - 1; i >= 0; i--) {
-			if (strcmp(buf[i].f_mntonname, "/") == 0) {
-				continue;
-			} else if (strncmp(buf[i].f_mntonname, "/dev", strlen("/dev")) == 0) {
-				continue;
+		
+		if( !jobmgr_assumes(root_jobmgr, waitpid(p, &wstatus, 0) != -1) ) {
+			jobmgr_log(root_jobmgr, LOG_WARNING | LOG_CONSOLE, "Couldn't confirm that deferred install script exited successfully! %s", try_again);
+			goto out;
+		}
+		
+		if( jobmgr_assumes(root_jobmgr, WIFEXITED(wstatus) != 0) ) {
+			if( jobmgr_assumes(root_jobmgr, (result = WEXITSTATUS(wstatus)) == EXIT_SUCCESS) ) {
+				jobmgr_log(root_jobmgr, LOG_DEBUG | LOG_CONSOLE, "Deferred install script completed successfully.");
+			} else {
+				jobmgr_log(root_jobmgr, LOG_WARNING | LOG_CONSOLE, "Deferred install script exited with status %d. %s", WEXITSTATUS(wstatus), try_again);
 			}
+		} else {
+			jobmgr_log(root_jobmgr, LOG_WARNING | LOG_CONSOLE, "Confirmed that deferred install script exited, but couldn't confirm that it was successful. %s", try_again);
+		}
+	}
+out:
+	if( result == 0 ) {
+		/* If the unlink(2) was to fail, it would be most likely fail with EBUSY. All the other
+		 * failure cases for unlink(2) don't apply when we're running under PID 1 and have verified
+		 * that the file exists. Outside of someone deliberately messing with us (like if /etc/rc.deferredinstall
+		 * is actually a looping sym-link or a mount point for a filesystem) and I/O errors, we should be good.
+		 */
+		if( !jobmgr_assumes(root_jobmgr, unlink(argv[0]) != -1) ) {
+			jobmgr_log(root_jobmgr, LOG_WARNING | LOG_CONSOLE, "Deferred install script couldn't be removed!");
+		}
+	}
+}
 
-			r = unmount(buf[i].f_mntonname, 0);
+static void
+jetsam_priority_from_job(job_t j, bool front, jetsam_priority_entry_t *jp)
+{
+	jp->pid = j->p;
+	jp->flags |= front ? kJetsamFlagsFrontmost : 0;
+}
 
-			runtime_syslog(LOG_DEBUG, "unmount(\"%s\", 0): %s", buf[i].f_mntonname, r == -1 ? strerror(errno) : "Success");
-
-			if (r != -1) {
-				found++;
-			}
-		}
-	} while ((returned == (sizeof(buf) / sizeof(buf[0]))) && (found > 0));
+static int
+job_cmp(const job_t *lhs, const job_t *rhs)
+{
+	job_t _lhs = *lhs;
+	job_t _rhs = *rhs;
+	/* Sort in descending order. (Priority correlates to the soonishness with which you will be killed.) */
+	if( _lhs->jetsam_priority > _rhs->jetsam_priority ) {
+		return -1;
+	} else if( _lhs->jetsam_priority < _rhs->jetsam_priority ) {
+		return 1;
+	}
+	
+	return 0;
 }
 
-size_t
-get_kern_max_proc(void)
+int
+launchd_set_jetsam_priorities(launch_data_t priorities)
 {
-	int mib[] = { CTL_KERN, KERN_MAXPROC };
-	int max = 100;
-	size_t max_sz = sizeof(max);
+	if( !launchd_assumes(launch_data_get_type(priorities) == LAUNCH_DATA_ARRAY) ) {
+		return EINVAL;
+	}
 	
-	launchd_assumes(sysctl(mib, 2, &max, &max_sz, NULL, 0) != -1);
+	jobmgr_t jm = NULL;
+#if !TARGET_OS_EMBEDDED
+	/* For testing. */
+	jm = jobmgr_find_by_name(root_jobmgr, VPROCMGR_SESSION_AQUA);
+	if( !launchd_assumes(jm != NULL) ) {
+		return EINVAL;
+	}
+#else
+	/* Since this is for embedded, we can assume that the root job manager holds the Jetsam jobs. */
+	jm = root_jobmgr;
+#endif
+		
+	size_t npris = launch_data_array_get_count(priorities);
+
+	job_t ji = NULL;
+	size_t i = 0;
+	for( i = 0; i < npris; i++ ) {
+		launch_data_t ldi = launch_data_array_get_index(priorities, i);
+		if( !launchd_assumes(launch_data_get_type(ldi) == LAUNCH_DATA_DICTIONARY) ) {
+			continue;
+		}
+		
+		launch_data_t label = NULL;
+		if( !launchd_assumes(label = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMLABEL)) ) {
+			continue;
+		}
+		const char *_label = launch_data_get_string(label);
+		
+		ji = job_find(_label);
+		if( !launchd_assumes(ji != NULL) ) {
+			continue;
+		}
+		
+		launch_data_t pri;
+		long long _pri = 0;
+		if( !launchd_assumes(pri = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMPRIORITY)) ) {
+			continue;
+		}
+		_pri = launch_data_get_integer(pri);
+		
+		if( ji->jetsam_priority == LAUNCHD_JETSAM_PRIORITY_UNSET ) {
+			LIST_INSERT_HEAD(&ji->mgr->jetsam_jobs, ji, jetsam_sle);
+			ji->mgr->jetsam_jobs_cnt++;
+		}
+		ji->jetsam_priority = _pri;
+		
+		launch_data_t frontmost = NULL;
+		if( !(frontmost = launch_data_dict_lookup(ldi, LAUNCH_KEY_JETSAMFRONTMOST)) ) {
+			ji->jetsam_frontmost = false;
+			continue;
+		}
+		ji->jetsam_frontmost = launch_data_get_bool(frontmost);
+	}
 	
-	return max;
+	i = 0;
+	job_t *jobs = (job_t *)calloc(jm->jetsam_jobs_cnt, sizeof(job_t));
+	LIST_FOREACH( ji, &jm->jetsam_jobs, jetsam_sle ) {
+		if( ji->p ) {
+			jobs[i] = ji;
+			i++;
+		}
+	}
+	size_t totalpris = i;
+	
+	int result = EINVAL;
+	if( launchd_assumes(totalpris > 0) ) {
+		qsort((void *)jobs, totalpris, sizeof(job_t), (int (*)(const void *, const void *))job_cmp);
+		
+		jetsam_priority_entry_t *jpris = (jetsam_priority_entry_t *)calloc(totalpris, sizeof(jetsam_priority_entry_t));
+		if( !launchd_assumes(jpris != NULL) ) {
+			result = ENOMEM;
+		} else {
+			for( i = 0; i < totalpris; i++ ) {
+				jetsam_priority_from_job(jobs[i], jobs[i]->jetsam_frontmost, &jpris[i]);
+			}
+			
+			int _result = 0;
+			launchd_assumes((_result = sysctlbyname("kern.memorystatus_priority_list", NULL, NULL, &jpris[0], totalpris * sizeof(jetsam_priority_entry_t))) != -1);
+			result = _result != 0 ? errno : 0;
+			
+			free(jpris);
+		}
+	}
+	free(jobs);
+	
+	return result;
 }

Modified: branches/PR-6424345/launchd/src/launchd_core_logic.h
===================================================================
--- branches/PR-6424345/launchd/src/launchd_core_logic.h	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd_core_logic.h	2009-01-20 03:58:30 UTC (rev 23784)
@@ -56,4 +56,6 @@
 void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
 void job_set_pid_crashed(pid_t p);
 
+int launchd_set_jetsam_priorities(launch_data_t priorities);
+
 #endif

Modified: branches/PR-6424345/launchd/src/launchd_runtime.c
===================================================================
--- branches/PR-6424345/launchd/src/launchd_runtime.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd_runtime.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -131,7 +131,7 @@
 bool do_apple_internal_logging;
 bool low_level_debug;
 bool g_force_old_kill_path = false;
-bool g_flat_mach_namespace = false;
+bool g_flat_mach_namespace = true;
 
 mach_port_t
 runtime_get_kernel_port(void)
@@ -592,10 +592,7 @@
 			kevi = &kev[i];
 
 			if (kevi->filter) {
-/* Leave on for SnowLeopard development. We should really try and identify what bugs would 
- * cause kevi->udata to be invalid.
- */
-#if 1
+#if 0
 				Dl_info dli;
 
 				/* Check if kevi->udata was either malloc(3)ed or is a valid function pointer. 
@@ -606,7 +603,7 @@
 				runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags);
 				(*((kq_callback *)kevi->udata))(kevi->udata, kevi);
 				runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END);
-#if 1
+#if 0
 				} else {
 					log_kevent_struct(LOG_EMERG, kevi, i);
 				}
@@ -1073,7 +1070,11 @@
 			tmp_options |= MACH_RCV_TIMEOUT;
 
 			if (!(tmp_options & MACH_SEND_TIMEOUT)) {
+			#if !TARGET_OS_EMBEDDED
 				to = busy_cnt ? runtime_idle_timeout : (_vproc_standby_timeout() * 1000);
+			#else
+				to = runtime_idle_timeout;
+			#endif
 			}
 		}
 
@@ -1510,7 +1511,9 @@
 runtime_add_ref(void)
 {
 	if (!pid1_magic) {
+	#if !TARGET_OS_EMBEDDED
 		_vproc_transaction_begin();
+	#endif
 	}
 	runtime_busy_cnt++;
 }
@@ -1519,7 +1522,9 @@
 runtime_del_ref(void)
 {
 	if (!pid1_magic) {
+	#if !TARGET_OS_EMBEDDED
 		_vproc_transaction_end();
+	#endif
 	}
 	runtime_busy_cnt--;
 }
@@ -1528,7 +1533,9 @@
 runtime_add_weak_ref(void)
 {
 	if (!pid1_magic) {
+	#if !TARGET_OS_EMBEDDED
 		_vproc_standby_begin();
+	#endif
 	}
 	runtime_standby_cnt++;
 }
@@ -1537,7 +1544,9 @@
 runtime_del_weak_ref(void)
 {
 	if (!pid1_magic) {
+	#if !TARGET_OS_EMBEDDED
 		_vproc_standby_end();
+	#endif
 	}
 	runtime_standby_cnt--;
 }
@@ -1734,7 +1743,7 @@
 		g_force_old_kill_path = true;
 	}
 	
-	if( !pid1_magic && stat("/var/db/.launchd_flat_per_user_namespace", &sb) == 0 ) {
-		g_flat_mach_namespace = true;
+	if( !pid1_magic && stat("/var/db/.launchd_no_flat_per_user_namespace", &sb) == 0 ) {
+		g_flat_mach_namespace = false;
 	}
 }

Modified: branches/PR-6424345/launchd/src/launchd_unix_ipc.c
===================================================================
--- branches/PR-6424345/launchd/src/launchd_unix_ipc.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/launchd_unix_ipc.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -415,6 +415,8 @@
 			resp = job_export(j);
 			ipc_revoke_fds(resp);
 		}
+	} else if( !strcmp(cmd, LAUNCH_KEY_SETPRIORITYLIST) ) {
+		resp = launch_data_new_errno(launchd_set_jetsam_priorities(data));
 	}
 
 	rmc->resp = resp;

Modified: branches/PR-6424345/launchd/src/libbootstrap.c
===================================================================
--- branches/PR-6424345/launchd/src/libbootstrap.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/libbootstrap.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "launch.h"
 #include "launch_priv.h"
+#include "bootstrap.h"
 #include "bootstrap_priv.h"
 #include "vproc.h"
 #include "vproc_priv.h"

Modified: branches/PR-6424345/launchd/src/liblaunch.c
===================================================================
--- branches/PR-6424345/launchd/src/liblaunch.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/liblaunch.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -208,30 +208,44 @@
 		memset(&sun, 0, sizeof(sun));
 		sun.sun_family = AF_UNIX;
 		
+		/* The rules are as follows. 
+		 * - All users (including root) talk to their per-user launchd's by default.
+		 * - If we have been invoked under sudo, talk to the system launchd.
+		 * - If we're the root user and the __USE_SYSTEM_LAUNCHD environment variable is set, then
+		 *   talk to the system launchd.
+		 */
 		if (where && where[0] != '\0') {
 			strncpy(sun.sun_path, where, sizeof(sun.sun_path));
-		} else if ((!getenv("SUDO_COMMAND") || geteuid() != 0) && _vprocmgr_getsocket(spath) == 0) {
-			size_t min_len;
-
-			min_len = sizeof(sun.sun_path) < sizeof(spath) ? sizeof(sun.sun_path) : sizeof(spath);
-
-			strncpy(sun.sun_path, spath, min_len);	
 		} else {
-			strncpy(sun.sun_path, LAUNCHD_SOCK_PREFIX "/sock", sizeof(sun.sun_path));
+			if( _vprocmgr_getsocket(spath) == 0 ) {
+				if( (getenv("SUDO_COMMAND") || getenv("__USE_SYSTEM_LAUNCHD")) && geteuid() == 0 ) {
+					/* Talk to the system launchd. */
+					strncpy(sun.sun_path, LAUNCHD_SOCK_PREFIX "/sock", sizeof(sun.sun_path));
+				} else {
+					/* Talk to our per-user launchd. */
+					size_t min_len;
+					
+					min_len = sizeof(sun.sun_path) < sizeof(spath) ? sizeof(sun.sun_path) : sizeof(spath);
+					
+					strncpy(sun.sun_path, spath, min_len);
+				}
+			}
 		}
-
+		
 		if ((lfd = _fd(socket(AF_UNIX, SOCK_STREAM, 0))) == -1) {
 			goto out_bad;
 		}
-			
 		if (-1 == connect(lfd, (struct sockaddr *)&sun, sizeof(sun))) {
 			goto out_bad;
 		}
 	}
-	if (!(_lc->l = launchd_fdopen(lfd)))
+	
+	if (!(_lc->l = launchd_fdopen(lfd))) {
 		goto out_bad;
-	if (!(_lc->async_resp = launch_data_alloc(LAUNCH_DATA_ARRAY)))
+	}
+	if (!(_lc->async_resp = launch_data_alloc(LAUNCH_DATA_ARRAY))) {
 		goto out_bad;
+	}
 
 	return;
 out_bad:
@@ -1265,26 +1279,5 @@
 		return -1;
 	}
 
-#define BEZEL_UI_HACK
-#ifdef BEZEL_UI_HACK
-	#define BEZEL_UI_PATH "/System/Library/LoginPlugins/BezelServices.loginPlugin/Contents/Resources/BezelUI/BezelUIServer"
-	#define BEZEL_UI_PLIST "/System/Library/LaunchAgents/com.apple.BezelUIServer.plist"
-	#define BEZEL_UI_SERVICE "BezelUI"
-
-	mach_port_t bezel_ui_server;
-	struct stat sb;
-	if (!(stat(BEZEL_UI_PLIST, &sb) == 0 && S_ISREG(sb.st_mode))) {
-		if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, target_user, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
-			mach_port_t srv;
-
-			if (bootstrap_check_in(bezel_ui_server, BEZEL_UI_SERVICE, &srv) == BOOTSTRAP_SUCCESS) {
-				mach_port_mod_refs(mach_task_self(), srv, MACH_PORT_RIGHT_RECEIVE, -1);
-			}
-
-			mach_port_deallocate(mach_task_self(), bezel_ui_server);
-		}
-	}
-#endif
-
 	return 1;
 }

Modified: branches/PR-6424345/launchd/src/libvproc.c
===================================================================
--- branches/PR-6424345/launchd/src/libvproc.c	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/libvproc.c	2009-01-20 03:58:30 UTC (rev 23784)
@@ -34,6 +34,8 @@
 #include <pthread.h>
 #include <signal.h>
 #include <assert.h>
+#include <libkern/OSAtomic.h>
+
 #if HAVE_QUARANTINE
 #include <quarantine.h>
 #endif
@@ -59,6 +61,55 @@
 static pthread_once_t shmem_inited = PTHREAD_ONCE_INIT;
 static uint64_t s_cached_transactions_enabled = 0;
 
+struct vproc_s {
+	int32_t refcount;
+	mach_port_t j_port;
+};
+
+vproc_t vprocmgr_lookup_vproc(const char *label)
+{
+	struct vproc_s *vp = NULL;
+	
+	mach_port_t mp = MACH_PORT_NULL;
+	kern_return_t kr = vproc_mig_port_for_label(bootstrap_port, (char *)label, &mp);
+	if( kr == BOOTSTRAP_SUCCESS ) {
+		vp = (struct vproc_s *)calloc(1, sizeof(struct vproc_s));
+		if( vp ) {
+			vp->refcount = 1;
+			mach_port_mod_refs(mach_task_self(), mp, MACH_PORT_RIGHT_SEND, 1);
+			vp->j_port = mp;
+		}
+		mach_port_mod_refs(mach_task_self(), mp, MACH_PORT_RIGHT_SEND, -1);
+	}
+	
+	return vp;
+}
+
+vproc_t vproc_retain(vproc_t vp)
+{
+	int32_t orig = OSAtomicAdd32(1, &vp->refcount) - 1;	
+	if( orig <= 0 ) {
+		/* We've gone from 0 to 1, which means that this object was due to be freed. */
+		__crashreporter_info__ = "Under-retain / over-release of vproc_t.";
+		abort();
+	}
+	
+	return vp;
+}
+
+void vproc_release(vproc_t vp)
+{
+	int32_t newval = OSAtomicAdd32(-1, &vp->refcount);
+	if( newval < 0 ) {
+		/* We're in negative numbers, which is bad. */
+		__crashreporter_info__ = "Over-release of vproc_t.";
+		abort();
+	} else if( newval == 0 ) {
+		mach_port_deallocate(mach_task_self(), vp->j_port);
+		free(vp);
+	}
+}
+
 static void
 vproc_shmem_init(void)
 {
@@ -69,18 +120,31 @@
 	kr = vproc_mig_setup_shmem(bootstrap_port, &shmem_port);
 
 	//assert(kr == 0);
-	if (kr) return;
+	if (kr) {
+		/* rdar://problem/6416724
+		 * If we fail to set up a shared memory page, just allocate a local chunk
+		 * of memory. This way, processes can still introspect their own transaction
+		 * counts if they're being run under a debugger. Moral of the story: Debug
+		 * from the environment you intend to run in.
+		 */
+		void *_vm_addr = calloc(1, sizeof(struct vproc_shmem_s));
+		if( !_vm_addr ) {
+			return;
+		}
 
-	kr = vm_map(mach_task_self(), &vm_addr, getpagesize(), 0, true, shmem_port, 0, false,
-			VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_NONE);
+		vm_addr = (vm_address_t)_vm_addr;
+	} else {
+		kr = vm_map(mach_task_self(), &vm_addr, getpagesize(), 0, true, shmem_port, 0, false,
+					VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_NONE);
+		
+		//assert(kr == 0);
+		if (kr) return;
+		
+		kr = mach_port_deallocate(mach_task_self(), shmem_port);
+		
+		//assert(kr == 0);
+	}
 
-	//assert(kr == 0);
-	if (kr) return;
-
-	kr = mach_port_deallocate(mach_task_self(), shmem_port);
-
-	//assert(kr == 0);
-
 	vproc_shmem = (struct vproc_shmem_s *)vm_addr;
 }
 
@@ -101,8 +165,9 @@
 vproc_transaction_begin(vproc_t vp __attribute__((unused)))
 {
 	vproc_transaction_t vpt = (vproc_transaction_t)vproc_shmem_init; /* we need a "random" variable that is testable */
-
+#if !TARGET_OS_EMBEDDED
 	_vproc_transaction_begin();
+#endif
 
 	return vpt;
 }
@@ -110,6 +175,7 @@
 void
 _vproc_transaction_begin(void)
 {
+#if !TARGET_OS_EMBEDDED
 	if (unlikely(vproc_shmem == NULL)) {
 		int po_r = pthread_once(&shmem_inited, vproc_client_init);
 		if (po_r != 0 || vproc_shmem == NULL) {
@@ -133,6 +199,7 @@
 	} while( !__sync_bool_compare_and_swap(&vproc_shmem->vp_shmem_transaction_cnt, old, old + 1) );
 	
 	runtime_ktrace(RTKT_VPROC_TRANSACTION_INCREMENT, old + 1, 0, 0);
+#endif
 }
 
 size_t
@@ -170,10 +237,16 @@
 _vproc_transaction_count_for_pid(pid_t p, int32_t *count, bool *condemned)
 {
 	boolean_t _condemned = false;
-	return vproc_mig_transaction_count_for_pid(bootstrap_port, p, count, (boolean_t *)condemned ? : &_condemned);
+	kern_return_t kr = vproc_mig_transaction_count_for_pid(bootstrap_port, p, count, &_condemned);
+	if( kr == KERN_SUCCESS && condemned ) {
+		*condemned = _condemned ? true : false;
+	}
+	
+	return kr;
 }
 
 void
+#if !TARGET_OS_EMBEDDED
 _vproc_transaction_try_exit(int status)
 {
 	if (unlikely(vproc_shmem == NULL)) {
@@ -185,6 +258,12 @@
 		_exit(status);
 	}
 }
+#else
+_vproc_transaction_try_exit(int status __attribute__((unused)))
+{
+	
+}
+#endif
 
 void
 vproc_transaction_end(vproc_t vp __attribute__((unused)), vproc_transaction_t vpt)
@@ -194,12 +273,15 @@
 		abort();
 	}
 
+#if !TARGET_OS_EMBEDDED
 	_vproc_transaction_end();
+#endif
 }
 
 void
 _vproc_transaction_end(void)
 {
+#if !TARGET_OS_EMBEDDED
 	typeof(vproc_shmem->vp_shmem_transaction_cnt) newval;
 
 	if (unlikely(vproc_shmem == NULL)) {
@@ -218,6 +300,7 @@
 		}
 		abort();
 	}
+#endif
 }
 
 vproc_standby_t
@@ -414,12 +497,14 @@
 	return !issetugid() ? _vproc_post_fork_ping() : NULL;
 }
 
-vproc_err_t 
-_vprocmgr_detach_from_console(uint32_t flags __attribute__((unused)))
+vproc_err_t
+_vprocmgr_switch_to_session(const char *target_session, vproc_flags_t flags __attribute__((unused)))
 {
 	mach_port_t new_bsport = MACH_PORT_NULL;
-	if( vproc_mig_detach_from_console(bootstrap_port, &new_bsport) != KERN_SUCCESS ) {
-		return (vproc_err_t)_vprocmgr_detach_from_console;
+	kern_return_t kr = KERN_FAILURE;
+	if( (kr = vproc_mig_switch_to_session(bootstrap_port, mach_task_self(), (char *)target_session, &new_bsport)) != KERN_SUCCESS ) {
+		_vproc_log(LOG_NOTICE, "_vprocmgr_switch_to_session(): kr = 0x%x", kr);
+		return (vproc_err_t)_vprocmgr_switch_to_session;
 	}
 	
 	task_set_bootstrap_port(mach_task_self(), new_bsport);
@@ -429,6 +514,12 @@
 	return !issetugid() ? _vproc_post_fork_ping() : NULL;
 }
 
+vproc_err_t 
+_vprocmgr_detach_from_console(vproc_flags_t flags __attribute__((unused)))
+{
+	return _vprocmgr_switch_to_session(VPROCMGR_SESSION_BACKGROUND, 0);
+}
+
 pid_t
 _spawn_via_launchd(const char *label, const char *const *argv, const struct spawn_via_launchd_attr *spawn_attrs, int struct_version)
 {
@@ -703,7 +794,7 @@
 }
 
 vproc_err_t
-vproc_swap_integer(vproc_t vp __attribute__((unused)), vproc_gsk_t key, int64_t *inval, int64_t *outval)
+vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval)
 {
 	static int64_t cached_is_managed = -1;
 	int64_t dummyval = 0;
@@ -742,7 +833,8 @@
 		break;
 	}
 
-	if (vproc_mig_swap_integer(bootstrap_port, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) {
+	mach_port_t mp = vp ? vp->j_port : bootstrap_port;
+	if (vproc_mig_swap_integer(mp, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) {
 		switch (key) {
 		case VPROC_GSK_MGR_PID:
 			cached_pid = outval ? *outval : dummyval;
@@ -789,7 +881,7 @@
 }
 
 vproc_err_t
-vproc_swap_complex(vproc_t vp __attribute__((unused)), vproc_gsk_t key, launch_data_t inval, launch_data_t *outval)
+vproc_swap_complex(vproc_t vp, vproc_gsk_t key, launch_data_t inval, launch_data_t *outval)
 {
 	size_t data_offset = 0, good_enough_size = 10*1024*1024;
 	mach_msg_type_number_t indata_cnt = 0, outdata_cnt;
@@ -810,7 +902,8 @@
 		indata = (vm_offset_t)buf;
 	}
 
-	if (vproc_mig_swap_complex(bootstrap_port, inval ? key : 0, outval ? key : 0, indata, indata_cnt, &outdata, &outdata_cnt) != 0) {
+	mach_port_t mp = vp ? vp->j_port : bootstrap_port;
+	if (vproc_mig_swap_complex(mp, inval ? key : 0, outval ? key : 0, indata, indata_cnt, &outdata, &outdata_cnt) != 0) {
 		goto out;
 	}
 

Modified: branches/PR-6424345/launchd/src/protocol_vproc.defs
===================================================================
--- branches/PR-6424345/launchd/src/protocol_vproc.defs	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/protocol_vproc.defs	2009-01-20 03:58:30 UTC (rev 23784)
@@ -182,8 +182,10 @@
 out				__child_names		: name_array_t, dealloc;
 out				__child_properties	: bootstrap_property_array_t, dealloc);
 
-routine detach_from_console(
+routine switch_to_session(
 				__bs_port			: job_t;
+				__req_port			: mach_port_t;
+				__session_name		: name_t;
 out				__new_bs_port		: mach_port_make_send_t);
 
 routine transaction_count_for_pid(
@@ -197,3 +199,7 @@
 				__pid				: pid_t;
 out				__managed			: boolean_t);
 
+routine port_for_label(
+				__bs_port			: job_t;
+				__label				: name_t;
+out				__mp				: mach_port_make_send_t);

Modified: branches/PR-6424345/launchd/src/vproc.h
===================================================================
--- branches/PR-6424345/launchd/src/vproc.h	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/vproc.h	2009-01-20 03:58:30 UTC (rev 23784)
@@ -34,7 +34,7 @@
 
 typedef void * vproc_err_t;
 
-typedef void * vproc_t;
+typedef struct vproc_s * vproc_t;
 typedef void * vprocmgr_t;
 
 const char *vproc_strerror(vproc_err_t r);

Modified: branches/PR-6424345/launchd/src/vproc_priv.h
===================================================================
--- branches/PR-6424345/launchd/src/vproc_priv.h	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd/src/vproc_priv.h	2009-01-20 03:58:30 UTC (rev 23784)
@@ -59,12 +59,17 @@
 	VPROC_GSK_ABANDON_PROCESS_GROUP,
 	VPROC_GSK_TRANSACTIONS_ENABLED,
 	VPROC_GSK_WEIRD_BOOTSTRAP,
+	VPROC_GSK_WAITFORDEBUGGER,
 } vproc_gsk_t;
 
 typedef unsigned int vproc_flags_t;
 /* For _vproc_kickstart_by_label() -- instructs launchd to kickstart the job to stall before exec(2). */
 #define VPROCFLAG_STALL_JOB_EXEC	1 << 1
 
+vproc_t vprocmgr_lookup_vproc(const char *label);
+vproc_t vproc_retain(vproc_t vp);
+void vproc_release(vproc_t vp);
+
 vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);
 vproc_err_t vproc_swap_complex(vproc_t vp, vproc_gsk_t key, launch_data_t inval, launch_data_t *outval);
 
@@ -90,6 +95,7 @@
 #define VPROCMGR_SESSION_SYSTEM			"System"
 
 vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type);
+vproc_err_t _vprocmgr_switch_to_session(const char *target_session, vproc_flags_t flags);
 vproc_err_t _vprocmgr_detach_from_console(vproc_flags_t flags);
 
 void _vproc_standby_begin(void)																__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_NA);

Modified: branches/PR-6424345/launchd.xcodeproj/project.pbxproj
===================================================================
--- branches/PR-6424345/launchd.xcodeproj/project.pbxproj	2009-01-13 23:11:13 UTC (rev 23783)
+++ branches/PR-6424345/launchd.xcodeproj/project.pbxproj	2009-01-20 03:58:30 UTC (rev 23784)
@@ -1005,6 +1005,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = launchd;
 				STRIP_STYLE = debugging;
+				VALID_ARCHS = "armv5 armv6 armv7 i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -1031,6 +1032,7 @@
 				);
 				PRODUCT_NAME = launch;
 				PUBLIC_HEADERS_FOLDER_PATH = /usr/include;
+				VALID_ARCHS = "armv5 armv6 armv7 i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = __;
 			};
@@ -1048,6 +1050,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = launchctl;
 				STRIP_STYLE = debugging;
+				VALID_ARCHS = "armv5 armv6 armv7 i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -1085,6 +1088,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = SystemStarter;
 				STRIP_STYLE = debugging;
+				VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -1100,6 +1104,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = launchproxy;
 				STRIP_STYLE = debugging;
+				VALID_ARCHS = "armv5 armv6 armv7 i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -1115,6 +1120,7 @@
 				PREBINDING = NO;
 				PRODUCT_NAME = wait4path;
 				STRIP_STYLE = debugging;
+				VALID_ARCHS = "armv5 armv6 armv7 i386 ppc ppc64 ppc7400 ppc970 x86_64";
 				ZERO_LINK = NO;
 			};
 			name = Release;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090119/002e4925/attachment-0001.html>

From source_changes at macosforge.org  Mon Jan 19 19:59:46 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Mon, 19 Jan 2009 19:59:46 -0800 (PST)
Subject: [launchd-changes] [23785] branches/PR-6424345/launchd/src/launchd.c
Message-ID: <20090120035947.1EF6BC9ECE9@beta.macosforge.org>

Revision: 23785
          http://trac.macosforge.org/projects/launchd/changeset/23785
Author:   nectar at apple.com
Date:     2009-01-19 19:59:46 -0800 (Mon, 19 Jan 2009)
Log Message:
-----------
assumes audit_quick_stop succeeds, don't assert it

Modified Paths:
--------------
    branches/PR-6424345/launchd/src/launchd.c

Modified: branches/PR-6424345/launchd/src/launchd.c
===================================================================
--- branches/PR-6424345/launchd/src/launchd.c	2009-01-20 03:58:30 UTC (rev 23784)
+++ branches/PR-6424345/launchd/src/launchd.c	2009-01-20 03:59:46 UTC (rev 23785)
@@ -348,7 +348,7 @@
 	launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL);
 
 #if HAVE_LIBAUDITD
-	launchd_assert(audit_quick_stop() == 0);
+	launchd_assumes(audit_quick_stop() == 0);
 #endif
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090119/c77163dd/attachment.html>

From source_changes at macosforge.org  Tue Jan 20 21:02:12 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 20 Jan 2009 21:02:12 -0800 (PST)
Subject: [launchd-changes] [23786] branches/PR-6461138-106.14/
Message-ID: <20090121050212.772ADCCCB18@beta.macosforge.org>

Revision: 23786
          http://trac.macosforge.org/projects/launchd/changeset/23786
Author:   kvv at apple.com
Date:     2009-01-20 21:02:11 -0800 (Tue, 20 Jan 2009)
Log Message:
-----------
"Branch for PR-6461138-106.14 from http://svn.macosforge.org/repository/launchd/tags/launchd-106.14"

Added Paths:
-----------
    branches/PR-6461138-106.14/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090120/9e0f7d3e/attachment.html>

From source_changes at macosforge.org  Tue Jan 20 21:02:32 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 20 Jan 2009 21:02:32 -0800 (PST)
Subject: [launchd-changes] [23787] branches/PR-6461138-106.14
Message-ID: <20090121050233.04721CCCB48@beta.macosforge.org>

Revision: 23787
          http://trac.macosforge.org/projects/launchd/changeset/23787
Author:   kvv at apple.com
Date:     2009-01-20 21:02:32 -0800 (Tue, 20 Jan 2009)
Log Message:
-----------
PR-6461138 for 106.14.

Modified Paths:
--------------
    branches/PR-6461138-106.14/launchd/src/StartupItems/NetworkTime

Property Changed:
----------------
    branches/PR-6461138-106.14/


Property changes on: branches/PR-6461138-106.14
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/PR-6461138:23773-23785

Modified: branches/PR-6461138-106.14/launchd/src/StartupItems/NetworkTime
===================================================================
--- branches/PR-6461138-106.14/launchd/src/StartupItems/NetworkTime	2009-01-21 05:02:11 UTC (rev 23786)
+++ branches/PR-6461138-106.14/launchd/src/StartupItems/NetworkTime	2009-01-21 05:02:32 UTC (rev 23787)
@@ -22,7 +22,7 @@
 	# Synchronize our clock to the network's time,
 	# then fire off ntpd to keep the clock in sync.
 	ntpdate -bvs
-	ntpd -f /var/run/ntp.drift -p /var/run/ntpd.pid
+	ntpd -c /private/etc/ntp-restrict.conf -f /var/run/ntp.drift -p /var/run/ntpd.pid
     fi
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090120/1d5a3035/attachment.html>

From source_changes at macosforge.org  Tue Jan 20 21:02:56 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 20 Jan 2009 21:02:56 -0800 (PST)
Subject: [launchd-changes] [23788] tags/laucnhd-106.14.1/
Message-ID: <20090121050256.36C1CCCCB68@beta.macosforge.org>

Revision: 23788
          http://trac.macosforge.org/projects/launchd/changeset/23788
Author:   kvv at apple.com
Date:     2009-01-20 21:02:55 -0800 (Tue, 20 Jan 2009)
Log Message:
-----------
"Tagging laucnhd-106.14.1 from http://svn.macosforge.org/repository/launchd/branches/PR-6461138-106.14"

Added Paths:
-----------
    tags/laucnhd-106.14.1/


Property changes on: tags/laucnhd-106.14.1
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/PR-6461138:23773-23785
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090120/1dfdca17/attachment.html>

From source_changes at macosforge.org  Tue Jan 20 21:14:00 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Tue, 20 Jan 2009 21:14:00 -0800 (PST)
Subject: [launchd-changes] [23789] tags
Message-ID: <20090121051400.E82EBCCD209@beta.macosforge.org>

Revision: 23789
          http://trac.macosforge.org/projects/launchd/changeset/23789
Author:   kvv at apple.com
Date:     2009-01-20 21:14:00 -0800 (Tue, 20 Jan 2009)
Log Message:
-----------
fix typo

Added Paths:
-----------
    tags/launchd-106.14.1/

Removed Paths:
-------------
    tags/laucnhd-106.14.1/


Property changes on: tags/launchd-106.14.1
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/PR-6461138:23773-23785
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090120/5fccdbf4/attachment-0001.html>

From source_changes at macosforge.org  Thu Jan 29 14:46:14 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu, 29 Jan 2009 14:46:14 -0800 (PST)
Subject: [launchd-changes] [23790] trunk
Message-ID: <20090129224615.3958DDC79D8@beta.macosforge.org>

Revision: 23790
          http://trac.macosforge.org/projects/launchd/changeset/23790
Author:   dsorresso at apple.com
Date:     2009-01-29 14:46:14 -0800 (Thu, 29 Jan 2009)
Log Message:
-----------
<rdar://problem/6317143> Kill stray processes before proceeding to HopefullyExitsLast bucket
<rdar://problem/6443367> CrashTracer: 15 crashes in quicklookd at com.apple.QuickLookDaemon ?\195?\162?\194?\128?\194?\162 -[QLDiskCache _cleanupDirtyLock]
<rdar://problem/6476050> Add support for RunAtLoad=false when KeepAlive=true
<rdar://problem/6485062> 10A245: launchd logging errors about Bug: launchd_core_logic.c:2902
<rdar://problem/6519318> SnowLeopard: Sporadic Failure of XServe Netboot
<rdar://problem/6520584> PID 1 crashes occasionally when logging messages on behalf of per-user launchd
<rdar://problem/6524729> SSH sessions are having their bootstraps taken away
<rdar://problem/6530122> Workaround rdar://problem/5020256
<rdar://problem/6535070> CrashTracer: 3 users reported crashes in launchd at launchd ?\195?\162?\194?\128?\194?\162 ipc_readmsg2 + 652

Modified Paths:
--------------
    trunk/launchd/src/bootstrap_priv.h
    trunk/launchd/src/launch.h
    trunk/launchd/src/launch_priv.h
    trunk/launchd/src/launchctl.c
    trunk/launchd/src/launchd.c
    trunk/launchd/src/launchd.h
    trunk/launchd/src/launchd_core_logic.c
    trunk/launchd/src/launchd_runtime.c
    trunk/launchd/src/launchd_runtime.h
    trunk/launchd/src/launchd_unix_ipc.c
    trunk/launchd/src/libbootstrap.c
    trunk/launchd/src/liblaunch.c
    trunk/launchd/src/libvproc.c
    trunk/launchd/src/protocol_vproc.defs
    trunk/launchd/src/vproc_internal.h
    trunk/launchd/src/vproc_priv.h
    trunk/launchd.xcodeproj/project.pbxproj

Modified: trunk/launchd/src/bootstrap_priv.h
===================================================================
--- trunk/launchd/src/bootstrap_priv.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/bootstrap_priv.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -27,13 +27,13 @@
 
 #pragma GCC visibility push(default)
 
-#define BOOTSTRAP_PER_PID_SERVICE	0x1
-#define BOOTSTRAP_ALLOW_LOOKUP		0x2
-#define BOOTSTRAP_DENY_JOB_CREATION	0x4
-#define BOOTSTRAP_PRIVILEGED_SERVER	0x8
+#define BOOTSTRAP_PER_PID_SERVICE		1 << 0
+#define BOOTSTRAP_ALLOW_LOOKUP			1 << 1
+#define BOOTSTRAP_DENY_JOB_CREATION		1 << 2
+#define BOOTSTRAP_PRIVILEGED_SERVER		1 << 3
 
-#define BOOTSTRAP_PROPERTY_SUBSET		1 << 1
-#define BOOTSTRAP_PROPERTY_PERUSER		1 << 2
+#define BOOTSTRAP_PROPERTY_SUBSET		1 << 0
+#define BOOTSTRAP_PROPERTY_PERUSER		1 << 1
 
 kern_return_t bootstrap_register2(mach_port_t bp, name_t service_name, mach_port_t sp, uint64_t flags);
 

Modified: trunk/launchd/src/launch.h
===================================================================
--- trunk/launchd/src/launch.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launch.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -44,108 +44,109 @@
 #endif
 
 
-#define LAUNCH_KEY_SUBMITJOB					"SubmitJob"
-#define LAUNCH_KEY_REMOVEJOB					"RemoveJob"
-#define LAUNCH_KEY_STARTJOB						"StartJob"
-#define LAUNCH_KEY_STOPJOB						"StopJob"
-#define LAUNCH_KEY_GETJOB						"GetJob"
-#define LAUNCH_KEY_GETJOBS						"GetJobs"
-#define LAUNCH_KEY_CHECKIN						"CheckIn"
+#define LAUNCH_KEY_SUBMITJOB						"SubmitJob"
+#define LAUNCH_KEY_REMOVEJOB						"RemoveJob"
+#define LAUNCH_KEY_STARTJOB							"StartJob"
+#define LAUNCH_KEY_STOPJOB							"StopJob"
+#define LAUNCH_KEY_GETJOB							"GetJob"
+#define LAUNCH_KEY_GETJOBS							"GetJobs"
+#define LAUNCH_KEY_CHECKIN							"CheckIn"
 
-#define LAUNCH_JOBKEY_LABEL						"Label"
-#define LAUNCH_JOBKEY_DISABLED					"Disabled"
-#define LAUNCH_JOBKEY_USERNAME					"UserName"
-#define LAUNCH_JOBKEY_GROUPNAME					"GroupName"
-#define LAUNCH_JOBKEY_TIMEOUT					"TimeOut"
-#define LAUNCH_JOBKEY_EXITTIMEOUT				"ExitTimeOut"
-#define LAUNCH_JOBKEY_INITGROUPS				"InitGroups"
-#define LAUNCH_JOBKEY_SOCKETS					"Sockets"
-#define LAUNCH_JOBKEY_MACHSERVICES				"MachServices"
-#define LAUNCH_JOBKEY_MACHSERVICELOOKUPPOLICIES	"MachServiceLookupPolicies"
-#define LAUNCH_JOBKEY_INETDCOMPATIBILITY		"inetdCompatibility"
-#define LAUNCH_JOBKEY_ENABLEGLOBBING			"EnableGlobbing"
-#define LAUNCH_JOBKEY_PROGRAMARGUMENTS			"ProgramArguments"
-#define LAUNCH_JOBKEY_PROGRAM					"Program"
-#define LAUNCH_JOBKEY_ONDEMAND					"OnDemand"
-#define LAUNCH_JOBKEY_KEEPALIVE					"KeepAlive"
-#define LAUNCH_JOBKEY_LIMITLOADTOHOSTS			"LimitLoadToHosts"
-#define LAUNCH_JOBKEY_LIMITLOADFROMHOSTS		"LimitLoadFromHosts"
-#define LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE	"LimitLoadToSessionType"
-#define LAUNCH_JOBKEY_RUNATLOAD					"RunAtLoad"
-#define LAUNCH_JOBKEY_ROOTDIRECTORY				"RootDirectory"
-#define LAUNCH_JOBKEY_WORKINGDIRECTORY			"WorkingDirectory"
-#define LAUNCH_JOBKEY_ENVIRONMENTVARIABLES		"EnvironmentVariables"
-#define LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES	"UserEnvironmentVariables"
-#define LAUNCH_JOBKEY_UMASK						"Umask"
-#define LAUNCH_JOBKEY_NICE						"Nice"
-#define LAUNCH_JOBKEY_HOPEFULLYEXITSFIRST  		"HopefullyExitsFirst"
-#define LAUNCH_JOBKEY_HOPEFULLYEXITSLAST   		"HopefullyExitsLast"
-#define LAUNCH_JOBKEY_LOWPRIORITYIO				"LowPriorityIO"
-#define LAUNCH_JOBKEY_SESSIONCREATE				"SessionCreate"
-#define LAUNCH_JOBKEY_STARTONMOUNT				"StartOnMount"
-#define LAUNCH_JOBKEY_SOFTRESOURCELIMITS		"SoftResourceLimits"
-#define LAUNCH_JOBKEY_HARDRESOURCELIMITS		"HardResourceLimits"
-#define LAUNCH_JOBKEY_STANDARDINPATH			"StandardInPath"
-#define LAUNCH_JOBKEY_STANDARDOUTPATH			"StandardOutPath"
-#define LAUNCH_JOBKEY_STANDARDERRORPATH			"StandardErrorPath"
-#define LAUNCH_JOBKEY_DEBUG						"Debug"
-#define LAUNCH_JOBKEY_WAITFORDEBUGGER			"WaitForDebugger"
-#define LAUNCH_JOBKEY_QUEUEDIRECTORIES			"QueueDirectories"
-#define LAUNCH_JOBKEY_WATCHPATHS				"WatchPaths"
-#define LAUNCH_JOBKEY_STARTINTERVAL				"StartInterval"
-#define LAUNCH_JOBKEY_STARTCALENDARINTERVAL		"StartCalendarInterval"
-#define LAUNCH_JOBKEY_BONJOURFDS				"BonjourFDs"
-#define LAUNCH_JOBKEY_LASTEXITSTATUS			"LastExitStatus"
-#define LAUNCH_JOBKEY_PID						"PID"
-#define LAUNCH_JOBKEY_THROTTLEINTERVAL			"ThrottleInterval"
-#define LAUNCH_JOBKEY_LAUNCHONLYONCE			"LaunchOnlyOnce"
-#define LAUNCH_JOBKEY_ABANDONPROCESSGROUP		"AbandonProcessGroup"
-#define LAUNCH_JOBKEY_POLICIES					"Policies"
-#define LAUNCH_JOBKEY_ENABLETRANSACTIONS		"EnableTransactions"
+#define LAUNCH_JOBKEY_LABEL							"Label"
+#define LAUNCH_JOBKEY_DISABLED						"Disabled"
+#define LAUNCH_JOBKEY_USERNAME						"UserName"
+#define LAUNCH_JOBKEY_GROUPNAME						"GroupName"
+#define LAUNCH_JOBKEY_TIMEOUT						"TimeOut"
+#define LAUNCH_JOBKEY_EXITTIMEOUT					"ExitTimeOut"
+#define LAUNCH_JOBKEY_INITGROUPS					"InitGroups"
+#define LAUNCH_JOBKEY_SOCKETS						"Sockets"
+#define LAUNCH_JOBKEY_MACHSERVICES					"MachServices"
+#define LAUNCH_JOBKEY_MACHSERVICELOOKUPPOLICIES		"MachServiceLookupPolicies"
+#define LAUNCH_JOBKEY_INETDCOMPATIBILITY			"inetdCompatibility"
+#define LAUNCH_JOBKEY_ENABLEGLOBBING				"EnableGlobbing"
+#define LAUNCH_JOBKEY_PROGRAMARGUMENTS				"ProgramArguments"
+#define LAUNCH_JOBKEY_PROGRAM						"Program"
+#define LAUNCH_JOBKEY_ONDEMAND						"OnDemand"
+#define LAUNCH_JOBKEY_KEEPALIVE						"KeepAlive"
+#define LAUNCH_JOBKEY_LIMITLOADTOHOSTS				"LimitLoadToHosts"
+#define LAUNCH_JOBKEY_LIMITLOADFROMHOSTS			"LimitLoadFromHosts"
+#define LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE		"LimitLoadToSessionType"
+#define LAUNCH_JOBKEY_RUNATLOAD						"RunAtLoad"
+#define LAUNCH_JOBKEY_ROOTDIRECTORY					"RootDirectory"
+#define LAUNCH_JOBKEY_WORKINGDIRECTORY				"WorkingDirectory"
+#define LAUNCH_JOBKEY_ENVIRONMENTVARIABLES			"EnvironmentVariables"
+#define LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES		"UserEnvironmentVariables"
+#define LAUNCH_JOBKEY_UMASK							"Umask"
+#define LAUNCH_JOBKEY_NICE							"Nice"
+#define LAUNCH_JOBKEY_HOPEFULLYEXITSFIRST	  		"HopefullyExitsFirst"
+#define LAUNCH_JOBKEY_HOPEFULLYEXITSLAST   			"HopefullyExitsLast"
+#define LAUNCH_JOBKEY_LOWPRIORITYIO					"LowPriorityIO"
+#define LAUNCH_JOBKEY_SESSIONCREATE					"SessionCreate"
+#define LAUNCH_JOBKEY_STARTONMOUNT					"StartOnMount"
+#define LAUNCH_JOBKEY_SOFTRESOURCELIMITS			"SoftResourceLimits"
+#define LAUNCH_JOBKEY_HARDRESOURCELIMITS			"HardResourceLimits"
+#define LAUNCH_JOBKEY_STANDARDINPATH				"StandardInPath"
+#define LAUNCH_JOBKEY_STANDARDOUTPATH				"StandardOutPath"
+#define LAUNCH_JOBKEY_STANDARDERRORPATH				"StandardErrorPath"
+#define LAUNCH_JOBKEY_DEBUG							"Debug"
+#define LAUNCH_JOBKEY_WAITFORDEBUGGER				"WaitForDebugger"
+#define LAUNCH_JOBKEY_QUEUEDIRECTORIES				"QueueDirectories"
+#define LAUNCH_JOBKEY_WATCHPATHS					"WatchPaths"
+#define LAUNCH_JOBKEY_STARTINTERVAL					"StartInterval"
+#define LAUNCH_JOBKEY_STARTCALENDARINTERVAL			"StartCalendarInterval"
+#define LAUNCH_JOBKEY_BONJOURFDS					"BonjourFDs"
+#define LAUNCH_JOBKEY_LASTEXITSTATUS				"LastExitStatus"
+#define LAUNCH_JOBKEY_PID							"PID"
+#define LAUNCH_JOBKEY_THROTTLEINTERVAL				"ThrottleInterval"
+#define LAUNCH_JOBKEY_LAUNCHONLYONCE				"LaunchOnlyOnce"
+#define LAUNCH_JOBKEY_ABANDONPROCESSGROUP			"AbandonProcessGroup"
+#define LAUNCH_JOBKEY_POLICIES						"Policies"
+#define LAUNCH_JOBKEY_ENABLETRANSACTIONS			"EnableTransactions"
 
-#define LAUNCH_JOBPOLICY_DENYCREATINGOTHERJOBS	"DenyCreatingOtherJobs"
+#define LAUNCH_JOBPOLICY_DENYCREATINGOTHERJOBS		"DenyCreatingOtherJobs"
 
-#define LAUNCH_JOBINETDCOMPATIBILITY_WAIT		"Wait"
+#define LAUNCH_JOBINETDCOMPATIBILITY_WAIT			"Wait"
 
-#define LAUNCH_JOBKEY_MACH_RESETATCLOSE			"ResetAtClose"
-#define LAUNCH_JOBKEY_MACH_HIDEUNTILCHECKIN		"HideUntilCheckIn"
+#define LAUNCH_JOBKEY_MACH_RESETATCLOSE				"ResetAtClose"
+#define LAUNCH_JOBKEY_MACH_HIDEUNTILCHECKIN			"HideUntilCheckIn"
 
-#define LAUNCH_JOBKEY_KEEPALIVE_SUCCESSFULEXIT	"SuccessfulExit"
-#define LAUNCH_JOBKEY_KEEPALIVE_NETWORKSTATE	"NetworkState"
-#define LAUNCH_JOBKEY_KEEPALIVE_PATHSTATE		"PathState"
-#define LAUNCH_JOBKEY_KEEPALIVE_OTHERJOBACTIVE	"OtherJobActive"
-#define LAUNCH_JOBKEY_KEEPALIVE_OTHERJOBENABLED	"OtherJobEnabled"
+#define LAUNCH_JOBKEY_KEEPALIVE_SUCCESSFULEXIT		"SuccessfulExit"
+#define LAUNCH_JOBKEY_KEEPALIVE_NETWORKSTATE		"NetworkState"
+#define LAUNCH_JOBKEY_KEEPALIVE_PATHSTATE			"PathState"
+#define LAUNCH_JOBKEY_KEEPALIVE_OTHERJOBACTIVE		"OtherJobActive"
+#define LAUNCH_JOBKEY_KEEPALIVE_OTHERJOBENABLED		"OtherJobEnabled"
+#define LAUNCH_JOBKEY_KEEPALIVE_AFTERINITIALDEMAND	"AfterInitialDemand"
 
-#define LAUNCH_JOBKEY_CAL_MINUTE				"Minute"
-#define LAUNCH_JOBKEY_CAL_HOUR					"Hour"
-#define LAUNCH_JOBKEY_CAL_DAY					"Day"
-#define LAUNCH_JOBKEY_CAL_WEEKDAY				"Weekday"
-#define LAUNCH_JOBKEY_CAL_MONTH					"Month"
+#define LAUNCH_JOBKEY_CAL_MINUTE					"Minute"
+#define LAUNCH_JOBKEY_CAL_HOUR						"Hour"
+#define LAUNCH_JOBKEY_CAL_DAY						"Day"
+#define LAUNCH_JOBKEY_CAL_WEEKDAY					"Weekday"
+#define LAUNCH_JOBKEY_CAL_MONTH						"Month"
                                             
-#define LAUNCH_JOBKEY_RESOURCELIMIT_CORE		"Core"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_CPU			"CPU"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_DATA		"Data"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE		"FileSize"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK		"MemoryLock"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE		"NumberOfFiles"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_NPROC		"NumberOfProcesses"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_RSS			"ResidentSetSize"
-#define LAUNCH_JOBKEY_RESOURCELIMIT_STACK		"Stack"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_CORE			"Core"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_CPU				"CPU"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_DATA			"Data"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE			"FileSize"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK			"MemoryLock"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE			"NumberOfFiles"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_NPROC			"NumberOfProcesses"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_RSS				"ResidentSetSize"
+#define LAUNCH_JOBKEY_RESOURCELIMIT_STACK			"Stack"
 
-#define LAUNCH_JOBKEY_DISABLED_MACHINETYPE		"MachineType"
-#define LAUNCH_JOBKEY_DISABLED_MODELNAME		"ModelName"
+#define LAUNCH_JOBKEY_DISABLED_MACHINETYPE			"MachineType"
+#define LAUNCH_JOBKEY_DISABLED_MODELNAME			"ModelName"
 
-#define LAUNCH_JOBSOCKETKEY_TYPE				"SockType"
-#define LAUNCH_JOBSOCKETKEY_PASSIVE				"SockPassive"
-#define LAUNCH_JOBSOCKETKEY_BONJOUR				"Bonjour"
-#define LAUNCH_JOBSOCKETKEY_SECUREWITHKEY		"SecureSocketWithKey"
-#define LAUNCH_JOBSOCKETKEY_PATHNAME			"SockPathName"
-#define LAUNCH_JOBSOCKETKEY_PATHMODE			"SockPathMode"
-#define LAUNCH_JOBSOCKETKEY_NODENAME			"SockNodeName"
-#define LAUNCH_JOBSOCKETKEY_SERVICENAME			"SockServiceName"
-#define LAUNCH_JOBSOCKETKEY_FAMILY				"SockFamily"
-#define LAUNCH_JOBSOCKETKEY_PROTOCOL			"SockProtocol"
-#define LAUNCH_JOBSOCKETKEY_MULTICASTGROUP		"MulticastGroup"
+#define LAUNCH_JOBSOCKETKEY_TYPE					"SockType"
+#define LAUNCH_JOBSOCKETKEY_PASSIVE					"SockPassive"
+#define LAUNCH_JOBSOCKETKEY_BONJOUR					"Bonjour"
+#define LAUNCH_JOBSOCKETKEY_SECUREWITHKEY			"SecureSocketWithKey"
+#define LAUNCH_JOBSOCKETKEY_PATHNAME				"SockPathName"
+#define LAUNCH_JOBSOCKETKEY_PATHMODE				"SockPathMode"
+#define LAUNCH_JOBSOCKETKEY_NODENAME				"SockNodeName"
+#define LAUNCH_JOBSOCKETKEY_SERVICENAME				"SockServiceName"
+#define LAUNCH_JOBSOCKETKEY_FAMILY					"SockFamily"
+#define LAUNCH_JOBSOCKETKEY_PROTOCOL				"SockProtocol"
+#define LAUNCH_JOBSOCKETKEY_MULTICASTGROUP			"MulticastGroup"
 
 typedef struct _launch_data *launch_data_t;
 

Modified: trunk/launchd/src/launch_priv.h
===================================================================
--- trunk/launchd/src/launch_priv.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launch_priv.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -90,7 +90,8 @@
  *
  * This returns 1 on success (it used to return otherwise), and -1 on failure.
  */
-#define	LOAD_ONLY_SAFEMODE_LAUNCHAGENTS	1
+#define	LOAD_ONLY_SAFEMODE_LAUNCHAGENTS	1 << 0
+#define LAUNCH_GLOBAL_ON_DEMAND			1 << 1
 pid_t create_and_switch_to_per_session_launchd(const char * /* loginname */, int flags, ...);
 
 /* Also for LoginWindow.

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchctl.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -164,6 +164,7 @@
 static void fix_bogus_file_metadata(void);
 static void do_file_init(void) __attribute__((constructor));
 static void setup_system_context(void);
+static void tell_launchd_about_boot_args(void);
 
 typedef enum {
 	BOOTCACHE_START = 1,
@@ -192,12 +193,13 @@
 static int umask_cmd(int argc, char *const argv[]);
 static int getrusage_cmd(int argc, char *const argv[]);
 static int bsexec_cmd(int argc, char *const argv[]);
-static int _bslist_cmd(mach_port_t bport, unsigned int depth);
+static int _bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job);
 static int bslist_cmd(int argc, char *const argv[]);
-static int _bstree_cmd(mach_port_t bsport, unsigned int depth);
+static int _bstree_cmd(mach_port_t bsport, unsigned int depth, bool show_jobs);
 static int bstree_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
 static int managerpid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
 static int manageruid_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
+static int managername_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)));
 static int exit_cmd(int argc, char *const argv[]) __attribute__((noreturn));
 static int help_cmd(int argc, char *const argv[]);
 
@@ -206,36 +208,37 @@
 	int (*func)(int argc, char *const argv[]);
 	const char *desc;
 } cmds[] = {
-	{ "load",		load_and_unload_cmd,	"Load configuration files and/or directories" },
-	{ "unload",		load_and_unload_cmd,	"Unload configuration files and/or directories" },
-//	{ "reload",		reload_cmd,				"Reload configuration files and/or directories" },
-	{ "start",		start_stop_remove_cmd,	"Start specified job" },
-	{ "stop",		start_stop_remove_cmd,	"Stop specified job" },
-	{ "submit",		submit_cmd,				"Submit a job from the command line" },
-	{ "remove",		start_stop_remove_cmd,	"Remove specified job" },
-	{ "bootstrap",	bootstrap_cmd,			"Bootstrap launchd" },
-	{ "list",		list_cmd,				"List jobs and information about jobs" },
-	{ "setenv",		setenv_cmd,				"Set an environmental variable in launchd" },
-	{ "unsetenv",	unsetenv_cmd,			"Unset an environmental variable in launchd" },
-	{ "getenv",		getenv_and_export_cmd,	"Get an environmental variable from launchd" },
-	{ "export",		getenv_and_export_cmd,	"Export shell settings from launchd" },
-	{ "debug",		wait4debugger_cmd,		"Set the WaitForDebugger flag for the target job to true." },
-	{ "limit",		limit_cmd,				"View and adjust launchd resource limits" },
-	{ "stdout",		stdio_cmd,				"Redirect launchd's standard out to the given path" },
-	{ "stderr",		stdio_cmd,				"Redirect launchd's standard error to the given path" },
-	{ "shutdown",	fyi_cmd,				"Prepare for system shutdown" },
-	{ "singleuser",	fyi_cmd,				"Switch to single-user mode" },
-	{ "getrusage",	getrusage_cmd,			"Get resource usage statistics from launchd" },
-	{ "log",		logupdate_cmd,			"Adjust the logging level or mask of launchd" },
-	{ "umask",		umask_cmd,				"Change launchd's umask" },
-	{ "bsexec",		bsexec_cmd,				"Execute a process within a different Mach bootstrap subset" },
-	{ "bslist",		bslist_cmd,				"List Mach bootstrap services and optional servers" },
-	{ "bstree",		bstree_cmd,				"Show the entire Mach bootstrap tree. Requires root privileges." },
-	{ "managerpid",	managerpid_cmd,			"Print the PID of the launchd managing this Mach bootstrap." },
-	{ "manageruid",	manageruid_cmd,			"Print the UID of the launchd managing this Mach bootstrap." },
-	{ "exit",		exit_cmd,				"Exit the interactive invocation of launchctl" },
-	{ "quit",		exit_cmd,				"Quit the interactive invocation of launchctl" },
-	{ "help",		help_cmd,				"This help output" },
+	{ "load",			load_and_unload_cmd,	"Load configuration files and/or directories" },
+	{ "unload",			load_and_unload_cmd,	"Unload configuration files and/or directories" },
+//	{ "reload",			reload_cmd,				"Reload configuration files and/or directories" },
+	{ "start",			start_stop_remove_cmd,	"Start specified job" },
+	{ "stop",			start_stop_remove_cmd,	"Stop specified job" },
+	{ "submit",			submit_cmd,				"Submit a job from the command line" },
+	{ "remove",			start_stop_remove_cmd,	"Remove specified job" },
+	{ "bootstrap",		bootstrap_cmd,			"Bootstrap launchd" },
+	{ "list",			list_cmd,				"List jobs and information about jobs" },
+	{ "setenv",			setenv_cmd,				"Set an environmental variable in launchd" },
+	{ "unsetenv",		unsetenv_cmd,			"Unset an environmental variable in launchd" },
+	{ "getenv",			getenv_and_export_cmd,	"Get an environmental variable from launchd" },
+	{ "export",			getenv_and_export_cmd,	"Export shell settings from launchd" },
+	{ "debug",			wait4debugger_cmd,		"Set the WaitForDebugger flag for the target job to true." },
+	{ "limit",			limit_cmd,				"View and adjust launchd resource limits" },
+	{ "stdout",			stdio_cmd,				"Redirect launchd's standard out to the given path" },
+	{ "stderr",			stdio_cmd,				"Redirect launchd's standard error to the given path" },
+	{ "shutdown",		fyi_cmd,				"Prepare for system shutdown" },
+	{ "singleuser",		fyi_cmd,				"Switch to single-user mode" },
+	{ "getrusage",		getrusage_cmd,			"Get resource usage statistics from launchd" },
+	{ "log",			logupdate_cmd,			"Adjust the logging level or mask of launchd" },
+	{ "umask",			umask_cmd,				"Change launchd's umask" },
+	{ "bsexec",			bsexec_cmd,				"Execute a process within a different Mach bootstrap subset" },
+	{ "bslist",			bslist_cmd,				"List Mach bootstrap services and optional servers" },
+	{ "bstree",			bstree_cmd,				"Show the entire Mach bootstrap tree. Requires root privileges." },
+	{ "managerpid",		managerpid_cmd,			"Print the PID of the launchd managing this Mach bootstrap." },
+	{ "manageruid",		manageruid_cmd,			"Print the UID of the launchd managing this Mach bootstrap." },
+	{ "managername",	managername_cmd,		"Print the name of this Mach bootstrap." },
+	{ "exit",			exit_cmd,				"Exit the interactive invocation of launchctl" },
+	{ "quit",			exit_cmd,				"Quit the interactive invocation of launchctl" },
+	{ "help",			help_cmd,				"This help output" },
 };
 
 static bool istty;
@@ -244,6 +247,7 @@
 static bool do_apple_internal_magic;
 static bool system_context;
 static bool rootuser_context;
+static bool g_shutdown_debugging = false;
 
 int
 main(int argc, char *const argv[])
@@ -458,7 +462,16 @@
 	CFDictionaryRef envPlist = NULL;
 	launch_data_t req = NULL, launch_env_dict = NULL, resp = NULL;
 	
-	plistPath = CFStringCreateWithFormat(NULL, NULL, CFSTR("%s/.MacOSX/environment.plist"), getenv("HOME"));
+	char plist_path_str[PATH_MAX];
+	plist_path_str[PATH_MAX - 1] = 0;
+	snprintf(plist_path_str, sizeof(plist_path_str), "%s/.MacOSX/environment.plist", getenv("HOME"));
+	
+	struct stat sb;
+	if( stat(plist_path_str, &sb) == -1 ) {
+		goto out;
+	}
+	
+	plistPath = CFStringCreateWithFormat(NULL, NULL, CFSTR("%s"), plist_path_str);
 	if( !assumes(plistPath != NULL) ) {
 		goto out;
 	}
@@ -1367,10 +1380,18 @@
 	if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, fileURL, &resourceData, NULL, NULL, &errorCode)) {
 		fprintf(stderr, "%s: CFURLCreateDataAndPropertiesFromResource(%s) failed: %d\n", getprogname(), posixfile, (int)errorCode);
 	}
+	
 	propertyList = CFPropertyListCreateFromXMLData(kCFAllocatorDefault, resourceData, kCFPropertyListMutableContainers, &errorString);
 	if (!propertyList) {
 		fprintf(stderr, "%s: propertyList is NULL\n", getprogname());
 	}
+	if( fileURL ) {
+		CFRelease(fileURL);
+	}
+	
+	if( resourceData ) {
+		CFRelease(resourceData);
+	}
 
 	return propertyList;
 }
@@ -1393,6 +1414,10 @@
 	if (!CFURLWriteDataAndPropertiesToResource(fileURL, resourceData, NULL, &errorCode)) {
 		fprintf(stderr, "%s: CFURLWriteDataAndPropertiesToResource(%s) failed: %d\n", getprogname(), posixfile, (int)errorCode);
 	}
+	
+	if( resourceData ) {
+		CFRelease(resourceData);
+	}
 }
 
 static inline Boolean __is_launch_data_t(launch_data_t obj) 
@@ -1514,10 +1539,11 @@
 		}
 		
 		result = CFArrayCreateCopy(NULL, mutResult);
-		
+	}
+	
+	if( mutResult ) {
 		CFRelease(mutResult);
 	}
-	
 	return result;
 }
 
@@ -1783,6 +1809,7 @@
 		assumes(fwexec(rcserver_tool, NULL) != -1);
 	}
 
+	tell_launchd_about_boot_args();
 	read_launchd_conf();
 
 	if (path_check("/var/account/acct")) {
@@ -2010,6 +2037,8 @@
 				 * directory.
 				 */
 				if( getppid() != 1 ) {
+					the_argc_user = 5;
+				}
 			#else
 				/* This deadlocks against mount_url when logging in with a network home
 				 * directory. For now, we'll just load user Background agents when
@@ -2018,9 +2047,9 @@
 				 * but it satisfies the user expectation in 99% of cases.
 				 */
 				if( 0 ) {
-			#endif
 					the_argc_user = 5;
 				}
+			#endif
 			}
 		} else if (strcasecmp(session_type, VPROCMGR_SESSION_AQUA) == 0) {
 			load_launchd_items[5] = "/etc/mach_init_per_user.d";
@@ -2490,18 +2519,19 @@
 				
 				if( plistStr ) {
 					CFShow(plistStr);
+					CFRelease(plistStr);
 					r = 0;
 				}
 			} else {
 				print_obj(resp, NULL, NULL);
 				r = 0;
 			}
+			launch_data_free(resp);
 		} else {
 			fprintf(stderr, "%s %s returned unknown response\n", getprogname(), argv[0]);
 			r = 1;
+			launch_data_free(resp);
 		}
-		
-		launch_data_free(resp);
 	} else if( vproc_swap_complex(NULL, VPROC_GSK_ALLJOBS, NULL, &resp) == NULL ) {
 		fprintf(stdout, "PID\tStatus\tLabel\n");
 		launch_data_dict_iterate(resp, print_jobs, NULL);
@@ -2874,6 +2904,43 @@
 	bootstrap_port = rootbs;
 }
 
+static void
+tell_launchd_about_boot_args(void)
+{
+	if( !g_shutdown_debugging ) {
+		return;
+	}
+	
+	CFTypeRef value = NULL;	
+	do {
+		io_registry_entry_t entry = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/options");
+		if( assumes(entry == IO_OBJECT_NULL) ) {
+			break;
+		}
+		
+		value = IORegistryEntryCreateCFProperty(entry, CFSTR("boot-args"), kCFAllocatorDefault, 0);
+		if( !assumes(value != NULL) ) {
+			break;
+		}
+		
+		IOObjectRelease(entry);
+	} while( 0 );
+	
+	Boolean is_verbose = false;
+	if( value ) {
+		/* Normally I'd just use CFStringFind(), but the compiler whines about it returning a 
+		 * struct with -Wall.
+		 */
+		CFRange range = { 0, CFStringGetLength(value) };
+		CFRange found_range = { 0, 0 };
+		
+		is_verbose = CFStringFindWithOptions(value, CFSTR("-v"), range, 0, &found_range);
+		CFRelease(value);
+				
+		assumes(vproc_swap_integer(NULL, VPROC_GSK_SHUTDOWN_DEBUGGING, (int64_t *)&is_verbose, NULL) == KERN_SUCCESS);
+	}
+}
+
 int
 submit_cmd(int argc, char *const argv[])
 {
@@ -3081,11 +3148,12 @@
 }
 
 int
-_bslist_cmd(mach_port_t bport, unsigned int depth)
+_bslist_cmd(mach_port_t bport, unsigned int depth, bool show_job)
 {
 	kern_return_t result;
 	name_array_t service_names;
-	mach_msg_type_number_t service_cnt, service_active_cnt;
+	name_array_t service_jobs;
+	mach_msg_type_number_t service_cnt, service_jobs_cnt, service_active_cnt;
 	bootstrap_status_array_t service_actives;
 	unsigned int i;
 	
@@ -3094,7 +3162,7 @@
 		return 1;
 	}
 	
-	result = bootstrap_info(bport, &service_names, &service_cnt, &service_actives, &service_active_cnt);
+	result = bootstrap_info(bport, &service_names, &service_cnt, &service_jobs, &service_jobs_cnt, &service_actives, &service_active_cnt);
 	if (result != BOOTSTRAP_SUCCESS) {
 		fprintf(stderr, "bootstrap_info(): %d\n", result);
 		return 1;
@@ -3103,7 +3171,11 @@
 #define bport_state(x)	(((x) == BOOTSTRAP_STATUS_ACTIVE) ? "A" : ((x) == BOOTSTRAP_STATUS_ON_DEMAND) ? "D" : "I")
 	
 	for (i = 0; i < service_cnt ; i++) {
-		fprintf(stdout, "%*s%-3s%s\n", depth, "", bport_state((service_actives[i])), service_names[i]);
+		fprintf(stdout, "%*s%-3s%s", depth, "", bport_state((service_actives[i])), service_names[i]);
+		if( show_job ) {
+			fprintf(stdout, " (%s)", service_jobs[i]);
+		}
+		fprintf(stdout, "\n");
 	}
 	
 	return 0;
@@ -3113,20 +3185,29 @@
 bslist_cmd(int argc, char *const argv[])
 {
 	mach_port_t bport = bootstrap_port;
-	if( argc == 2 ) {
-		bport = str2bsport(argv[1]);
+	bool show_jobs = false;
+	if( argc > 2 && strcmp(argv[2], "-j") == 0 ) {
+		show_jobs = true;
 	}
 	
+	if( argc > 1 ) {
+		if( show_jobs ) {
+			bport = str2bsport(argv[1]);
+		} else if( strcmp(argv[1], "-j") == 0 ) {
+			show_jobs = true;
+		}
+	}
+	
 	if( bport == MACH_PORT_NULL ) {
 		fprintf(stderr, "Invalid bootstrap port\n");
 		return 1;
 	}
 	
-	return _bslist_cmd(bport, 0);
+	return _bslist_cmd(bport, 0, show_jobs);
 }
 
 int
-_bstree_cmd(mach_port_t bsport, unsigned int depth)
+_bstree_cmd(mach_port_t bsport, unsigned int depth, bool show_jobs)
 {
 	if( bsport == MACH_PORT_NULL ) {
 		fprintf(stderr, "No root port!\n");
@@ -3150,13 +3231,13 @@
 	}
 	
 	unsigned int i = 0;
-	_bslist_cmd(bsport, depth);
+	_bslist_cmd(bsport, depth, show_jobs);
 	
 	for( i = 0; i < cnt; i++ ) {
 		char *type = ( child_props[i] & BOOTSTRAP_PROPERTY_PERUSER ) ? "Per-user" : "Subset";
 		fprintf(stdout, "%*s%s (%s)/\n", depth, "", child_names[i], type);
 		if( child_ports[i] != MACH_PORT_NULL ) {
-			_bstree_cmd(child_ports[i], depth + 4);
+			_bstree_cmd(child_ports[i], depth + 4, show_jobs);
 		}
 	}
 	
@@ -3164,16 +3245,20 @@
 }
 
 int
-bstree_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)))
+bstree_cmd(int argc, char * const argv[])
 {
+	bool show_jobs = false;
 	if( geteuid() != 0 ) {
 		fprintf(stderr, "You must be root to perform this operation.\n");
 		return 1;
 	} else {
+		if( argc == 2 && strcmp(argv[1], "-j") == 0 ) {
+			show_jobs = true;
+		}
 		fprintf(stdout, "System/\n");
 	}
 	
-	return _bstree_cmd(str2bsport("/"), 4);
+	return _bstree_cmd(str2bsport("/"), 4, show_jobs);
 }
 
 int
@@ -3204,6 +3289,22 @@
 	return 0;
 }
 
+int
+managername_cmd(int argc __attribute__((unused)), char * const argv[] __attribute__((unused)))
+{
+	char *manager_name = NULL;
+	vproc_err_t verr = vproc_swap_string(NULL, VPROC_GSK_MGR_NAME, NULL, &manager_name);
+	if( verr ) {
+		fprintf(stdout, "Unknown job manager!\n");
+		return 1;
+	}
+	
+	fprintf(stdout, "%s\n", manager_name);
+	free(manager_name);
+	
+	return 0;
+}
+
 bool
 is_legacy_mach_job(launch_data_t obj)
 {
@@ -3316,10 +3417,13 @@
 	int wstatus2;
 	pid_t p;
 
-	errno = posix_spawnp(&p, argv[0], NULL, NULL, (char **)argv, environ);
+	/* We'd use posix_spawnp(), but we want to workaround: 6288899 */
 
-	if (errno) {
+	if ((p = vfork()) == -1) {
 		return -1;
+	} else if (p == 0) {
+		execvp(argv[0], (char *const *)argv);
+		_exit(EXIT_FAILURE);
 	}
 
 	if (waitpid(p, wstatus ? wstatus : &wstatus2, 0) == -1) {
@@ -3798,4 +3902,8 @@
 	if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) {
 		do_apple_internal_magic = true;
 	}
+	
+	if( stat("/var/db/.launchd_shutdown_debugging", &sb) == 0 ) {
+		g_shutdown_debugging = true;
+	}
 }

Modified: trunk/launchd/src/launchd.c
===================================================================
--- trunk/launchd/src/launchd.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -69,6 +69,7 @@
 #include <spawn.h>
 #include <sched.h>
 #include <pthread.h>
+#include <util.h>
 
 #include "bootstrap.h"
 #include "vproc.h"
@@ -96,6 +97,9 @@
 static void monitor_networking_state(void);
 static void fatal_signal_handler(int sig, siginfo_t *si, void *uap);
 static void handle_pid1_crashes_separately(void);
+static void do_pid1_crash_diagnosis_mode(void);
+static int basic_fork(void);
+static bool do_pid1_crash_diagnosis_mode2(void);
 
 static void *update_thread(void *nothing);
 
@@ -107,7 +111,7 @@
 bool shutdown_in_progress;
 bool fake_shutdown_in_progress;
 bool network_up;
-char g_username[128] = "__UnknownUserToLaunchd_DontPanic_NotImportant__";
+char g_username[128] = "__Uninitialized__";
 FILE *g_console = NULL;
 
 int
@@ -121,8 +125,7 @@
 	testfd_or_openfd(STDOUT_FILENO, stdouterr_path, O_WRONLY);
 	testfd_or_openfd(STDERR_FILENO, stdouterr_path, O_WRONLY);
 
-#if 0
-	if (pid1_magic) {
+	if (pid1_magic && g_use_gmalloc) {
 		if (!getenv("DYLD_INSERT_LIBRARIES")) {
 			setenv("DYLD_INSERT_LIBRARIES", "/usr/lib/libgmalloc.dylib", 1);
 			setenv("MALLOC_STRICT_SIZE", "1", 1);
@@ -132,7 +135,6 @@
 			unsetenv("MALLOC_STRICT_SIZE");
 		}
 	}
-#endif
 
 	while ((ch = getopt(argc, argv, "s")) != -1) {
 		switch (ch) {
@@ -157,9 +159,9 @@
 		} else {
 			if( !launchd_assumes((g_console = fopen(_PATH_CONSOLE, "w")) != NULL) ) {
 				g_console = stdout;
+			} else {
+				_fd(fileno(g_console));
 			}
-			
-			_fd(fileno(g_console));
 		}
 	} else {
 		g_console = stdout;
@@ -186,6 +188,9 @@
 
 	if( pid1_magic ) {
 		runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "*** launchd[1] has started up. ***");
+		if( g_use_gmalloc ) {
+			runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "*** Using libgmalloc ***");
+		}
 		
 		struct stat sb;
 		if( stat("/var/db/.launchd_flat_per_user_namespace", &sb) == 0 ) {
@@ -254,6 +259,85 @@
 static __attribute__((unused)) typeof(reboot) *__junk_dyld_trick3 = reboot;
 
 void
+do_pid1_crash_diagnosis_mode(void)
+{
+	while( g_shutdown_debugging && !do_pid1_crash_diagnosis_mode2() ) {
+		sleep(1);
+	}
+}
+
+int
+basic_fork(void)
+{
+	int wstatus;
+	pid_t p;
+	
+	switch ((p = fork())) {
+		case -1:
+			runtime_syslog(LOG_ERR | LOG_CONSOLE, "Can't fork PID 1 copy for crash debugging: %m");
+			return p;
+		case 0:
+			return p;
+		default:
+			waitpid(p, &wstatus, 0);
+			if (WIFEXITED(wstatus)) {
+				if (WEXITSTATUS(wstatus) == EXIT_SUCCESS) {
+					return 1;
+				} else {
+					fprintf(stdout, "PID 1 copy: exit status: %d\n", WEXITSTATUS(wstatus));
+				}
+			} else {
+				fprintf(stdout, "PID 1 copy: %s\n", strsignal(WTERMSIG(wstatus)));
+			}
+			return 1;
+	}
+	
+	return -1;
+}
+
+bool
+do_pid1_crash_diagnosis_mode2(void)
+{
+	if( basic_fork() == 0 ) {
+		/* Neuter our bootstrap port so that the shell doesn't try talking to us while
+		 * we're blocked waiting on it.
+		 */
+		fflush(g_console);
+		task_set_bootstrap_port(mach_task_self(), MACH_PORT_NULL);
+		if( basic_fork() != 0 ) {
+			fflush(g_console);
+			return true;
+		}
+	} else {
+		return true;
+	}
+	
+	int fd;
+	revoke(_PATH_CONSOLE);
+	if ((fd = open(_PATH_CONSOLE, O_RDWR)) == -1) {
+		_exit(2);
+	}
+	if (login_tty(fd) == -1) {
+		_exit(3);
+	}
+	setenv("TERM", "vt100", 1);
+	fprintf(stdout, "\n");
+	fprintf(stdout, "Entering launchd PID 1 debugging mode...\n");
+	fprintf(stdout, "The PID 1 launchd has crashed. It has fork(2)ed itself for debugging.\n");
+	fprintf(stdout, "To debug the main thread of PID 1:\n");
+	fprintf(stdout, "    gdb attach %d\n", getppid());
+	fprintf(stdout, "To exit this shell, capture a sample of launchd and shut down:\n");
+	fprintf(stdout, "    exit\n");
+	fprintf(stdout, "A sample of PID 1 will be written to %s\n", PID1_CRASH_LOGFILE);
+	fprintf(stdout, "\n");
+	fflush(stdout);
+	
+	execl(_PATH_BSHELL, "-sh", NULL);
+	syslog(LOG_ERR, "can't exec %s for PID 1 crash debugging: %m", _PATH_BSHELL);
+	_exit(EXIT_FAILURE);
+}
+
+void
 fatal_signal_handler(int sig, siginfo_t *si, void *uap __attribute__((unused)))
 {
 	const char *doom_why = "at instruction";
@@ -264,6 +348,8 @@
 	crash_addr = si->si_addr;
 	crash_pid = si->si_pid;
 
+	do_pid1_crash_diagnosis_mode();
+	
 	unlink(PID1_CRASH_LOGFILE);
 
 	switch ((sample_p = vfork())) {
@@ -339,7 +425,7 @@
 	now = runtime_get_wall_time();
 
 	char *term_who = pid1_magic ? "System shutdown" : "Per-user launchd termination for ";
-	runtime_syslog(LOG_NOTICE, "%s%s began at: %lld.%06llu", term_who, pid1_magic ? "" : g_username, now / USEC_PER_SEC, now % USEC_PER_SEC);
+	runtime_syslog(LOG_NOTICE, "%s%s began", term_who, pid1_magic ? "" : g_username);
 
 	launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL);
 }

Modified: trunk/launchd/src/launchd.h
===================================================================
--- trunk/launchd/src/launchd.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -33,6 +33,7 @@
 extern bool fake_shutdown_in_progress;
 extern bool network_up;
 extern bool g_force_old_kill_path;
+extern bool g_simulate_pid1_crash;
 extern FILE *g_console;
 
 bool init_check_pid(pid_t);

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd_core_logic.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -481,7 +481,7 @@
 		    hopefully_exits_last		:1,	/* man launchd.plist --> HopefullyExitsLast */
 		    removal_pending				:1,	/* a job was asked to be unloaded/removed while running, we'll remove it after it exits */
 		    sent_sigkill				:1,	/* job_kill() was called */
-		    sampled						:1,	/* job_force_sampletool() was called (or is disabled) */
+		    sampling_complete			:1,	/* job_force_sampletool() was called (or is disabled) */
 		    debug_before_kill			:1,	/* enter the kernel debugger before killing a job */
 		    weird_bootstrap				:1,	/* a hack that launchd+launchctl use during jobmgr_t creation */
 		    start_on_mount				:1,	/* man launchd.plist --> StartOnMount */
@@ -496,14 +496,18 @@
 	     	sent_kill_via_shmem			:1,	/* We need to 'kill_via_shmem' once-and-only-once */
 			pending_sample				:1, /* This job needs to be sampled for some reason. */
 			kill_after_sample			:1, /* The job is to be killed after sampling. */
-			reap_after_sample			:1,	/* The job exited before sample did, so we should reap it after sample is done. */
+			is_being_sampled			:1, /* We've spawned a sample tool to sample the job. */
+			reap_after_trace			:1,	/* The job exited before sample did, so we should reap it after sample is done. */
 			nosy						:1, /* The job has an OtherJobEnabled KeepAlive criterion. */
 			crashed						:1, /* The job is the default Mach exception handler, and it crashed. */
 			reaped						:1, /* We've received NOTE_EXIT for the job. */
 			stopped						:1, /* job_stop() was called. */
-			jetsam_frontmost			:1; /* The job is considered "frontmost" by Jetsam. */
+			jetsam_frontmost			:1, /* The job is considered "frontmost" by Jetsam. */
+			needs_kickoff				:1, /* The job is to be kept alive continuously, but it must be initially kicked off. */
+			is_bootstrapper				:1, /* The job is a bootstrapper. */
+			migratory					:1; /* The (anonymous) job called vprocmgr_switch_to_session(). */
 	mode_t mask;
-	pid_t sample_pid;
+	pid_t tracing_pid;
 	const char label[0];
 };
 
@@ -528,7 +532,7 @@
 static const char *job_active(job_t j);
 static void job_watch(job_t j);
 static void job_ignore(job_t j);
-static void job_reap_sample(job_t j);
+static void job_cleanup_after_tracer(job_t j);
 static void job_reap(job_t j);
 static bool job_useless(job_t j);
 static bool job_keepalive(job_t j);
@@ -593,6 +597,8 @@
 static size_t our_strhash(const char *s) __attribute__((pure));
 static void extract_rcsid_substr(const char *i, char *o, size_t osz);
 static void do_first_per_user_launchd_hack(void);
+static void simulate_pid1_crash(void);
+
 void eliminate_double_reboot(void);
 
 /* For Jetsam. */
@@ -611,6 +617,7 @@
 /* process wide globals */
 mach_port_t inherited_bootstrap_port;
 jobmgr_t root_jobmgr;
+bool g_shutdown_debugging = false;
 
 void
 job_ignore(job_t j)
@@ -721,7 +728,7 @@
 		job_assumes(j, runtime_kill(j->p, SIGTERM) != -1);
 
 		if (timeout) {
-			j->sampled = !do_sample;
+			j->sampling_complete = !do_sample;
 			job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
 						EV_ADD|EV_ONESHOT, NOTE_SECONDS, timeout, j) != -1);
 		}
@@ -2504,6 +2511,9 @@
 
 	if (j->anonymous) {
 		total_anon_children--;
+		if( j->migratory ) {
+			runtime_del_ref();
+		}
 	} else {
 		runtime_del_ref();
 		total_children--;
@@ -2517,7 +2527,7 @@
 	}
 
 	if( j->pending_sample ) {
-		job_log(j, LOG_NOTICE | LOG_CONSOLE, "Job exited before we could sample it.");
+		job_log(j, LOG_DEBUG | LOG_CONSOLE, "Job exited before we could sample it.");
 		STAILQ_REMOVE(&j->mgr->pending_samples, j, job_s, pending_samples_sle);
 		j->pending_sample = false;
 	}
@@ -2605,7 +2615,7 @@
 	j->last_exit_status = status;
 	j->sent_signal_time = 0;
 	j->sent_sigkill = false;
-	j->sampled = false;
+	j->sampling_complete = false;
 	j->sent_kill_via_shmem = false;
 	j->lastlookup = NULL;
 	j->lastlookup_gennum = 0;
@@ -2655,12 +2665,12 @@
 	
 	/* Dequeue the next in line. */
 	job_t j = STAILQ_FIRST(&jm->pending_samples);
-	if( j->sample_pid ) {
+	if( j->is_being_sampled ) {
 		job_log(j, LOG_DEBUG | LOG_CONSOLE, "Sampling is in progress. Not dequeuing next job.");
 		return;
 	}
 
-	if (j->sampled || j->per_user) {
+	if (j->sampling_complete || j->per_user) {
 		return;
 	}
 
@@ -2700,7 +2710,7 @@
 			STAILQ_REMOVE(&jm->pending_samples, j, job_s, pending_samples_sle);
 			jobmgr_dequeue_next_sample(jm);
 		} else {
-			j->sample_pid = sp;
+			j->tracing_pid = sp;
 
 			/* Let us know when sample is done. ONESHOT is implicit if we're just interested in NOTE_EXIT. */
 			job_assumes(j, kevent_mod(sp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, j) != -1);
@@ -2740,7 +2750,8 @@
 			/* Let us know when sample is done. ONESHOT is implicit if we're just interested in NOTE_EXIT. */
 			if( job_assumes(j, (r = kevent_mod(sp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, j)) != -1) ) {
 				if( job_assumes(j, write(execpair[0], &sp, sizeof(sp)) == sizeof(sp)) ) {
-					j->sample_pid = sp;
+					j->tracing_pid = sp;
+					j->is_being_sampled = true;
 				} else {
 					job_assumes(j, kevent_mod(sp, EVFILT_PROC, EV_DELETE, 0, 0, NULL) != -1);
 					job_assumes(j, runtime_kill(sp, SIGKILL) != -1);
@@ -2767,7 +2778,7 @@
 		if( r == -1 ) {
 			job_log(j, LOG_ERR | LOG_CONSOLE, "Sampling for job failed!");
 			STAILQ_REMOVE(&jm->pending_samples, j, job_s, pending_samples_sle);
-			j->sampled = true;
+			j->sampling_complete = true;
 			jobmgr_dequeue_next_sample(jm);
 		} else {
 			job_log(j, LOG_DEBUG | LOG_CONSOLE, "Sampling job (sample PID: %i, file: %s).", sp, j->mgr->sample_log_file);
@@ -2775,7 +2786,7 @@
 	#endif
 	} else {
 		STAILQ_REMOVE(&jm->pending_samples, j, job_s, pending_samples_sle);
-		j->sampled = true;
+		j->sampling_complete = true;
 	}
 	
 	j->pending_sample = false;
@@ -2814,7 +2825,8 @@
 		if (job_useless(j)) {
 			job_remove(j, false);
 			return NULL;
-		} else if (kickstart || job_keepalive(j)) {
+		} 
+		if (kickstart || job_keepalive(j)) {
 			job_log(j, LOG_DEBUG, "Starting job (kickstart = %s)", kickstart ? "true" : "false");
 			job_start(j);
 		} else {
@@ -2867,8 +2879,10 @@
 	if (unlikely(rsz == 0)) {
 		job_log(j, LOG_DEBUG, "Standard out/error pipe closed");
 		close_log_redir = true;
-	} else if (!job_assumes(j, rsz != -1 && errno != EAGAIN)) {
-		close_log_redir = true;
+	} else if (rsz == -1) {
+		if( !job_assumes(j, errno == EAGAIN) ) {
+			close_log_redir = true;
+		}
 	} else {
 		buf[rsz] = '\0';
 
@@ -2950,42 +2964,44 @@
 }
 
 void
-job_reap_sample(job_t j)
+job_cleanup_after_tracer(job_t j)
 {
-	int wstatus = 0;
-	
-	if (!job_assumes(j, waitpid(j->sample_pid, &wstatus, 0) != -1)) {
-		goto out;
-	}
-
-	job_assumes(j, WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0);
-	
-out:
-	if( j->kill_after_sample ) {
-		if (unlikely(j->debug_before_kill)) {
-			job_log(j, LOG_NOTICE, "Exit timeout elapsed. Entering the kernel debugger");
-			job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == KERN_SUCCESS);
+	jobmgr_t jm = NULL;
+	if( j->is_being_sampled ) {
+		int wstatus = 0;
+		job_log(j, LOG_DEBUG | LOG_CONSOLE, "sample[%i] finished with job.", j->tracing_pid);
+		if( job_assumes(j, waitpid(j->tracing_pid, &wstatus, 0) != -1) ) {
+			job_assumes(j, WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0);
 		}
+		STAILQ_REMOVE(&j->mgr->pending_samples, j, job_s, pending_samples_sle);
 		
-		job_log(j, LOG_NOTICE, "Killing...");
-		job_kill(j);
+		if( j->kill_after_sample ) {
+			if (unlikely(j->debug_before_kill)) {
+				job_log(j, LOG_NOTICE, "Exit timeout elapsed. Entering the kernel debugger");
+				job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == KERN_SUCCESS);
+			}
+			
+			job_log(j, LOG_NOTICE, "Killing...");
+			job_kill(j);
+		}
+		j->sampling_complete = true;
+		j->is_being_sampled = false;
+		jm = j->mgr;
 	}
 
-	job_log(j, LOG_DEBUG | LOG_CONSOLE, "sample[%i] finished with job.", j->sample_pid);
-	j->sample_pid = 0;
-	j->sampled = true;
-	STAILQ_REMOVE(&j->mgr->pending_samples, j, job_s, pending_samples_sle);
-	
-	if( j->reap_after_sample ) {
-		job_log(j, LOG_DEBUG | LOG_CONSOLE, "Reaping job now that sample is done.");
+	j->tracing_pid = 0;
+	if( j->reap_after_trace ) {
+		job_log(j, LOG_DEBUG | LOG_CONSOLE, "Reaping job now that attached tracer is gone.");
 		struct kevent kev;
-		EV_SET(&kev, 1, 0, 0, NOTE_EXIT, 0, 0);
+		EV_SET(&kev, j->p, 0, 0, NOTE_EXIT, 0, 0);
 		
 		/* Fake a kevent to keep our logic consistent. */
 		job_callback_proc(j, &kev);
 	}
 	
-	jobmgr_dequeue_next_sample(j->mgr);
+	if( jm ) {
+		jobmgr_dequeue_next_sample(jm);
+	}
 }
 
 void
@@ -2994,19 +3010,46 @@
 	bool program_changed = false;
 	int fflags = kev->fflags;
 	
-	if( j->sample_pid == (pid_t)kev->ident ) {
-		job_assumes(j, (fflags & NOTE_EXIT) != 0);
+	if( fflags & NOTE_EXIT ) {
+		if( j->p == (pid_t)kev->ident && !j->anonymous && !j->is_being_sampled ) {
+			int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, j->p };
+			struct kinfo_proc kp;
+			size_t len = sizeof(kp);
+			
+			/* Sometimes, the kernel says it succeeded but really didn't. */
+			if( job_assumes(j, sysctl(mib, 4, &kp, &len, NULL, 0) != -1) && len == sizeof(kp) ) {
+				if( !job_assumes(j, kp.kp_eproc.e_ppid == getpid()) ) {
+					/* Someone has attached to the process with ptrace(). There's a race here. 
+					 * If we determine that we are not the parent process and then fail to attach 
+					 * a kevent to the parent PID (who is probably using ptrace()), we can take that as an
+					 * indication that the parent exited between sysctl(3) and kevent_mod(). The
+					 * reparenting of the PID should be atomic to us, so in that case, we reap the
+					 * job as normal.
+					 *
+					 * Otherwise, we wait for the death of the parent tracer and then reap, just as we
+					 * would if a job died while we were sampling it at shutdown.
+					 */
+					if( job_assumes(j, kevent_mod(kp.kp_eproc.e_ppid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, j) != -1) ) {
+						j->tracing_pid = kp.kp_eproc.e_ppid;
+						j->reap_after_trace = true;
+						return;
+					}
+				}
+			}
+		} else if( !j->anonymous ) {
+			if( j->tracing_pid == (pid_t)kev->ident ) {
+				job_cleanup_after_tracer(j);
+				
+				return;
+			} else if( j->tracing_pid && !j->reap_after_trace ) {
+				/* The job exited before our sample completed. */
+				job_log(j, LOG_NOTICE | LOG_CONSOLE, "Job has exited. Will reap after tracing PID %i exits.", j->tracing_pid);
+				j->reap_after_trace = true;
+				return;
+			}
+		}
+	}
 		
-		job_reap_sample(j);
-		
-		return;
-	} else if( j->sample_pid && !j->reap_after_sample ) {
-		/* The job exited before our sample completed. */
-		job_log(j, LOG_NOTICE | LOG_CONSOLE, "Job has exited. Will reap after sample[%i] is complete.", j->sample_pid);
-		j->reap_after_sample = true;
-		return;
-	}
-	
 	if (fflags & NOTE_EXEC) {
 		program_changed = true;
 
@@ -3082,7 +3125,7 @@
 		 *    with the long SIGKILL
 		 */
 		
-		bool was_is_or_will_be_sampled = ( j->sampled || j->sample_pid || j->pending_sample );
+		bool was_is_or_will_be_sampled = ( j->sampling_complete || j->is_being_sampled || j->pending_sample );
 		bool should_enqueue = ( !was_is_or_will_be_sampled && do_apple_internal_logging );
 		
 		if (j->sent_sigkill) {
@@ -3106,12 +3149,12 @@
 			j->pending_sample = true;
 			jobmgr_dequeue_next_sample(j->mgr);
 		} else {
-			if( do_apple_internal_logging && !j->sampled ) {
-				if( j->sample_pid || j->pending_sample ) {
+			if( do_apple_internal_logging && !j->sampling_complete ) {
+				if( j->is_being_sampled || j->pending_sample ) {
 					char pidstr[24] = { 0 };
-					snprintf(pidstr, sizeof(pidstr), "[%i] ", j->sample_pid);
+					snprintf(pidstr, sizeof(pidstr), "[%i] ", j->tracing_pid);
 					
-					job_log(j, LOG_DEBUG | LOG_CONSOLE, "Exit timeout elapsed (%u seconds). Will kill after sample%shas completed.", j->exit_timeout, j->sample_pid ? pidstr : " ");
+					job_log(j, LOG_DEBUG | LOG_CONSOLE, "Exit timeout elapsed (%u seconds). Will kill after sample%shas completed.", j->exit_timeout, j->tracing_pid ? pidstr : " ");
 					j->kill_after_sample = true;
 				} else {
 					job_log(j, LOG_DEBUG | LOG_CONSOLE, "Exit timeout elapsed (%u seconds). Will sample and then kill.", j->exit_timeout);
@@ -3347,11 +3390,19 @@
 
 		job_log(j, LOG_DEBUG, "Started as PID: %u", c);
 
+		j->checkedin = false;
 		j->start_pending = false;
 		j->reaped = false;
 		j->crashed = false;
 		j->stopped = false;
+		if( j->needs_kickoff ) {
+			j->needs_kickoff = false;
 			
+			if( SLIST_EMPTY(&j->semaphores) ) {
+				j->ondemand = false;
+			}
+		}
+		
 		runtime_add_ref();
 		total_children++;
 		LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
@@ -4233,8 +4284,27 @@
 	/* See 5321044 for why we do the do-while loop and 5415523 for why ENOENT is checked */
 	do {
 		if (si->fd == -1) {
-			if ((si->fd = _fd(open(si->what, O_EVTONLY|O_NOCTTY))) == -1) {
-				si->watching_parent = job_assumes(j, (si->fd = _fd(open(parentdir, O_EVTONLY|O_NOCTTY))) != -1);
+			struct stat sb;
+			if( stat(si->what, &sb) == 0 ) {
+				/* If we're watching a character or block device, only watch the parent directory. 
+				 * See rdar://problem/6489900 for the gory details. Basically, holding an open file
+				 * descriptor to a devnode could end up (a) blocking us on open(2) until someone else
+				 * open(2)s the file (like a character device that waits for a carrier signal) or 
+				 * (b) preventing other processes from obtaining an exclusive lock on the file, even
+				 * though we're opening it with O_EVTONLY.
+				 *
+				 * The main point of contention is that O_EVTONLY doesn't actually mean "event only".
+				 * It means "Don't prevent unmounts of this descriptor's volume". We work around this
+				 * for dev nodes by only watching the parent directory and stat(2)ing our desired file
+				 * each time the parent changes to see if it appeared or disappeared.
+				 */
+				if( S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode) ) {
+					si->fd = _fd(open(si->what, O_EVTONLY | O_NOCTTY | O_NONBLOCK));
+				}
+			}
+			
+			if( si->fd == -1 ) {
+				si->watching_parent = job_assumes(j, (si->fd = _fd(open(parentdir, O_EVTONLY | O_NOCTTY | O_NONBLOCK))) != -1);
 			} else {
 				si->watching_parent = false;
 			}
@@ -4656,7 +4726,7 @@
 	if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) != 0 ) {
 		envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env, false);
 	} else {
-		job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
+		job_log(j, LOG_DEBUG, "Ignoring reserved environmental variable: %s", key);
 	}
 }
 
@@ -4823,6 +4893,11 @@
 		return false;
 	}
 
+	if( unlikely(j->needs_kickoff) ) {
+		job_log(j, LOG_DEBUG, "KeepAlive check: Job needs to be kicked off on-demand before KeepAlive sets in.");
+		return false;
+	}
+
 	if (j->start_pending) {
 		job_log(j, LOG_DEBUG, "KeepAlive check: Pent-up non-IPC launch criteria.");
 		return true;
@@ -5256,17 +5331,24 @@
 				job_log(ji, LOG_DEBUG, "Examining...");
 			}
 			
-			if( !(ji->hopefully_exits_first || ji->hopefully_exits_last) && !ji->anonymous ) {
-				bool active = job_active(ji);
-				if( active && !ji->stopped ) {
-					job_stop(ji);
-					
-					/* We may have sent SIGKILL to the job in job_stop(). */
-					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
-				} else if( ji->stopped ) {
-					unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
-				} else if( !active ) {
-					job_remove(ji, false);
+			if( !(ji->hopefully_exits_first || ji->hopefully_exits_last) ) {
+				if( !ji->anonymous ) {
+					bool active = job_active(ji);
+					if( active && !ji->stopped ) {
+						job_stop(ji);
+						
+						/* We may have sent SIGKILL to the job in job_stop(). */
+						unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+					} else if( ji->stopped ) {
+						unkilled_cnt += !ji->sent_sigkill ? 1 : 0;
+					} else if( !active ) {
+						job_remove(ji, false);
+					}
+				} else if( ji->migratory && jm->parentmgr ) {
+					/* If a job has migrated into a sub-bootstrap, we want to 
+					 * keep the job manager around as long as the job is there.
+					 */
+					unkilled_cnt++;
 				}
 			}
 		}
@@ -5292,8 +5374,12 @@
 		return _jm;
 	}
 	
+	if( jm == root_jobmgr ) {
+		simulate_pid1_crash();
+	}
+	
 	static bool killed_stray_jobs = false;
-	if( !killed_stray_jobs ) {
+	if( !killed_stray_jobs && pid1_magic && jm == root_jobmgr ) {
 		jobmgr_log_stray_children(jm, true);
 		killed_stray_jobs = true;
 	}
@@ -5359,7 +5445,11 @@
 		
 		job_t ji = NULL;
 		LIST_FOREACH( ji, &jm->jobs, sle ) {
-			if( !job_assumes(ji, (ji->anonymous || ji->sent_sigkill) && ji->p) ) {
+			if( pid1_magic && !jm->parentmgr ) {
+				if( (ji->anonymous || ji->sent_sigkill) && ji->p ) {
+					job_log(ji, LOG_NOTICE | LOG_CONSOLE, "Job should be gone but is not.");
+				}
+			} else if( !pid1_magic && !ji->anonymous ) {
 				job_log(ji, LOG_NOTICE | LOG_CONSOLE, "Job should be gone but is not.");
 			}
 		}
@@ -5586,9 +5676,6 @@
 		}
 	}
 
-	jmr->killed_hopefully_first_jobs	= false;
-	jmr->killed_normal_jobs 			= false;
-	jmr->killed_hopefully_last_jobs 	= false;
 	STAILQ_INIT(&jmr->pending_samples);
 
 	jobmgr_log(jmr, LOG_DEBUG, "Created job manager%s%s", jm ? " with parent: " : ".", jm ? jm->name : "");
@@ -5621,6 +5708,7 @@
 	bootstrapper = job_new(jm, thelabel, NULL, bootstrap_tool);
 	
 	if (jobmgr_assumes(jm, bootstrapper != NULL) && (jm->parentmgr || getuid())) {
+		bootstrapper->is_bootstrapper = true;
 		char buf[100];
 
 		/* <rdar://problem/5042202> launchd-201: can't ssh in with AFP OD account (hangs) */
@@ -5629,6 +5717,7 @@
 		bootstrapper->weird_bootstrap = true;
 		jobmgr_assumes(jm, job_setup_machport(bootstrapper));
 	} else if( bootstrapper && strncmp(session_type, VPROCMGR_SESSION_SYSTEM, sizeof(VPROCMGR_SESSION_SYSTEM)) == 0 ) {
+		bootstrapper->is_bootstrapper = true;
 		if( jobmgr_assumes(jm, pid1_magic) ) {
 			/* Have our system bootstrapper print out to the console. */
 			bootstrapper->stdoutpath = strdup(_PATH_CONSOLE);
@@ -6064,8 +6153,6 @@
 	if (si->fd != -1) {
 		job_assumes(j, runtime_close(si->fd) != -1);
 	}
-
-	job_log(j, LOG_DEBUG, "Removing semaphore item... (what = %s, why = %u)", si->what, si->why);
 	
 	/* We'll need to rethink this if it ever becomes possible to dynamically add or remove semaphores. */
 	if( (si->why == OTHER_JOB_ENABLED || si->why == OTHER_JOB_DISABLED) && j->nosy ) {
@@ -6103,6 +6190,8 @@
 			why = launch_data_get_bool(obj) ? SUCCESSFUL_EXIT : FAILED_EXIT;
 			semaphoreitem_new(j, why, NULL);
 			j->start_pending = true;
+		} else if( strcasecmp(key, LAUNCH_JOBKEY_KEEPALIVE_AFTERINITIALDEMAND) == 0 ) {
+			j->needs_kickoff = launch_data_get_bool(obj);
 		} else {
 			job_assumes(j, false);
 		}
@@ -6577,6 +6666,17 @@
 		}
 		launch_data_free(output_obj);
 		break;
+	case VPROC_GSK_MGR_NAME:
+		if( !job_assumes(j, (output_obj = launch_data_new_string(j->mgr->name)) != NULL) ) {
+			goto out_bad;
+		}
+		packed_size = launch_data_pack(output_obj, (void *)*outval, *outvalCnt, NULL, NULL);
+		if (!job_assumes(j, packed_size != 0)) {
+			goto out_bad;
+		}
+			
+		launch_data_free(output_obj);
+		break;
 	case 0:
 		mig_deallocate(*outval, *outvalCnt);
 		*outval = 0;
@@ -6700,6 +6800,7 @@
 		j->abandon_pg = (bool)inval;
 		break;
 	case VPROC_GSK_GLOBAL_ON_DEMAND:
+		job_log(j, LOG_NOTICE, "Job is setting global on-demand mode to %s (j->forced_peers_to_demand_mode = %s)", (bool)inval ? "true" : "false", j->forced_peers_to_demand_mode ? "true" : "false");
 		kr = job_set_global_on_demand(j, (bool)inval) ? 0 : 1;
 		break;
 	case VPROC_GSK_BASIC_KEEPALIVE:
@@ -6778,6 +6879,12 @@
 	case VPROC_GSK_WAITFORDEBUGGER:
 		j->wait4debugger_oneshot = inval;
 		break;
+	case VPROC_GSK_SHUTDOWN_DEBUGGING:
+		if( pid1_magic && j->is_bootstrapper ) {
+			runtime_syslog(LOG_NOTICE | LOG_CONSOLE, "*** Shutdown debugging is enabled. ***");
+			g_shutdown_debugging = true;
+		}
+		break;
 	case 0:
 		break;
 	default:
@@ -7010,10 +7117,9 @@
 			ms->isActive = true;
 			ms->recv = false;
 		}
-		job_checkin(j);
 
 		if (!(j->anonymous || j->legacy_LS_job || j->legacy_mach_job)) {
-			job_log(j, LOG_NOTICE, "Please add the following service to the configuration file for this job: %s", servicename);
+			job_log(j, LOG_APPLEONLY, "Please add the following service to the configuration file for this job: %s", servicename);
 		}
 	} else {
 		if (unlikely((jo = machservice_job(ms)) != j)) {
@@ -7033,6 +7139,7 @@
 		
 	}
 
+	job_checkin(j);
 	machservice_request_notifications(ms);
 
 	job_log(j, LOG_INFO, "Check-in of service: %s", servicename);
@@ -7206,10 +7313,12 @@
 }
 
 kern_return_t
-job_mig_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cnt,
-		bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt)
+job_mig_info(job_t j,	name_array_t *servicenamesp, unsigned int *servicenames_cnt,
+						name_array_t *servicejobsp, unsigned int *servicejobs_cnt,
+						bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt)
 {
 	name_array_t service_names = NULL;
+	name_array_t service_jobs = NULL;
 	bootstrap_status_array_t service_actives = NULL;
 	unsigned int cnt = 0, cnt2 = 0;
 	jobmgr_t jm;
@@ -7237,6 +7346,11 @@
 		goto out_bad;
 	}
 
+	mig_allocate((vm_address_t *)&service_jobs, cnt * sizeof(service_jobs[0]));
+	if (!job_assumes(j, service_jobs != NULL)) {
+		goto out_bad;
+	}
+
 	mig_allocate((vm_address_t *)&service_actives, cnt * sizeof(service_actives[0]));
 	if (!job_assumes(j, service_actives != NULL)) {
 		goto out_bad;
@@ -7246,6 +7360,7 @@
 		LIST_FOREACH( msi, &jm->ms_hash[i], name_hash_sle ) {
 			if( !msi->per_pid ) {
 				strlcpy(service_names[cnt2], machservice_name(msi), sizeof(service_names[0]));
+				strlcpy(service_jobs[cnt2], msi->job->label, sizeof(service_jobs[0]));
 				service_actives[cnt2] = machservice_status(msi);
 				cnt2++;
 			}
@@ -7256,8 +7371,9 @@
 
 out:
 	*servicenamesp = service_names;
+	*servicejobsp = service_jobs;
 	*serviceactivesp = service_actives;
-	*servicenames_cnt = *serviceactives_cnt = cnt;
+	*servicenames_cnt = *servicejobs_cnt = *serviceactives_cnt = cnt;
 
 	return BOOTSTRAP_SUCCESS;
 
@@ -7265,6 +7381,9 @@
 	if (service_names) {
 		mig_deallocate((vm_address_t)service_names, cnt * sizeof(service_names[0]));
 	}
+	if (service_jobs) {
+		mig_deallocate((vm_address_t)service_jobs, cnt * sizeof(service_jobs[0]));
+	}
 	if (service_actives) {
 		mig_deallocate((vm_address_t)service_actives, cnt * sizeof(service_actives[0]));
 	}
@@ -7522,7 +7641,7 @@
 }
 
 kern_return_t
-job_mig_move_subset(job_t j, mach_port_t target_subset, name_t session_type)
+job_mig_move_subset(job_t j, mach_port_t target_subset, name_t session_type, uint64_t flags)
 {
 	mach_msg_type_number_t l2l_i, l2l_port_cnt = 0;
 	mach_port_array_t l2l_ports = NULL;
@@ -7601,6 +7720,24 @@
 		goto out;
 	}
 
+	/* This is a hack. We should be doing this in jobmgr_new(), but since we're in the middle of
+	 * processing an IPC request, we'll do this action before the new job manager can get any IPC
+	 * requests. This serialization is guaranteed since we are single-threaded in that respect.
+	 */
+	if( flags & LAUNCH_GLOBAL_ON_DEMAND ) {
+		/* This is so awful. */
+		mach_port_t mp = MACH_PORT_NULL;
+		name_t target_name;
+		strlcpy(target_name, jmr->name, sizeof(target_name));
+		
+		kr = job_mig_switch_to_session(j, MACH_PORT_NULL, target_name, &mp);
+		if( job_assumes(j, kr == KERN_SUCCESS) ) {
+			job_set_global_on_demand(j, true);
+		} else {
+			job_log(j, LOG_WARNING, "Can't set global on-demand mode, unable to preemptively switch to %s job manager.", jmr->name);
+		}
+	}
+	
 	for (l2l_i = 0; l2l_i < l2l_port_cnt; l2l_i++) {
 		launch_data_t tmp, obj_at_idx;
 		struct machservice *ms;
@@ -7653,6 +7790,53 @@
 }
 
 kern_return_t
+job_mig_init_session(job_t j, name_t session_type)
+{
+	job_t j2;
+	
+	kern_return_t kr = BOOTSTRAP_NO_MEMORY;
+	if (j->mgr->session_initialized) {
+		job_log(j, LOG_ERR, "Tried to initialize an already setup session!");
+		kr = BOOTSTRAP_NOT_PRIVILEGED;
+	} else if (strcmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
+		jobmgr_t jmi;
+		
+		/*
+		 * 5330262
+		 *
+		 * We're working around LoginWindow and the WindowServer.
+		 *
+		 * In practice, there is only one LoginWindow session. Unfortunately, for certain
+		 * scenarios, the WindowServer spawns loginwindow, and in those cases, it frequently
+		 * spawns a replacement loginwindow session before cleaning up the previous one.
+		 *
+		 * We're going to use the creation of a new LoginWindow context as a clue that the
+		 * previous LoginWindow context is on the way out and therefore we should just
+		 * kick-start the shutdown of it.
+		 */
+		
+		SLIST_FOREACH(jmi, &root_jobmgr->submgrs, sle) {
+			if (unlikely(jmi->shutting_down)) {
+				continue;
+			} else if (strcasecmp(jmi->name, session_type) == 0) {
+				jobmgr_shutdown(jmi);
+				break;
+			}
+		}
+	}
+	
+	jobmgr_log(j->mgr, LOG_DEBUG, "Initializing: %s", session_type);
+	strcpy(j->mgr->name_init, session_type);
+	
+	if (job_assumes(j, (j2 = jobmgr_init_session(j->mgr, session_type, false)))) {
+		job_assumes(j, job_dispatch(j2, true));
+		kr = BOOTSTRAP_SUCCESS;
+	}
+	
+	return kr;
+}
+
+kern_return_t
 job_mig_switch_to_session(job_t j, mach_port_t requestor_port, name_t session_name, mach_port_t *new_bsport)
 {
 	job_log(j, LOG_NOTICE, "Job wants to move to %s session.", session_name);
@@ -7709,8 +7893,17 @@
 	}
 	
 	j->mgr = target_jm;
+	j->migratory = true;
 	*new_bsport = target_jm->jm_port;
 	
+	/* Anonymous jobs which move around are particularly interesting to us, so we want to
+	 * stick around while they're still around.
+	 * For example, login calls into the PAM launchd module, which moves the process into
+	 * the StandardIO session by default. So we'll hold a reference on that job to prevent
+	 * ourselves from going away.
+	 */
+	runtime_add_ref();
+	
 	return KERN_SUCCESS;
 }
 
@@ -8286,6 +8479,15 @@
 }
 
 static void
+simulate_pid1_crash(void)
+{
+	if( pid1_magic && g_simulate_pid1_crash ) {
+		runtime_syslog(LOG_EMERG | LOG_CONSOLE, "About to simulate a crash.");
+		raise(SIGSEGV);
+	}
+}
+
+static void
 jetsam_priority_from_job(job_t j, bool front, jetsam_priority_entry_t *jp)
 {
 	jp->pid = j->p;

Modified: trunk/launchd/src/launchd_runtime.c
===================================================================
--- trunk/launchd/src/launchd_runtime.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd_runtime.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -132,6 +132,8 @@
 bool low_level_debug;
 bool g_force_old_kill_path = false;
 bool g_flat_mach_namespace = true;
+bool g_simulate_pid1_crash = false;
+bool g_use_gmalloc = false;
 
 mach_port_t
 runtime_get_kernel_port(void)
@@ -1099,6 +1101,7 @@
 		case MACH_RCV_TIMED_OUT:
 			if (to != MACH_MSG_TIMEOUT_NONE) {
 				if (busy_cnt == 0) {
+					runtime_syslog(LOG_NOTICE, "Idle exiting. (This message will be removed before shipping.)");
 					launchd_shutdown();
 				} else if (runtime_idle_callback) {
 					runtime_idle_callback();
@@ -1175,7 +1178,6 @@
 				tmp_options |= MACH_SEND_TIMEOUT;
 			}
 		}
-
 	}
 }
 
@@ -1458,6 +1460,14 @@
 	}
 
 	for (lm_walk = (struct logmsg_s *)inval; (data_left > 0) && (lm_walk->obj_sz <= data_left); lm_walk = ((void *)lm_walk + lm_walk->obj_sz)) {
+		/* malloc() does not return NULL if you ask it for an allocation of size 0.
+		 * It will return a valid pointer that can be passed to free(). If we don't
+		 * do this check, we'll wind up corrupting our heap in the subsequent 
+		 * assignments.
+		 */
+		if( !launchd_assumes(lm_walk->obj_sz > 0) ) {
+			continue;
+		}
 		if (!launchd_assumes(lm = malloc(lm_walk->obj_sz))) {
 			continue;
 		}
@@ -1746,4 +1756,12 @@
 	if( !pid1_magic && stat("/var/db/.launchd_no_flat_per_user_namespace", &sb) == 0 ) {
 		g_flat_mach_namespace = false;
 	}
+	
+	if( pid1_magic && stat("/var/db/.launchd_simulate_pid1_crash", &sb) == 0 ) {
+		g_simulate_pid1_crash = true;
+	}
+	
+	if( pid1_magic && stat("/var/db/.launchd_use_gmalloc", &sb) == 0 ) {
+		g_use_gmalloc = true;
+	}
 }

Modified: trunk/launchd/src/launchd_runtime.h
===================================================================
--- trunk/launchd/src/launchd_runtime.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd_runtime.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -101,6 +101,8 @@
 extern bool pid1_magic;
 extern bool low_level_debug;
 extern char g_username[128];
+extern bool g_shutdown_debugging;
+extern bool g_use_gmalloc;
 
 mach_port_t runtime_get_kernel_port(void);
 extern boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply);

Modified: trunk/launchd/src/launchd_unix_ipc.c
===================================================================
--- trunk/launchd/src/launchd_unix_ipc.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/launchd_unix_ipc.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -235,9 +235,15 @@
 	}
 }
 
-static void set_user_env(launch_data_t obj, const char *key, void *context __attribute__((unused)))
+static void 
+set_user_env(launch_data_t obj, const char *key, void *context __attribute__((unused)))
 {
-	setenv(key, launch_data_get_string(obj), 1);
+	const char *v = launch_data_get_string(obj);
+	if( v ) {
+		setenv(key, v, 1);
+	} else {
+		runtime_syslog(LOG_WARNING, "Attempt to set NULL environment variable: %s (type = %d)", key, launch_data_get_type(obj));
+	}
 }
 
 void

Modified: trunk/launchd/src/libbootstrap.c
===================================================================
--- trunk/launchd/src/libbootstrap.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/libbootstrap.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -274,11 +274,11 @@
 
 kern_return_t
 bootstrap_info(mach_port_t bp,
-		name_array_t *service_names, mach_msg_type_number_t *service_namesCnt,
-		bootstrap_status_array_t *service_active, mach_msg_type_number_t *service_activeCnt)
+			   name_array_t *service_names, mach_msg_type_number_t *service_namesCnt,
+			   name_array_t *service_jobs, mach_msg_type_number_t *service_jobsCnt,
+			   bootstrap_status_array_t *service_active, mach_msg_type_number_t *service_activeCnt)
 {
-	return vproc_mig_info(bp, service_names, service_namesCnt,
-			service_active, service_activeCnt);
+	return vproc_mig_info(bp, service_names, service_namesCnt, service_jobs, service_jobsCnt, service_active, service_activeCnt);
 }
 
 const char *

Modified: trunk/launchd/src/liblaunch.c
===================================================================
--- trunk/launchd/src/liblaunch.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/liblaunch.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -1267,17 +1267,18 @@
 void
 load_launchd_jobs_at_loginwindow_prompt(int flags __attribute__((unused)), ...)
 {
-	_vprocmgr_init("LoginWindow");
+	_vprocmgr_init(VPROCMGR_SESSION_LOGINWINDOW);
 }
 
 pid_t
-create_and_switch_to_per_session_launchd(const char *login __attribute__((unused)), int flags __attribute__((unused)), ...)
+create_and_switch_to_per_session_launchd(const char *login __attribute__((unused)), int flags, ...)
 {
 	uid_t target_user = geteuid() ? geteuid() : getuid();
-
-	if (_vprocmgr_move_subset_to_user(target_user, "Aqua")) {
+	if (_vprocmgr_move_subset_to_user(target_user, VPROCMGR_SESSION_AQUA, flags)) {
 		return -1;
 	}
 
 	return 1;
 }
+
+

Modified: trunk/launchd/src/libvproc.c
===================================================================
--- trunk/launchd/src/libvproc.c	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/libvproc.c	2009-01-29 22:46:14 UTC (rev 23790)
@@ -189,8 +189,7 @@
 		
 		if (unlikely(old < 0)) {
 			if (vproc_shmem->vp_shmem_flags & VPROC_SHMEM_EXITING) {
-				raise(SIGKILL);
-				__crashreporter_info__ = "raise(SIGKILL) failed";
+				_exit(0);
 			} else {
 				__crashreporter_info__ = "Unbalanced: vproc_transaction_begin()";
 			}
@@ -293,8 +292,7 @@
 	runtime_ktrace(RTKT_VPROC_TRANSACTION_DECREMENT, newval, 0, 0);
 	if (unlikely(newval < 0)) {
 		if (vproc_shmem->vp_shmem_flags & VPROC_SHMEM_EXITING) {
-			raise(SIGKILL);
-			__crashreporter_info__ = "raise(SIGKILL) failed";
+			_exit(0);
 		} else {
 			__crashreporter_info__ = "Unbalanced: vproc_transaction_end()";
 		}
@@ -412,16 +410,10 @@
 	return vproc_mig_post_fork_ping(bootstrap_port, mach_task_self()) == 0 ? NULL : _vproc_post_fork_ping;
 }
 
-static void
-setup_env_hack(const launch_data_t obj, const char *key, void *context __attribute__((unused)))
-{
-	setenv(key, launch_data_get_string(obj), 1);
-}
-
 vproc_err_t
 _vprocmgr_init(const char *session_type)
 {
-	if (vproc_mig_move_subset(bootstrap_port, MACH_PORT_NULL, (char *)session_type) == 0) {
+	if (vproc_mig_init_session(bootstrap_port, (char *)session_type) == 0) {
 		return NULL;
 	}
 
@@ -429,9 +421,8 @@
 }
 
 vproc_err_t
-_vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type)
+_vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type, uint64_t flags)
 {
-	launch_data_t output_obj;
 	kern_return_t kr = 0;
 	bool is_bkgd = (strcmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0);
 	int64_t ldpid, lduid;
@@ -466,7 +457,7 @@
 		mach_port_deallocate(mach_task_self(), bootstrap_port);
 		bootstrap_port = puc;
 	} else {
-		kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type);
+		kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type, flags);
 		mach_port_deallocate(mach_task_self(), puc);
 	}
 	
@@ -476,16 +467,6 @@
 		return (vproc_err_t)_vprocmgr_move_subset_to_user;
 	}
 
-	/* XXX We need to give 'nohup' a better API after Leopard ships */
-	if (getprogname() && strcmp(getprogname(), "nohup") != 0) {
-		if (vproc_swap_complex(NULL, VPROC_GSK_ENVIRONMENT, NULL, &output_obj) == NULL) {
-			if (launch_data_get_type(output_obj) == LAUNCH_DATA_DICTIONARY) {
-				launch_data_dict_iterate(output_obj, setup_env_hack, NULL);
-				launch_data_free(output_obj);
-			}
-		}
-	}
-
 	/* Don't do things like setting up the exception port if we're tainted. This is primarily for
 	 * loginwindow, which setuid(2)s to the logged-in user but still runs under the system Mach
 	 * bootstrap. So we want the system launchd to spawn a crash reporter to report loginwindow
@@ -502,7 +483,11 @@
 {
 	mach_port_t new_bsport = MACH_PORT_NULL;
 	kern_return_t kr = KERN_FAILURE;
-	if( (kr = vproc_mig_switch_to_session(bootstrap_port, mach_task_self(), (char *)target_session, &new_bsport)) != KERN_SUCCESS ) {
+	
+	mach_port_t tnp = MACH_PORT_NULL;
+	task_name_for_pid(mach_task_self(), getpid(), &tnp);
+	
+	if( (kr = vproc_mig_switch_to_session(bootstrap_port, tnp, (char *)target_session, &new_bsport)) != KERN_SUCCESS ) {
 		_vproc_log(LOG_NOTICE, "_vprocmgr_switch_to_session(): kr = 0x%x", kr);
 		return (vproc_err_t)_vprocmgr_switch_to_session;
 	}
@@ -930,6 +915,28 @@
 	return rval;
 }
 
+vproc_err_t
+vproc_swap_string(vproc_t vp, vproc_gsk_t key, const char *instr, char **outstr)
+{
+	launch_data_t instr_data = instr ? launch_data_new_string(instr) : NULL;
+	launch_data_t outstr_data = NULL;
+	
+	vproc_err_t verr = vproc_swap_complex(vp, key, instr_data, &outstr_data);
+	if( !verr && outstr ) {
+		if( launch_data_get_type(outstr_data) == LAUNCH_DATA_STRING ) {
+			*outstr = strdup(launch_data_get_string(outstr_data));
+		} else {
+			verr = (vproc_err_t)vproc_swap_string;
+		}
+		launch_data_free(outstr_data);
+	}
+	if( instr_data ) {
+		launch_data_free(instr_data);
+	}
+	
+	return verr;
+}
+
 void *
 reboot2(uint64_t flags)
 {

Modified: trunk/launchd/src/protocol_vproc.defs
===================================================================
--- trunk/launchd/src/protocol_vproc.defs	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/protocol_vproc.defs	2009-01-29 22:46:14 UTC (rev 23790)
@@ -88,6 +88,7 @@
 routine info(
 				__bs_port			: job_t;
 out				__service_names		: name_array_t, dealloc;
+out				__service_jobs		: name_array_t, dealloc;
 out				__service_active	: bootstrap_status_array_t, dealloc);
 
 routine subset(
@@ -145,7 +146,8 @@
 routine move_subset(
 				__bs_port			: job_t;
 				__target_port		: mach_port_t;
-				__sessiontype		: name_t);
+				__sessiontype		: name_t;
+				__sessionflags		: uint64_t);
 
 routine swap_complex(
 				__bs_port			: job_t;
@@ -203,3 +205,7 @@
 				__bs_port			: job_t;
 				__label				: name_t;
 out				__mp				: mach_port_make_send_t);
+
+routine init_session(
+				__bs_port			: job_t;
+				__session_name		: name_t);

Modified: trunk/launchd/src/vproc_internal.h
===================================================================
--- trunk/launchd/src/vproc_internal.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/vproc_internal.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -103,12 +103,13 @@
 
 
 kern_return_t
-bootstrap_info(
-		mach_port_t bp,
-		name_array_t *service_names,
-		mach_msg_type_number_t *service_namesCnt,
-		bootstrap_status_array_t *service_active,
-		mach_msg_type_number_t *service_activeCnt);
+bootstrap_info(mach_port_t bp,
+			   name_array_t *service_names,
+			   mach_msg_type_number_t *service_namesCnt,
+			   name_array_t *service_jobs,
+			   mach_msg_type_number_t *service_jobsCnt,
+			   bootstrap_status_array_t *service_active,
+			   mach_msg_type_number_t *service_activeCnt);
 
 #pragma GCC visibility pop
 

Modified: trunk/launchd/src/vproc_priv.h
===================================================================
--- trunk/launchd/src/vproc_priv.h	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd/src/vproc_priv.h	2009-01-29 22:46:14 UTC (rev 23790)
@@ -48,6 +48,7 @@
 	VPROC_GSK_MGR_UID,
 	VPROC_GSK_MGR_PID,
 	VPROC_GSK_IS_MANAGED,
+	VPROC_GSK_MGR_NAME,
 	VPROC_GSK_BASIC_KEEPALIVE,
 	VPROC_GSK_START_INTERVAL,
 	VPROC_GSK_IDLE_TIMEOUT,
@@ -60,6 +61,7 @@
 	VPROC_GSK_TRANSACTIONS_ENABLED,
 	VPROC_GSK_WEIRD_BOOTSTRAP,
 	VPROC_GSK_WAITFORDEBUGGER,
+	VPROC_GSK_SHUTDOWN_DEBUGGING,
 } vproc_gsk_t;
 
 typedef unsigned int vproc_flags_t;
@@ -72,6 +74,7 @@
 
 vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);
 vproc_err_t vproc_swap_complex(vproc_t vp, vproc_gsk_t key, launch_data_t inval, launch_data_t *outval);
+vproc_err_t vproc_swap_string(vproc_t vp, vproc_gsk_t key, const char *instr, char **outstr);
 
 vproc_err_t _vproc_get_last_exit_status(int *wstatus);
 vproc_err_t _vproc_set_global_on_demand(bool val);
@@ -94,7 +97,7 @@
 #define VPROCMGR_SESSION_STANDARDIO		"StandardIO"
 #define VPROCMGR_SESSION_SYSTEM			"System"
 
-vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type);
+vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, const char *session_type, uint64_t flags);
 vproc_err_t _vprocmgr_switch_to_session(const char *target_session, vproc_flags_t flags);
 vproc_err_t _vprocmgr_detach_from_console(vproc_flags_t flags);
 

Modified: trunk/launchd.xcodeproj/project.pbxproj
===================================================================
--- trunk/launchd.xcodeproj/project.pbxproj	2009-01-21 05:14:00 UTC (rev 23789)
+++ trunk/launchd.xcodeproj/project.pbxproj	2009-01-29 22:46:14 UTC (rev 23790)
@@ -547,8 +547,8 @@
 		FC59A0C80E8C8A4E00D41150 /* launchproxy */ = {
 			isa = PBXGroup;
 			children = (
+				FC59A0DB0E8C8A6900D41150 /* launchproxy.8 */,
 				FC59A0DA0E8C8A6900D41150 /* launchproxy.c */,
-				FC59A0DB0E8C8A6900D41150 /* launchproxy.8 */,
 			);
 			name = launchproxy;
 			sourceTree = "<group>";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090129/b848c021/attachment-0001.html>

From source_changes at macosforge.org  Thu Jan 29 14:46:48 2009
From: source_changes at macosforge.org (source_changes at macosforge.org)
Date: Thu, 29 Jan 2009 14:46:48 -0800 (PST)
Subject: [launchd-changes] [23791] tags/launchd-298/
Message-ID: <20090129224648.71C7DDC7A12@beta.macosforge.org>

Revision: 23791
          http://trac.macosforge.org/projects/launchd/changeset/23791
Author:   dsorresso at apple.com
Date:     2009-01-29 14:46:48 -0800 (Thu, 29 Jan 2009)
Log Message:
-----------
"Tagging launchd-298 from https://svn.macosforge.org/repository/launchd/trunk"

Added Paths:
-----------
    tags/launchd-298/


Property changes on: tags/launchd-298
___________________________________________________________________
Added: svn:ignore
   + build

Added: svn:mergeinfo
   + /branches/PR-5092682:23731-23742
/branches/PR-5898404:23681-23700
/branches/PR-5978442:23651-23701
/branches/PR-6132016:23719-23738
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20090129/124d3b9e/attachment.html>