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

[23382] tags/launchd-244/
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23382 http://trac.macosforge.org/projects/launchd/changeset/23382 Author: zarzycki(a)apple.com Date: 2007-09-13 15:42:46 -0700 (Thu, 13 Sep 2007) Log Message: ----------- "Tagging launchd-244 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-244/ Copied: tags/launchd-244 (from rev 23381, trunk)

1 0

[23381] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23381 http://trac.macosforge.org/projects/launchd/changeset/23381 Author: zarzycki(a)apple.com Date: 2007-09-13 12:11:36 -0700 (Thu, 13 Sep 2007) Log Message: ----------- Better input vetting. 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-09-13 17:54:03 UTC (rev 23380) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 19:11:36 UTC (rev 23381) @@ -1687,6 +1687,7 @@ job_t j; if (pload == NULL) { + errno = EINVAL; return NULL; } @@ -1695,14 +1696,21 @@ return NULL; } - if ((tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_LABEL)) && - (launch_data_get_type(tmp) == LAUNCH_DATA_STRING)) { - if (!(label = launch_data_get_string(tmp))) { - errno = EINVAL; - return NULL; - } + if (!(tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_LABEL))) { + errno = EINVAL; + return NULL; } + if (launch_data_get_type(tmp) != LAUNCH_DATA_STRING) { + errno = EINVAL; + return NULL; + } + + if (!(label = launch_data_get_string(tmp))) { + errno = EINVAL; + return NULL; + } + if ((tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_PROGRAM)) && (launch_data_get_type(tmp) == LAUNCH_DATA_STRING)) { prog = launch_data_get_string(tmp);

1 0

[23380] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23380 http://trac.macosforge.org/projects/launchd/changeset/23380 Author: zarzycki(a)apple.com Date: 2007-09-13 10:54:03 -0700 (Thu, 13 Sep 2007) Log Message: ----------- I firmly believe that source code comments exist to document the code that is NOT there. 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-09-13 17:40:43 UTC (rev 23379) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 17:54:03 UTC (rev 23380) @@ -2014,6 +2014,12 @@ j->last_exit_status = status; j->sent_sigkill = false; j->p = 0; + + /* + * 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 + * this messy, given that jobs can be deleted at dispatch. + */ } void

1 0

[23379] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23379 http://trac.macosforge.org/projects/launchd/changeset/23379 Author: zarzycki(a)apple.com Date: 2007-09-13 10:40:43 -0700 (Thu, 13 Sep 2007) Log Message: ----------- Smarter idle exit logic. 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-09-13 17:16:54 UTC (rev 23378) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 17:40:43 UTC (rev 23379) @@ -250,6 +250,7 @@ static void semaphoreitem_callback(job_t j, struct kevent *kev); static void semaphoreitem_watch(job_t j, struct semaphoreitem *si); static void semaphoreitem_ignore(job_t j, struct semaphoreitem *si); +static void semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add); #define ACTIVE_JOB_HASH_SIZE 32 #define ACTIVE_JOB_HASH(x) (IS_POWER_OF_TWO(ACTIVE_JOB_HASH_SIZE) ? (x & (ACTIVE_JOB_HASH_SIZE - 1)) : (x % ACTIVE_JOB_HASH_SIZE)) @@ -2329,6 +2330,11 @@ if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) { time_t respawn_delta = j->min_run_time - td; + /* + * We technically should ref-count throttled jobs to prevent idle exit, + * but we're not directly tracking the 'throttled' state at the moment. + */ + job_log(j, LOG_WARNING, "Throttling respawn: Will start in %ld seconds", respawn_delta); job_assumes(j, kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, respawn_delta, j) != -1); job_ignore(j); @@ -4572,14 +4578,43 @@ SLIST_INSERT_HEAD(&j->semaphores, si, sle); - runtime_add_ref(); + semaphoreitem_runtime_mod_ref(si, true); return true; } void +semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add) +{ + /* + * External events need to be tracked. + * Internal events do NOT need to be tracked. + */ + + switch (si->why) { + case SUCCESSFUL_EXIT: + case FAILED_EXIT: + case OTHER_JOB_ENABLED: + case OTHER_JOB_DISABLED: + case OTHER_JOB_ACTIVE: + case OTHER_JOB_INACTIVE: + return; + default: + break; + } + + if (add) { + runtime_add_ref(); + } else { + runtime_del_ref(); + } +} + +void semaphoreitem_delete(job_t j, struct semaphoreitem *si) { + semaphoreitem_runtime_mod_ref(si, false); + SLIST_REMOVE(&j->semaphores, si, semaphoreitem, sle); if (si->fd != -1) { @@ -4587,8 +4622,6 @@ } free(si); - - runtime_del_ref(); } void

1 0

[23378] trunk/launchd/src
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23378 http://trac.macosforge.org/projects/launchd/changeset/23378 Author: zarzycki(a)apple.com Date: 2007-09-13 10:16:54 -0700 (Thu, 13 Sep 2007) Log Message: ----------- White space clean up. Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchproxy.c trunk/launchd/src/liblaunch.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/launchctl.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -81,8 +81,8 @@ #define MACHINIT_JOBKEY_SERVERPORT "ServerPort" #define MACHINIT_JOBKEY_SERVICEPORT "ServicePort" -#define assumes(e) \ - (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true) +#define assumes(e) \ + (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true) struct load_unload_state { @@ -738,7 +738,7 @@ } if (!(S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode))) { - fprintf(stderr, "%s: Dubious path. Not a regular file or directory (skipping): %s\n", getprogname(), path); + fprintf(stderr, "%s: Dubious path. Not a regular file or directory (skipping): %s\n", getprogname(), path); return false; } @@ -894,9 +894,9 @@ setm = true; } - if (passive) { + if (passive) { if (unlink(sun.sun_path) == -1 && errno != ENOENT) { - close(sfd); + close(sfd); return; } oldmask = umask(S_IRWXG|S_IRWXO); @@ -1621,7 +1621,7 @@ int load_and_unload_cmd(int argc, char *const argv[]) { - NSSearchPathEnumerationState es = 0; + NSSearchPathEnumerationState es = 0; char nspath[PATH_MAX * 2]; /* safe side, we need to append */ bool badopts = false; struct load_unload_state lus; @@ -2595,7 +2595,7 @@ is_legacy_mach_job(launch_data_t obj) { bool has_servicename = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_SERVICENAME); - bool has_command = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND); + bool has_command = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND); bool has_label = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_LABEL); return has_command && has_servicename && !has_label; Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/launchd.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -115,7 +115,7 @@ while ((ch = getopt(argc, argv, "s")) != -1) { switch (ch) { - case 's': sflag = true; break; /* single user */ + case 's': sflag = true; break; /* single user */ case '?': /* we should do something with the global optopt variable here */ default: fprintf(stderr, "%s: ignoring unknown arguments\n", getprogname()); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -273,8 +273,8 @@ char name[0]; }; -#define jobmgr_assumes(jm, e) \ - (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true) +#define jobmgr_assumes(jm, e) \ + (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true) 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); @@ -369,8 +369,8 @@ static size_t hash_ms(const char *msstr) __attribute__((pure)); -#define job_assumes(j, e) \ - (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true) +#define job_assumes(j, e) \ + (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true) static void job_import_keys(launch_data_t obj, const char *key, void *context); static void job_import_bool(job_t j, const char *key, bool value); @@ -421,15 +421,15 @@ const char *key; int val; } launchd_keys2limits[] = { - { LAUNCH_JOBKEY_RESOURCELIMIT_CORE, RLIMIT_CORE }, - { LAUNCH_JOBKEY_RESOURCELIMIT_CPU, RLIMIT_CPU }, - { LAUNCH_JOBKEY_RESOURCELIMIT_DATA, RLIMIT_DATA }, - { LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE, RLIMIT_FSIZE }, - { LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK, RLIMIT_MEMLOCK }, - { LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE, RLIMIT_NOFILE }, - { LAUNCH_JOBKEY_RESOURCELIMIT_NPROC, RLIMIT_NPROC }, - { LAUNCH_JOBKEY_RESOURCELIMIT_RSS, RLIMIT_RSS }, - { LAUNCH_JOBKEY_RESOURCELIMIT_STACK, RLIMIT_STACK }, + { LAUNCH_JOBKEY_RESOURCELIMIT_CORE, RLIMIT_CORE }, + { LAUNCH_JOBKEY_RESOURCELIMIT_CPU, RLIMIT_CPU }, + { LAUNCH_JOBKEY_RESOURCELIMIT_DATA, RLIMIT_DATA }, + { LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE, RLIMIT_FSIZE }, + { LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK, RLIMIT_MEMLOCK }, + { LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE, RLIMIT_NOFILE }, + { LAUNCH_JOBKEY_RESOURCELIMIT_NPROC, RLIMIT_NPROC }, + { LAUNCH_JOBKEY_RESOURCELIMIT_RSS, RLIMIT_RSS }, + { LAUNCH_JOBKEY_RESOURCELIMIT_STACK, RLIMIT_STACK }, }; static time_t cronemu(int mon, int mday, int hour, int min); @@ -716,7 +716,7 @@ } else if (getpid() == 1) { jobmgr_log(jm, LOG_DEBUG, "About to call: reboot(%s)", reboot_flags_to_C_names(jm->reboot_flags)); runtime_closelog(); - jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1); + jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1); runtime_closelog(); } else { runtime_closelog(); @@ -3070,9 +3070,9 @@ } } -void +void semaphoreitem_ignore(job_t j, struct semaphoreitem *si) -{ +{ if (si->fd != -1) { job_log(j, LOG_DEBUG, "Ignoring Vnode: %d", si->fd); job_assumes(j, kevent_mod(si->fd, EVFILT_VNODE, EV_DELETE, 0, 0, NULL) != -1); @@ -4336,8 +4336,8 @@ job_assumes(ms->job, launchd_mport_notify_req(ms->port, which) == KERN_SUCCESS); } -#define NELEM(x) (sizeof(x)/sizeof(x[0])) -#define END_OF(x) (&(x)[NELEM(x)]) +#define NELEM(x) (sizeof(x)/sizeof(x[0])) +#define END_OF(x) (&(x)[NELEM(x)]) char ** mach_cmd2argv(const char *string) @@ -4737,11 +4737,11 @@ return true; } - if (mon < wtm->tm_mon) { + if (mon < wtm->tm_mon) { return false; } - if (mon > wtm->tm_mon) { + if (mon > wtm->tm_mon) { wtm->tm_mon = mon; wtm->tm_mday = 1; wtm->tm_hour = 0; @@ -4772,11 +4772,11 @@ return true; } - if (mday < wtm->tm_mday) { + if (mday < wtm->tm_mday) { return false; } - if (mday > wtm->tm_mday) { + if (mday > wtm->tm_mday) { wtm->tm_mday = mday; wtm->tm_hour = 0; wtm->tm_min = 0; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/launchd_runtime.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -142,7 +142,7 @@ launchd_assert(pthread_create(&kqueue_demand_thread, &attr, kqueue_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); - pthread_attr_init(&attr); + pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); @@ -1173,7 +1173,7 @@ char *data_off; struct logmsg_s *lm; -#define ROUND_TO_64BIT_WORD_SIZE(x) ((x + 7) & ~7) +#define ROUND_TO_64BIT_WORD_SIZE(x) ((x + 7) & ~7) /* we do this to make the unpacking for the log_drain cause unalignment faults */ lm_sz = ROUND_TO_64BIT_WORD_SIZE(lm_sz); Modified: trunk/launchd/src/launchproxy.c =================================================================== --- trunk/launchd/src/launchproxy.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/launchproxy.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -48,12 +48,12 @@ static void find_fds(launch_data_t o, const char *key __attribute__((unused)), void *context __attribute__((unused))) { - struct kevent kev; - size_t i; + struct kevent kev; + size_t i; int fd; - switch (launch_data_get_type(o)) { - case LAUNCH_DATA_FD: + switch (launch_data_get_type(o)) { + case LAUNCH_DATA_FD: fd = launch_data_get_fd(o); if (-1 == fd) break; @@ -61,17 +61,17 @@ EV_SET(&kev, fd, EVFILT_READ, EV_ADD, 0, 0, NULL); if (kevent(kq, &kev, 1, NULL, 0, NULL) == -1) syslog(LOG_DEBUG, "kevent(%d): %m", fd); - break; - case LAUNCH_DATA_ARRAY: - for (i = 0; i < launch_data_array_get_count(o); i++) - find_fds(launch_data_array_get_index(o, i), NULL, NULL); - break; - case LAUNCH_DATA_DICTIONARY: - launch_data_dict_iterate(o, find_fds, NULL); - break; - default: - break; - } + break; + case LAUNCH_DATA_ARRAY: + for (i = 0; i < launch_data_array_get_count(o); i++) + find_fds(launch_data_array_get_index(o, i), NULL, NULL); + break; + case LAUNCH_DATA_DICTIONARY: + launch_data_dict_iterate(o, find_fds, NULL); + break; + default: + break; + } } int main(int argc __attribute__((unused)), char *argv[]) Modified: trunk/launchd/src/liblaunch.c =================================================================== --- trunk/launchd/src/liblaunch.c 2007-09-13 00:50:24 UTC (rev 23377) +++ trunk/launchd/src/liblaunch.c 2007-09-13 17:16:54 UTC (rev 23378) @@ -372,7 +372,7 @@ launch_data_array_pop_first(launch_data_t where) { launch_data_t r = NULL; - + if (where->_array_cnt > 0) { r = where->_array[0]; memmove(where->_array, where->_array + 1, (where->_array_cnt - 1) * sizeof(launch_data_t)); @@ -525,23 +525,23 @@ launch_t launchd_fdopen(int fd) { - launch_t c; + launch_t c; - c = calloc(1, sizeof(struct _launch)); + c = calloc(1, sizeof(struct _launch)); if (!c) return NULL; - c->fd = fd; + c->fd = fd; fcntl(fd, F_SETFL, O_NONBLOCK); - if ((c->sendbuf = malloc(0)) == NULL) + if ((c->sendbuf = malloc(0)) == NULL) goto out_bad; - if ((c->sendfds = malloc(0)) == NULL) + if ((c->sendfds = malloc(0)) == NULL) goto out_bad; - if ((c->recvbuf = malloc(0)) == NULL) + if ((c->recvbuf = malloc(0)) == NULL) goto out_bad; - if ((c->recvfds = malloc(0)) == NULL) + if ((c->recvfds = malloc(0)) == NULL) goto out_bad; return c; @@ -770,10 +770,10 @@ iov[0].iov_base = &lmh; iov[0].iov_len = sizeof(lmh); mh.msg_iov = iov; - mh.msg_iovlen = 2; + mh.msg_iovlen = 2; } else { mh.msg_iov = iov + 1; - mh.msg_iovlen = 1; + mh.msg_iovlen = 1; } iov[1].iov_base = lh->sendbuf; @@ -916,7 +916,7 @@ goto out; } while (launchd_msg_send(_lc->l, NULL) == -1); } - + while (resp == NULL) { if (d == NULL && launch_data_array_get_count(_lc->async_resp) > 0) { resp = launch_data_array_pop_first(_lc->async_resp); @@ -950,13 +950,13 @@ struct cmsghdr *cm = alloca(4096); launch_data_t rmsg = NULL; size_t data_offset, fd_offset; - struct msghdr mh; - struct iovec iov; + struct msghdr mh; + struct iovec iov; int r; - memset(&mh, 0, sizeof(mh)); - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + memset(&mh, 0, sizeof(mh)); + mh.msg_iov = &iov; + mh.msg_iovlen = 1; lh->recvbuf = reallocf(lh->recvbuf, lh->recvlen + 8*1024); @@ -1099,7 +1099,7 @@ launch_data_t r = launch_data_alloc(LAUNCH_DATA_ERRNO); if (r) - launch_data_set_errno(r, e); + launch_data_set_errno(r, e); return r; } @@ -1109,7 +1109,7 @@ launch_data_t r = launch_data_alloc(LAUNCH_DATA_FD); if (r) - launch_data_set_fd(r, fd); + launch_data_set_fd(r, fd); return r; } @@ -1119,7 +1119,7 @@ launch_data_t r = launch_data_alloc(LAUNCH_DATA_MACHPORT); if (r) - launch_data_set_machport(r, p); + launch_data_set_machport(r, p); return r; }

1 0

[23377] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23377 http://trac.macosforge.org/projects/launchd/changeset/23377 Author: zarzycki(a)apple.com Date: 2007-09-12 17:50:24 -0700 (Wed, 12 Sep 2007) Log Message: ----------- Some debug code slipped into the last commit. 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-09-13 00:48:46 UTC (rev 23376) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:50:24 UTC (rev 23377) @@ -739,10 +739,6 @@ struct mspolicy *msp; struct envitem *ei; - if (j == workaround_5477111) { - job_log(j, LOG_NOTICE, "@@@@@ Tried to remove ahead of schedule!"); - } - if (j->p && j->anonymous) { job_reap(j); } else if (j->p) {

1 0

[23376] trunk/launchd/src
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23376 http://trac.macosforge.org/projects/launchd/changeset/23376 Author: zarzycki(a)apple.com Date: 2007-09-12 17:48:46 -0700 (Wed, 12 Sep 2007) Log Message: ----------- <rdar://problem/5475980> The per-user launchd needs to idle exit Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:35:57 UTC (rev 23375) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:48:46 UTC (rev 23376) @@ -93,7 +93,6 @@ #include "job_reply.h" #define LAUNCHD_MIN_JOB_RUN_TIME 10 -#define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30 #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20 #define LAUNCHD_SIGKILL_TIMER 5 @@ -450,7 +449,7 @@ static void do_file_init(void) __attribute__((constructor)); /* file local globals */ -static unsigned int total_children; +static size_t total_children; static mach_port_t the_exception_server; static bool did_first_per_user_launchd_BootCache_hack; static jobmgr_t background_jobmgr; @@ -646,7 +645,7 @@ static void still_alive_with_check(void) { - jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %u children.", total_children); + jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu children.", total_children); runtime_closelog(); /* hack to flush logs */ } @@ -740,6 +739,10 @@ struct mspolicy *msp; struct envitem *ei; + if (j == workaround_5477111) { + job_log(j, LOG_NOTICE, "@@@@@ Tried to remove ahead of schedule!"); + } + if (j->p && j->anonymous) { job_reap(j); } else if (j->p) { @@ -837,6 +840,7 @@ free(j->j_binpref); } if (j->start_interval) { + runtime_del_ref(); job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1); } @@ -1122,7 +1126,7 @@ j->kqjob_callback = job_callback; j->mgr = jm; j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME; - j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT; + j->timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT; j->exit_timeout = LAUNCHD_DEFAULT_EXIT_TIMEOUT; j->currently_ignored = true; j->ondemand = true; @@ -1460,6 +1464,7 @@ if (value <= 0) { job_log(j, LOG_WARNING, "StartInterval is not greater than zero, ignoring"); } else { + runtime_add_ref(); j->start_interval = value; } if (-1 == kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j)) { @@ -1950,6 +1955,9 @@ kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); } + if (!j->anonymous) { + runtime_del_ref(); + } total_children--; LIST_REMOVE(j, pid_hash_sle); @@ -2388,6 +2396,7 @@ j->start_pending = false; + runtime_add_ref(); total_children++; LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle); @@ -3262,6 +3271,8 @@ calendarinterval_setalarm(j, ci); + runtime_add_ref(); + return true; } @@ -3272,6 +3283,8 @@ LIST_REMOVE(ci, global_sle); free(ci); + + runtime_del_ref(); } void @@ -3329,6 +3342,8 @@ SLIST_INSERT_HEAD(&j->sockets, sg, sle); + runtime_add_ref(); + return true; } @@ -3345,6 +3360,8 @@ free(sg->fds); free(sg); + + runtime_del_ref(); } void @@ -3542,7 +3559,7 @@ job_log(j, LOG_DEBUG, "Exited while removal was pending."); return true; } else if (j->mgr->shutting_down) { - job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %u", total_children); + job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu", total_children); return true; } else if (j->legacy_mach_job) { if (SLIST_EMPTY(&j->machservices)) { @@ -4559,6 +4576,8 @@ SLIST_INSERT_HEAD(&j->semaphores, si, sle); + runtime_add_ref(); + return true; } @@ -4572,6 +4591,8 @@ } free(si); + + runtime_del_ref(); } void @@ -5122,10 +5143,16 @@ break; case VPROC_GSK_START_INTERVAL: if ((unsigned int)inval > 0) { + if (j->start_interval == 0) { + runtime_add_ref(); + } j->start_interval = inval; job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, j->start_interval, j) != -1); } else if (j->start_interval) { job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1); + if (j->start_interval != 0) { + runtime_del_ref(); + } j->start_interval = 0; } break; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-13 00:35:57 UTC (rev 23375) +++ trunk/launchd/src/launchd_runtime.c 2007-09-13 00:48:46 UTC (rev 23376) @@ -90,9 +90,10 @@ static mach_msg_size_t max_msg_size; static mig_callback *mig_cb_table; static size_t mig_cb_table_sz; -static timeout_callback runtime_idle_callback; -static mach_msg_timeout_t runtime_idle_timeout; +static timeout_callback runtime_idle_callback = launchd_shutdown; +static mach_msg_timeout_t runtime_idle_timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT * 1000; static audit_token_t *au_tok; +static size_t runtime_busy_cnt; static STAILQ_HEAD(, logmsg_s) logmsg_queue = STAILQ_HEAD_INITIALIZER(logmsg_queue); @@ -635,15 +636,15 @@ void -runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to) +runtime_set_timeout(timeout_callback to_cb, unsigned int sec) { - if (to == 0 || to_cb == NULL) { + if (sec == 0 || to_cb == NULL) { runtime_idle_callback = NULL; runtime_idle_timeout = 0; } runtime_idle_callback = to_cb; - runtime_idle_timeout = to; + runtime_idle_timeout = sec * 1000; } kern_return_t @@ -911,7 +912,7 @@ } } - if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback) { + if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback && (runtime_busy_cnt == 0)) { tmp_options |= MACH_RCV_TIMEOUT; if (!(tmp_options & MACH_SEND_TIMEOUT)) { @@ -1349,3 +1350,15 @@ return runtime_log_pack(outval, outvalCnt); } + +void +runtime_add_ref(void) +{ + runtime_busy_cnt++; +} + +void +runtime_del_ref(void) +{ + runtime_busy_cnt--; +} Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-13 00:35:57 UTC (rev 23375) +++ trunk/launchd/src/launchd_runtime.h 2007-09-13 00:48:46 UTC (rev 23376) @@ -56,6 +56,9 @@ boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply); +void runtime_add_ref(void); +void runtime_del_ref(void); + void launchd_runtime_init(void); void launchd_runtime_init2(void); void launchd_runtime(void) __attribute__((noreturn)); @@ -63,7 +66,9 @@ int runtime_close(int fd); int runtime_fsync(int fd); -void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to); +#define RUNTIME_ADVISABLE_IDLE_TIMEOUT 30 + +void runtime_set_timeout(timeout_callback to_cb, unsigned int sec); kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size); kern_return_t runtime_remove_mport(mach_port_t name); bool runtime_get_caller_creds(struct ldcred *ldc);

1 0

[23375] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23375 http://trac.macosforge.org/projects/launchd/changeset/23375 Author: zarzycki(a)apple.com Date: 2007-09-12 17:35:57 -0700 (Wed, 12 Sep 2007) Log Message: ----------- What's more fun than one way of reporting errors? Two ways! 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-09-13 00:24:54 UTC (rev 23374) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:35:57 UTC (rev 23375) @@ -1834,7 +1834,7 @@ mib[3] = ldc.pid; - if (jobmgr_assumes(root_jobmgr, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)) { + if (jobmgr_assumes(root_jobmgr, sysctl(mib, 4, &kp, &len, NULL, 0) != -1) && jobmgr_assumes(root_jobmgr, len == sizeof(kp))) { jobmgr_log(root_jobmgr, LOG_ERR, "%s() was confused by PID %u UID %u EUID %u Mach Port 0x%x: %s", __func__, ldc.pid, ldc.uid, ldc.euid, p, kp.kp_proc.p_comm); } }

1 0

[23374] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Sep '07

13 Sep '07

Revision: 23374 http://trac.macosforge.org/projects/launchd/changeset/23374 Author: zarzycki(a)apple.com Date: 2007-09-12 17:24:54 -0700 (Wed, 12 Sep 2007) Log Message: ----------- <rdar://problem/5477111> 'ssh localhost sudo launchctl' kills machine 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-09-12 19:50:15 UTC (rev 23373) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:24:54 UTC (rev 23374) @@ -454,6 +454,7 @@ static mach_port_t the_exception_server; static bool did_first_per_user_launchd_BootCache_hack; static jobmgr_t background_jobmgr; +static job_t workaround_5477111; static mach_timebase_info_data_t tbi; /* process wide globals */ @@ -1858,11 +1859,19 @@ void job_mig_destructor(job_t j) { - if (j && j->unload_at_mig_return) { + /* + * 5477111 + * + * 'j' can be invalid at this point. We should fix this up after Leopard ships. + */ + + if (j && j != workaround_5477111 && j->unload_at_mig_return) { job_log(j, LOG_NOTICE, "Unloading PID %u at MIG return.", j->p); job_remove(j); } + workaround_5477111 = NULL; + calendarinterval_sanity_check(); } @@ -5968,6 +5977,8 @@ jm->req_port = 0; jm->jm_port = 0; + workaround_5477111 = j; + jobmgr_shutdown(jm); return BOOTSTRAP_SUCCESS;

1 0

[23373] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 12 Sep '07

12 Sep '07

Revision: 23373 http://trac.macosforge.org/projects/launchd/changeset/23373 Author: zarzycki(a)apple.com Date: 2007-09-12 12:50:15 -0700 (Wed, 12 Sep 2007) Log Message: ----------- Better error reporting. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-11 23:49:02 UTC (rev 23372) +++ trunk/launchd/src/launchd_runtime.c 2007-09-12 19:50:15 UTC (rev 23373) @@ -439,7 +439,7 @@ struct kevent kev; unsigned int i; - if (!launchd_assumes(mach_port_get_set_status(mach_task_self(), demand_port_set, &members, &membersCnt) == KERN_SUCCESS)) { + if (!launchd_assumes((errno = mach_port_get_set_status(mach_task_self(), demand_port_set, &members, &membersCnt)) == KERN_SUCCESS)) { return 1; }

1 0