February 2007 - launchd-changes - lists.macosforge.org

[23108] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 25 Feb '07

25 Feb '07

Revision: 23108 http://trac.macosforge.org/projects/launchd/changeset/23108 Author: zarzycki(a)apple.com Date: 2007-02-25 15:32:43 -0800 (Sun, 25 Feb 2007) Log Message: ----------- Be a little more greedy about when we stop the BootCache at boot up. Be a little more defensive against a shutdown or reboot shortly after boot up. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-23 22:57:41 UTC (rev 23107) +++ trunk/launchd/src/launchctl.c 2007-02-25 23:32:43 UTC (rev 23108) @@ -1237,16 +1237,25 @@ static void very_pid2_specific_bootstrap(bool sflag) { - struct timeval tvs, tve, tvd; int hnmib[] = { CTL_KERN, KERN_HOSTNAME }; struct group *tfp_gr; + struct kevent kev; + int kq; + do_sysversion_sysctl(); do_single_user_mode(sflag); - assumes(gettimeofday(&tvs, NULL) != -1); + assumes((kq = kqueue()) != -1); + EV_SET(&kev, 0, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 90, 0); + assumes(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); + assumes(signal(SIGTERM, SIG_IGN) != SIG_ERR); + + EV_SET(&kev, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, 0); + assumes(kevent(kq, &kev, 1, NULL, 0, NULL) != -1); + if (assumes((tfp_gr = getgrnam("procview")) != NULL)) { int tfp_r_mib[3] = { CTL_KERN, KERN_TFP, KERN_TFP_READ_GROUP }; gid_t tfp_r_gid = tfp_gr->gr_gid; @@ -1339,20 +1348,14 @@ _vproc_set_global_on_demand(false); - assumes(gettimeofday(&tve, NULL) != -1); - - timersub(&tve, &tvs, &tvd); - if (!path_check("/System/Library/LoginPlugins/BootCache.loginPlugin")) { - int remaining_sec = 60 - tvd.tv_sec; + assumes(kevent(kq, NULL, 0, &kev, 1, NULL) == 1); - if (remaining_sec > 0) { - sleep(remaining_sec); - } - const char *bcc_stop_tool[] = { "BootCacheControl", "stop", NULL }; assumes(fwexec(bcc_stop_tool, true) != -1); } + + assumes(close(kq) != -1); } int

1 0

[23107] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23107 http://trac.macosforge.org/projects/launchd/changeset/23107 Author: zarzycki(a)apple.com Date: 2007-02-23 14:57:41 -0800 (Fri, 23 Feb 2007) Log Message: ----------- Move some code to a better place. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-02-23 22:02:02 UTC (rev 23106) +++ trunk/launchd/src/launchctl.c 2007-02-23 22:57:41 UTC (rev 23107) @@ -205,8 +205,6 @@ { char *l; - do_sysversion_sysctl(); - istty = isatty(STDIN_FILENO); argc--, argv++; @@ -1243,6 +1241,8 @@ int hnmib[] = { CTL_KERN, KERN_HOSTNAME }; struct group *tfp_gr; + do_sysversion_sysctl(); + do_single_user_mode(sflag); assumes(gettimeofday(&tvs, NULL) != -1); @@ -2717,9 +2717,6 @@ /* <rdar://problem/4477682> ER: launchd should set kern.osversion very early in boot */ - if (getuid() != 0) - return; - if (sysctl(mib, 2, buf, &bufsz, NULL, 0) == -1) { fprintf(stderr, "sysctl(): %s\n", strerror(errno)); return;

1 0

[23106] tags/launchd-198/
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23106 http://trac.macosforge.org/projects/launchd/changeset/23106 Author: zarzycki(a)apple.com Date: 2007-02-23 14:02:02 -0800 (Fri, 23 Feb 2007) Log Message: ----------- "Tagging launchd-198 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-198/ Copied: tags/launchd-198 (from rev 23105, trunk)

1 0

[23105] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23105 http://trac.macosforge.org/projects/launchd/changeset/23105 Author: zarzycki(a)apple.com Date: 2007-02-23 11:44:35 -0800 (Fri, 23 Feb 2007) Log Message: ----------- <rdar://problem/4798263> Documentation of launchd.plist does not specify month is 0-11 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-23 17:40:11 UTC (rev 23104) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-23 19:44:35 UTC (rev 23105) @@ -2660,6 +2660,7 @@ } if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_MONTH))) { tmptm.tm_mon = launch_data_get_integer(tmp_k); + tmptm.tm_mon -= 1; /* 4798263 cron compatibility */ } return calendarinterval_new(j, &tmptm);

1 0

[23104] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23104 http://trac.macosforge.org/projects/launchd/changeset/23104 Author: zarzycki(a)apple.com Date: 2007-02-23 09:40:11 -0800 (Fri, 23 Feb 2007) Log Message: ----------- <rdar://problem/4657900> launchd plist doesn't respect soft resource limit on max files. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-23 16:53:43 UTC (rev 23103) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-23 17:40:11 UTC (rev 23104) @@ -2862,6 +2862,8 @@ return false; } + SLIST_INSERT_HEAD(&j->limits, li, sle); + li->which = w; }

1 0

[23103] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23103 http://trac.macosforge.org/projects/launchd/changeset/23103 Author: zarzycki(a)apple.com Date: 2007-02-23 08:53:43 -0800 (Fri, 23 Feb 2007) Log Message: ----------- More Logging. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-23 16:35:27 UTC (rev 23102) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-23 16:53:43 UTC (rev 23103) @@ -2256,8 +2256,7 @@ SLIST_FOREACH(li, &j->limits, sle) { struct rlimit rl; - if (getrlimit(li->which, &rl) == -1) { - job_log_error(j, LOG_WARNING, "getrlimit()"); + if (!job_assumes(j, getrlimit(li->which, &rl) != -1)) { continue; } @@ -2278,19 +2277,17 @@ } if (j->low_pri_io) { - if (setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, IOPOL_THROTTLE) == -1) { - job_log_error(j, LOG_WARNING, "setiopolicy_np()"); - } + job_assumes(j, setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, IOPOL_THROTTLE) != -1); } if (j->rootdir) { - chroot(j->rootdir); - chdir("."); + job_assumes(j, chroot(j->rootdir) != -1); + job_assumes(j, chdir(".") != -1); } job_postfork_become_user(j); if (j->workingdir) { - chdir(j->workingdir); + job_assumes(j, chdir(j->workingdir) != -1); } if (j->setmask) { @@ -2306,7 +2303,7 @@ setenv(ei->key, ei->value, 1); } - setsid(); + job_assumes(j, setsid() != -1); } void

1 0

[23102] trunk/launchd/src
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23102 http://trac.macosforge.org/projects/launchd/changeset/23102 Author: zarzycki(a)apple.com Date: 2007-02-23 08:35:27 -0800 (Fri, 23 Feb 2007) Log Message: ----------- <rdar://problem/4964668> [Kernel Extensions] Regression on load order Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in trunk/launchd/src/SystemStarter.c Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-02-23 00:43:05 UTC (rev 23101) +++ trunk/launchd/src/Makefile.am 2007-02-23 16:35:27 UTC (rev 23102) @@ -40,7 +40,7 @@ launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -SystemStarter_LDFLAGS = -framework CoreFoundation +SystemStarter_LDFLAGS = -framework CoreFoundation -framework IOKit SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-02-23 00:43:05 UTC (rev 23101) +++ trunk/launchd/src/Makefile.in 2007-02-23 16:35:27 UTC (rev 23102) @@ -239,7 +239,7 @@ @LIBS_ONLY_FALSE@launchctl_CFLAGS = $(AM_CFLAGS) -I/System/Library/Frameworks/System.framework/PrivateHeaders @LIBS_ONLY_FALSE@launchctl_LDFLAGS = -framework CoreFoundation -framework IOKit -weak_library /usr/lib/libedit.dylib @LIBS_ONLY_FALSE@SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -@LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = -framework CoreFoundation +@LIBS_ONLY_FALSE@SystemStarter_LDFLAGS = -framework CoreFoundation -framework IOKit @LIBS_ONLY_FALSE@SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c @LIBS_ONLY_FALSE@launchd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter @LIBS_ONLY_FALSE@launchd_LDFLAGS = -lbsm Modified: trunk/launchd/src/SystemStarter.c =================================================================== --- trunk/launchd/src/SystemStarter.c 2007-02-23 00:43:05 UTC (rev 23101) +++ trunk/launchd/src/SystemStarter.c 2007-02-23 16:35:27 UTC (rev 23102) @@ -22,6 +22,7 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ **/ +#include <IOKit/IOKitLib.h> #include <sys/types.h> #include <sys/stat.h> #include <paths.h> @@ -115,6 +116,8 @@ } else if (!gDebugFlag && anAction != kActionStop) { const char *ipw_cmd[] = { "/usr/sbin/ipconfig", "waitall", NULL }; const char *adm_cmd[] = { "/sbin/autodiskmount", "-va", NULL }; + mach_timespec_t w = { 600, 0 }; + kern_return_t kr; /* Too many old StartupItems had implicit dependancies on * "Network" via other StartupItems that are now no-ops. @@ -123,6 +126,11 @@ * so we'll stall here to deal with this legacy dependancy * problem. */ + + if ((kr = IOKitWaitQuiet(kIOMasterPortDefault, &w)) != kIOReturnSuccess) { + syslog(LOG_NOTICE, "IOKitWaitQuiet: %d\n", kr); + } + fwexec(ipw_cmd, true); fwexec(adm_cmd, true); }

1 0

[23101] trunk/launchd/src/liblaunch.c
by source_changes＠macosforge.org 23 Feb '07

23 Feb '07

Revision: 23101 http://trac.macosforge.org/projects/launchd/changeset/23101 Author: zarzycki(a)apple.com Date: 2007-02-22 16:43:05 -0800 (Thu, 22 Feb 2007) Log Message: ----------- <rdar://problem/4918402> 64-bit daemon fails to connect to launchd Modified Paths: -------------- trunk/launchd/src/liblaunch.c Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2007-02-22 23:38:57 UTC (rev 23100) +++ trunk/launchd/src/liblaunch.c 2007-02-23 00:43:05 UTC (rev 23101) @@ -623,9 +623,9 @@ case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: o_in_w->_array_cnt = host2big(d->_array_cnt); - *where = realloc(*where, *len + (d->_array_cnt * sizeof(launch_data_t))); - memcpy(*where + *len, d->_array, d->_array_cnt * sizeof(launch_data_t)); - *len += d->_array_cnt * sizeof(launch_data_t); + *where = realloc(*where, *len + (d->_array_cnt * sizeof(uint64_t))); + memset(*where + *len, 0, d->_array_cnt * sizeof(uint64_t)); + *len += d->_array_cnt * sizeof(uint64_t); for (i = 0; i < d->_array_cnt; i++) launch_data_pack(d->_array[i], where, len, fd_where, fdcnt); @@ -649,12 +649,12 @@ case LAUNCH_DATA_DICTIONARY: case LAUNCH_DATA_ARRAY: tmpcnt = big2host(r->_array_cnt); - if ((conn->recvlen - *data_offset) < (tmpcnt * sizeof(launch_data_t))) { + if ((conn->recvlen - *data_offset) < (tmpcnt * sizeof(uint64_t))) { errno = EAGAIN; return NULL; } r->_array = conn->recvbuf + *data_offset; - *data_offset += tmpcnt * sizeof(launch_data_t); + *data_offset += tmpcnt * sizeof(uint64_t); for (i = 0; i < tmpcnt; i++) { r->_array[i] = launch_data_unpack(conn, data_offset, fdoffset); if (r->_array[i] == NULL)

1 0

[23100] trunk/launchd/src
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23100 http://trac.macosforge.org/projects/launchd/changeset/23100 Author: zarzycki(a)apple.com Date: 2007-02-22 15:38:57 -0800 (Thu, 22 Feb 2007) Log Message: ----------- Ensure that c->j is always set. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h trunk/launchd/src/launchd_unix_ipc.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-22 23:31:44 UTC (rev 23099) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-22 23:38:57 UTC (rev 23100) @@ -218,7 +218,6 @@ static void jobmgr_log_stray_children(jobmgr_t jm); static void jobmgr_remove(jobmgr_t jm); static void jobmgr_dispatch_all(jobmgr_t jm); -static job_t jobmgr_new_anonymous(jobmgr_t jm); static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p); static void job_export_all2(jobmgr_t jm, launch_data_t where); static void jobmgr_callback(void *obj, struct kevent *kev); @@ -911,11 +910,15 @@ } job_t -jobmgr_new_anonymous(jobmgr_t jm) +jobmgr_get_anonymous(jobmgr_t jm) { char newlabel[1000], *procname = "unknown"; job_t jr; + if (jm->anonj) { + return jm->anonj; + } + snprintf(newlabel, sizeof(newlabel), "%u.anonymous", MACH_PORT_INDEX(jm->jm_port)); if ((jr = job_new(jm, newlabel, procname, NULL))) { @@ -3474,7 +3477,7 @@ goto out_bad; } - jobmgr_assumes(jmr, (jmr->anonj = jobmgr_new_anonymous(jmr)) != NULL); + jobmgr_assumes(jmr, (jmr->anonj = jobmgr_get_anonymous(jmr)) != NULL); bootstrapper = job_new(jmr, "com.apple.launchctld", NULL, bootstrap_tool); Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-02-22 23:31:44 UTC (rev 23099) +++ trunk/launchd/src/launchd_core_logic.h 2007-02-22 23:38:57 UTC (rev 23100) @@ -31,6 +31,7 @@ void jobmgr_init(bool); jobmgr_t jobmgr_shutdown(jobmgr_t jm); void jobmgr_dispatch_all_semaphores(jobmgr_t jm); +job_t jobmgr_get_anonymous(jobmgr_t jm); job_t jobmgr_find(jobmgr_t jm, const char *label); jobmgr_t jobmgr_delete_anything_with_port(jobmgr_t jm, mach_port_t port); bool jobmgr_ack_port_destruction(jobmgr_t jm, mach_port_t p); Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2007-02-22 23:31:44 UTC (rev 23099) +++ trunk/launchd/src/launchd_unix_ipc.c 2007-02-22 23:38:57 UTC (rev 23100) @@ -184,7 +184,7 @@ c->kqconn_callback = ipc_callback; c->conn = launchd_fdopen(fd); - c->j = j; + c->j = j ? j : jobmgr_get_anonymous(root_jobmgr); SLIST_INSERT_HEAD(&connections, c, sle); kevent_mod(fd, EVFILT_READ, EV_ADD, 0, 0, &c->kqconn_callback); } @@ -328,11 +328,7 @@ return; } - if (rmc->c->j) { - job_log(rmc->c->j, LOG_DEBUG, "Unix IPC request: %s", cmd); - } else { - runtime_syslog(LOG_DEBUG, "Unix IPC request: %s", cmd); - } + job_log(rmc->c->j, LOG_DEBUG, "Unix IPC request: %s", cmd); if (data == NULL) { if (!strcmp(cmd, LAUNCH_KEY_CHECKIN)) {

1 0

[23099] trunk/launchd/src
by source_changes＠macosforge.org 22 Feb '07

22 Feb '07

Revision: 23099 http://trac.macosforge.org/projects/launchd/changeset/23099 Author: zarzycki(a)apple.com Date: 2007-02-22 15:31:44 -0800 (Thu, 22 Feb 2007) Log Message: ----------- Small bug fixes in the per-job Mach service concept. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch_private.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-22 22:41:38 UTC (rev 23098) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-22 23:31:44 UTC (rev 23099) @@ -502,13 +502,29 @@ if (!SLIST_EMPTY(&j->machservices) && (tmp = launch_data_alloc(LAUNCH_DATA_DICTIONARY))) { struct machservice *ms; + + tmp3 = NULL; SLIST_FOREACH(ms, &j->machservices, sle) { - tmp2 = launch_data_new_machport(MACH_PORT_NULL); - launch_data_dict_insert(tmp, tmp2, ms->name); + if (ms->per_pid) { + if (tmp3 == NULL) { + tmp3 = launch_data_alloc(LAUNCH_DATA_DICTIONARY); + } + if (tmp3) { + tmp2 = launch_data_new_machport(MACH_PORT_NULL); + launch_data_dict_insert(tmp3, tmp2, ms->name); + } + } else { + tmp2 = launch_data_new_machport(MACH_PORT_NULL); + launch_data_dict_insert(tmp, tmp2, ms->name); + } } launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_MACHSERVICES); + + if (tmp3) { + launch_data_dict_insert(r, tmp3, LAUNCH_JOBKEY_PERJOBMACHSERVICES); + } } return r; @@ -3532,12 +3548,11 @@ continue; } SLIST_FOREACH(ms, &ji->machservices, sle) { - if (target_pid && !ms->per_pid) { - continue; + if ((target_pid && ms->per_pid) || (!target_pid && !ms->per_pid)) { + if (strcmp(name, ms->name) == 0) { + return ms; + } } - if (strcmp(name, ms->name) == 0) { - return ms; - } } } @@ -4482,7 +4497,9 @@ TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { - cnt++; + if (!ms->per_pid) { + cnt++; + } } } @@ -4502,9 +4519,11 @@ TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { - strlcpy(service_names[cnt2], machservice_name(ms), sizeof(service_names[0])); - service_actives[cnt2] = machservice_status(ms); - cnt2++; + if (!ms->per_pid) { + strlcpy(service_names[cnt2], machservice_name(ms), sizeof(service_names[0])); + service_actives[cnt2] = machservice_status(ms); + cnt2++; + } } } Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2007-02-22 22:41:38 UTC (rev 23098) +++ trunk/launchd/src/liblaunch_private.h 2007-02-22 23:31:44 UTC (rev 23099) @@ -50,6 +50,7 @@ #define LAUNCH_KEY_BATCHQUERY "BatchQuery" #define LAUNCH_JOBKEY_ENTERKERNELDEBUGGERBEFOREKILL "EnterKernelDebuggerBeforeKill" +#define LAUNCH_JOBKEY_PERJOBMACHSERVICES "PerJobMachServices" #define LAUNCH_JOBKEY_MACH_KUNCSERVER "kUNCServer" #define LAUNCH_JOBKEY_MACH_EXCEPTIONSERVER "ExceptionServer"

1 0