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

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

15 Feb '07

Revision: 23068 http://trac.macosforge.org/projects/launchd/changeset/23068 Author: zarzycki(a)apple.com Date: 2007-02-15 08:12:24 -0800 (Thu, 15 Feb 2007) Log Message: ----------- <rdar://problem/4998703> launchd restarting on-demand service twice 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-14 21:45:13 UTC (rev 23067) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-15 16:12:24 UTC (rev 23068) @@ -687,9 +687,6 @@ if (j->start_interval) { job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1); } - if (j->exit_timeout) { - kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); - } kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); @@ -1654,6 +1651,10 @@ return; } + if (j->exit_timeout) { + kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); + } + total_children--; /* Performance hack */

1 0

[23067] tags/launchd-195/
by source_changes＠macosforge.org 14 Feb '07

14 Feb '07

Revision: 23067 http://trac.macosforge.org/projects/launchd/changeset/23067 Author: zarzycki(a)apple.com Date: 2007-02-14 13:45:13 -0800 (Wed, 14 Feb 2007) Log Message: ----------- "Tagging launchd-195 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-195/ Copied: tags/launchd-195 (from rev 23066, trunk)

1 0

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

14 Feb '07

Revision: 23066 http://trac.macosforge.org/projects/launchd/changeset/23066 Author: zarzycki(a)apple.com Date: 2007-02-14 13:45:02 -0800 (Wed, 14 Feb 2007) Log Message: ----------- Compile time assert tricks are cool. 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-14 20:14:38 UTC (rev 23065) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 21:45:02 UTC (rev 23066) @@ -919,6 +919,7 @@ job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv, const char *stdinpath) { + char compile_time_assert[offsetof(struct job_s, kqjob_callback) == 0 ? 1 : -1] __attribute__((unused)); const char *const *argv_tmp = argv; char *co; int i, cc = 0; @@ -1963,7 +1964,7 @@ job_assumes(j, close(spair[1]) == 0); ipc_open(_fd(spair[0]), j); } - if (kevent_mod(c, EVFILT_PROC, EV_ADD, /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT, 0, &j->kqjob_callback) == -1) { + if (kevent_mod(c, EVFILT_PROC, EV_ADD, /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT, 0, j) == -1) { job_log_error(j, LOG_ERR, "kevent()"); job_reap(j); } else {

1 0

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

14 Feb '07

Revision: 23065 http://trac.macosforge.org/projects/launchd/changeset/23065 Author: zarzycki(a)apple.com Date: 2007-02-14 12:14:38 -0800 (Wed, 14 Feb 2007) Log Message: ----------- We're not ready to do anything useful with NOTE_EXEC or NOTE_FORK yet. We may never do anything with NOTE_FORK for that matter. 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-14 20:01:09 UTC (rev 23064) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 20:14:38 UTC (rev 23065) @@ -1802,6 +1802,10 @@ job_log(j, LOG_DEBUG, "Called execve()"); } + if (fflags & NOTE_FORK) { + job_log(j, LOG_DEBUG, "Called fork()"); + } + if (fflags & NOTE_EXIT) { job_reap(j); job_dispatch(j, false); @@ -1959,7 +1963,7 @@ job_assumes(j, close(spair[1]) == 0); ipc_open(_fd(spair[0]), j); } - if (kevent_mod(c, EVFILT_PROC, EV_ADD, NOTE_EXEC|NOTE_EXIT, 0, &j->kqjob_callback) == -1) { + if (kevent_mod(c, EVFILT_PROC, EV_ADD, /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT, 0, &j->kqjob_callback) == -1) { job_log_error(j, LOG_ERR, "kevent()"); job_reap(j); } else {

1 0

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

14 Feb '07

Revision: 23064 http://trac.macosforge.org/projects/launchd/changeset/23064 Author: zarzycki(a)apple.com Date: 2007-02-14 12:01:09 -0800 (Wed, 14 Feb 2007) Log Message: ----------- <rdar://problem/4968660> 9A357: hang on startup after install to case sensitive volume 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-14 19:51:27 UTC (rev 23063) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 20:01:09 UTC (rev 23064) @@ -1963,9 +1963,7 @@ job_log_error(j, LOG_ERR, "kevent()"); job_reap(j); } else { - if (j->ondemand) { - job_ignore(j); - } + job_ignore(j); } if (!j->stall_before_exec) {

1 0

[23063] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 14 Feb '07

14 Feb '07

Revision: 23063 http://trac.macosforge.org/projects/launchd/changeset/23063 Author: zarzycki(a)apple.com Date: 2007-02-14 11:51:27 -0800 (Wed, 14 Feb 2007) Log Message: ----------- Macros for fun and profit. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-14 19:41:31 UTC (rev 23062) +++ trunk/launchd/src/launchd_runtime.c 2007-02-14 19:51:27 UTC (rev 23063) @@ -164,31 +164,18 @@ } else { flags_off = flags_buf; } - if (flags & EV_ADD) { - flags_off += sprintf(flags_off, "EV_ADD"); - flags &= ~EV_ADD; - } else if (flags & EV_DELETE) { - flags_off += sprintf(flags_off, "EV_DELETE"); - flags &= ~EV_DELETE; - } else if (flags & EV_ENABLE) { - flags_off += sprintf(flags_off, "EV_ENABLE"); - flags &= ~EV_ENABLE; - } else if (flags & EV_DISABLE) { - flags_off += sprintf(flags_off, "EV_DISABLE"); - flags &= ~EV_DISABLE; - } else if (flags & EV_ONESHOT) { - flags_off += sprintf(flags_off, "EV_ONESHOT"); - flags &= ~EV_ONESHOT; - } else if (flags & EV_CLEAR) { - flags_off += sprintf(flags_off, "EV_CLEAR"); - flags &= ~EV_CLEAR; - } else if (flags & EV_EOF) { - flags_off += sprintf(flags_off, "EV_EOF"); - flags &= ~EV_EOF; - } else if (flags & EV_ERROR) { - flags_off += sprintf(flags_off, "EV_ERROR"); - flags &= ~EV_ERROR; - } else { + +#define FLAGIF(f) if (flags & f) { flags_off += sprintf(flags_off, #f); flags &= ~f; } + + FLAGIF(EV_ADD) + else FLAGIF(EV_DELETE) + else FLAGIF(EV_ENABLE) + else FLAGIF(EV_DISABLE) + else FLAGIF(EV_ONESHOT) + else FLAGIF(EV_CLEAR) + else FLAGIF(EV_EOF) + else FLAGIF(EV_ERROR) + else { flags_off += sprintf(flags_off, "0x%x", flags); flags = 0; }

1 0

[23062] trunk/launchd/src
by source_changes＠macosforge.org 14 Feb '07

14 Feb '07

Revision: 23062 http://trac.macosforge.org/projects/launchd/changeset/23062 Author: zarzycki(a)apple.com Date: 2007-02-14 11:41:31 -0800 (Wed, 14 Feb 2007) Log Message: ----------- Mega kevent debugging. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-14 17:09:18 UTC (rev 23061) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 19:41:31 UTC (rev 23062) @@ -1837,8 +1837,7 @@ { job_t j = obj; - job_log(j, LOG_DEBUG, "kev.ident = 0x%lx kev.filter = 0x%x kev->flags = 0x%x kev.fflags = 0x%x kev.data = 0x%lx kev.udata = %p", - kev->ident, kev->filter, kev->flags, kev->fflags, kev->data, kev->udata); + job_log(j, LOG_DEBUG, "Dispatching kevent callback."); switch (kev->filter) { case EVFILT_PROC: Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-14 17:09:18 UTC (rev 23061) +++ trunk/launchd/src/launchd_runtime.c 2007-02-14 19:41:31 UTC (rev 23062) @@ -143,6 +143,197 @@ return NULL; } +static void +log_kevent_struct(int level, struct kevent *kev) +{ + const char *filter_str; + char ident_buf[100]; + char filter_buf[100]; + char fflags_buf[1000]; + char flags_buf[1000] = "0x0"; + char *flags_off = NULL; + char *fflags_off = NULL; + unsigned short flags = kev->flags; + unsigned int fflags = kev->fflags; + + if (flags) while (flags) { + if (flags_off) { + *flags_off = '|'; + flags_off++; + *flags_off = '\0'; + } else { + flags_off = flags_buf; + } + if (flags & EV_ADD) { + flags_off += sprintf(flags_off, "EV_ADD"); + flags &= ~EV_ADD; + } else if (flags & EV_DELETE) { + flags_off += sprintf(flags_off, "EV_DELETE"); + flags &= ~EV_DELETE; + } else if (flags & EV_ENABLE) { + flags_off += sprintf(flags_off, "EV_ENABLE"); + flags &= ~EV_ENABLE; + } else if (flags & EV_DISABLE) { + flags_off += sprintf(flags_off, "EV_DISABLE"); + flags &= ~EV_DISABLE; + } else if (flags & EV_ONESHOT) { + flags_off += sprintf(flags_off, "EV_ONESHOT"); + flags &= ~EV_ONESHOT; + } else if (flags & EV_CLEAR) { + flags_off += sprintf(flags_off, "EV_CLEAR"); + flags &= ~EV_CLEAR; + } else if (flags & EV_EOF) { + flags_off += sprintf(flags_off, "EV_EOF"); + flags &= ~EV_EOF; + } else if (flags & EV_ERROR) { + flags_off += sprintf(flags_off, "EV_ERROR"); + flags &= ~EV_ERROR; + } else { + flags_off += sprintf(flags_off, "0x%x", flags); + flags = 0; + } + } + + snprintf(ident_buf, sizeof(ident_buf), "%ld", kev->ident); + snprintf(fflags_buf, sizeof(fflags_buf), "0x%x", fflags); + + switch (kev->filter) { + case EVFILT_READ: + filter_str = "EVFILT_READ"; + break; + case EVFILT_WRITE: + filter_str = "EVFILT_WRITE"; + break; + case EVFILT_AIO: + filter_str = "EVFILT_AIO"; + break; + case EVFILT_VNODE: + filter_str = "EVFILT_VNODE"; + if (fflags) while (fflags) { + if (fflags_off) { + *fflags_off = '|'; + fflags_off++; + *fflags_off = '\0'; + } else { + fflags_off = fflags_buf; + } + +#define FFLAGIF(ff) if (fflags & ff) { fflags_off += sprintf(fflags_off, #ff); fflags &= ~ff; } + + FFLAGIF(NOTE_DELETE) + else FFLAGIF(NOTE_WRITE) + else FFLAGIF(NOTE_EXTEND) + else FFLAGIF(NOTE_ATTRIB) + else FFLAGIF(NOTE_LINK) + else FFLAGIF(NOTE_RENAME) + else FFLAGIF(NOTE_REVOKE) + else { + fflags_off += sprintf(fflags_off, "0x%x", fflags); + fflags = 0; + } + } + break; + case EVFILT_PROC: + filter_str = "EVFILT_PROC"; + if (fflags) while (fflags) { + if (fflags_off) { + *fflags_off = '|'; + fflags_off++; + *fflags_off = '\0'; + } else { + fflags_off = fflags_buf; + } + + FFLAGIF(NOTE_EXIT) + else FFLAGIF(NOTE_FORK) + else FFLAGIF(NOTE_EXEC) + else FFLAGIF(NOTE_TRACK) + else FFLAGIF(NOTE_TRACKERR) + else FFLAGIF(NOTE_CHILD) + else { + fflags_off += sprintf(fflags_off, "0x%x", fflags); + fflags = 0; + } + } + break; + case EVFILT_SIGNAL: + filter_str = "EVFILT_SIGNAL"; + switch (kev->ident) { +#define SIG2CASE(sg) case sg: sprintf(ident_buf, #sg); break + SIG2CASE(SIGHUP); + SIG2CASE(SIGINT); + SIG2CASE(SIGQUIT); + SIG2CASE(SIGILL); + SIG2CASE(SIGTRAP); + SIG2CASE(SIGABRT); + SIG2CASE(SIGFPE); + SIG2CASE(SIGKILL); + SIG2CASE(SIGBUS); + SIG2CASE(SIGSEGV); + SIG2CASE(SIGSYS); + SIG2CASE(SIGPIPE); + SIG2CASE(SIGALRM); + SIG2CASE(SIGTERM); + SIG2CASE(SIGURG); + SIG2CASE(SIGSTOP); + SIG2CASE(SIGTSTP); + SIG2CASE(SIGCONT); + SIG2CASE(SIGCHLD); + SIG2CASE(SIGTTIN); + SIG2CASE(SIGTTOU); + SIG2CASE(SIGIO); + SIG2CASE(SIGXCPU); + SIG2CASE(SIGXFSZ); + SIG2CASE(SIGVTALRM); + SIG2CASE(SIGPROF); + SIG2CASE(SIGWINCH); + SIG2CASE(SIGINFO); + SIG2CASE(SIGUSR1); + SIG2CASE(SIGUSR2); + default: + sprintf(ident_buf, "%ld", kev->ident); + break; + } + break; + case EVFILT_TIMER: + filter_str = "EVFILT_TIMER"; + snprintf(ident_buf, sizeof(ident_buf), "0x%lx", kev->ident); + if (fflags) while (fflags) { + if (fflags_off) { + *fflags_off = '|'; + fflags_off++; + *fflags_off = '\0'; + } else { + fflags_off = fflags_buf; + } + + FFLAGIF(NOTE_SECONDS) + else FFLAGIF(NOTE_USECONDS) + else FFLAGIF(NOTE_NSECONDS) + else FFLAGIF(NOTE_ABSOLUTE) + else { + fflags_off += sprintf(fflags_off, "0x%x", fflags); + fflags = 0; + } + } + break; + case EVFILT_MACHPORT: + filter_str = "EVFILT_MACHPORT"; + snprintf(ident_buf, sizeof(ident_buf), "0x%lx", kev->ident); + break; + case EVFILT_FS: + filter_str = "EVFILT_FS"; + break; + default: + snprintf(filter_buf, sizeof(filter_buf), "%d", kev->filter); + filter_str = filter_buf; + break; + } + + syslog(level, "KEVENT: ident = %s filter = %s flags = %s fflags = %s data = 0x%x udata = %p", + ident_buf, filter_str, flags_buf, fflags_buf, kev->data, kev->udata); +} + kern_return_t x_handle_mport(mach_port_t junk __attribute__((unused))) { @@ -166,7 +357,10 @@ if (status.mps_msgcount) { EV_SET(&kev, members[i], EVFILT_MACHPORT, 0, 0, 0, jobmgr_find_by_service_port(root_jobmgr, members[i])); if (launchd_assumes(kev.udata != NULL)) { + log_kevent_struct(LOG_DEBUG, &kev); (*((kq_callback *)kev.udata))(kev.udata, &kev); + } else { + log_kevent_struct(LOG_ERR, &kev); } /* the callback may have tainted our ability to continue this for loop */ break; @@ -207,10 +401,10 @@ if (kevr == 1) { if (launchd_assumes(malloc_size(kev.udata) || dladdr(kev.udata, &dli))) { + log_kevent_struct(LOG_DEBUG, &kev); (*((kq_callback *)kev.udata))(kev.udata, &kev); } else { - syslog(LOG_ERR, "kev.ident == 0x%x kev.filter == 0x%x kev.fflags = 0x%x kev.udata = 0x%x", - kev.ident, kev.filter, kev.fflags, kev.udata); + log_kevent_struct(LOG_ERR, &kev); } }

1 0

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

14 Feb '07

Revision: 23061 http://trac.macosforge.org/projects/launchd/changeset/23061 Author: zarzycki(a)apple.com Date: 2007-02-14 09:09:18 -0800 (Wed, 14 Feb 2007) Log Message: ----------- <rdar://problem/4977071> postfix doesn't deliver until shutdown 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-14 01:52:08 UTC (rev 23060) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 17:09:18 UTC (rev 23061) @@ -2521,6 +2521,7 @@ case PATH_MISSING: fflags = NOTE_DELETE|NOTE_RENAME; break; + case DIR_NOT_EMPTY: case PATH_CHANGES: fflags = NOTE_DELETE|NOTE_RENAME|NOTE_REVOKE|NOTE_EXTEND|NOTE_WRITE|NOTE_ATTRIB|NOTE_LINK; break; @@ -2550,6 +2551,7 @@ case PATH_CHANGES: case PATH_EXISTS: case PATH_MISSING: + case DIR_NOT_EMPTY: break; default: continue;

1 0

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

14 Feb '07

Revision: 23060 http://trac.macosforge.org/projects/launchd/changeset/23060 Author: zarzycki(a)apple.com Date: 2007-02-13 17:52:08 -0800 (Tue, 13 Feb 2007) Log Message: ----------- <rdar://problem/4922374> Let the stdout/sterr pipe linger longer for GUI applications 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-14 01:42:50 UTC (rev 23059) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 01:52:08 UTC (rev 23060) @@ -273,7 +273,8 @@ importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1; mode_t mask; unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1, - currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1; + currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1, + wait4pipe_eof:1; char label[0]; }; @@ -869,6 +870,7 @@ } jr->unload_at_exit = true; + jr->wait4pipe_eof = true; jr->stall_before_exec = w4d; if (workingdir) { @@ -1637,7 +1639,7 @@ job_log(j, LOG_DEBUG, "Reaping"); - if (j->log_redirect_fd) { + if (j->log_redirect_fd && !j->wait4pipe_eof) { job_assumes(j, close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; } @@ -1773,6 +1775,7 @@ job_log(j, LOG_DEBUG, "Standard out/error pipe closed"); job_assumes(j, close(j->log_redirect_fd) != -1); j->log_redirect_fd = 0; + job_dispatch(j, false); } else if (job_assumes(j, rsz != -1)) { buf[rsz] = '\0'; @@ -2996,6 +2999,10 @@ return true; } + if (j->wait4pipe_eof && j->log_redirect_fd) { + return true; + } + if (j->p) { return true; }

1 0

[23059] trunk/launchd/src
by source_changes＠macosforge.org 14 Feb '07

14 Feb '07

Revision: 23059 http://trac.macosforge.org/projects/launchd/changeset/23059 Author: zarzycki(a)apple.com Date: 2007-02-13 17:42:50 -0800 (Tue, 13 Feb 2007) Log Message: ----------- More logging. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-13 21:39:11 UTC (rev 23058) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-14 01:42:50 UTC (rev 23059) @@ -362,6 +362,8 @@ return; } + job_log(j, LOG_DEBUG, "Ignoring..."); + j->currently_ignored = true; SLIST_FOREACH(sg, &j->sockets, sle) { @@ -388,6 +390,8 @@ return; } + job_log(j, LOG_DEBUG, "Watching..."); + j->currently_ignored = false; SLIST_FOREACH(sg, &j->sockets, sle) { @@ -1735,11 +1739,17 @@ if (job_useless(j)) { job_remove(j); return NULL; - } else if (kickstart || job_keepalive(j)) { + } else if (kickstart) { + job_log(j, LOG_DEBUG, "Kick-starting."); job_start(j); + } else if (job_keepalive(j)) { + job_log(j, LOG_DEBUG, "Keeping alive..."); + job_start(j); } else { job_watch(j); } + } else { + job_log(j, LOG_DEBUG, "Tried to dispatch an already active job."); } return j; @@ -1824,6 +1834,9 @@ { job_t j = obj; + job_log(j, LOG_DEBUG, "kev.ident = 0x%lx kev.filter = 0x%x kev->flags = 0x%x kev.fflags = 0x%x kev.data = 0x%lx kev.udata = %p", + kev->ident, kev->filter, kev->flags, kev->fflags, kev->data, kev->udata); + switch (kev->filter) { case EVFILT_PROC: return job_callback_proc(j, kev->fflags); @@ -2900,8 +2913,9 @@ SLIST_FOREACH(ms, &j->machservices, sle) { statusCnt = MACH_PORT_RECEIVE_STATUS_COUNT; if (mach_port_get_attributes(mach_task_self(), ms->port, MACH_PORT_RECEIVE_STATUS, - (mach_port_info_t)&status, &statusCnt) != KERN_SUCCESS) + (mach_port_info_t)&status, &statusCnt) != KERN_SUCCESS) { continue; + } if (status.mps_msgcount) { job_log(j, LOG_DEBUG, "KeepAlive check: job restarted due to %d queued Mach messages on service: %s", status.mps_msgcount, ms->name); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-13 21:39:11 UTC (rev 23058) +++ trunk/launchd/src/launchd_runtime.c 2007-02-14 01:42:50 UTC (rev 23059) @@ -165,7 +165,9 @@ } if (status.mps_msgcount) { EV_SET(&kev, members[i], EVFILT_MACHPORT, 0, 0, 0, jobmgr_find_by_service_port(root_jobmgr, members[i])); - (*((kq_callback *)kev.udata))(kev.udata, &kev); + if (launchd_assumes(kev.udata != NULL)) { + (*((kq_callback *)kev.udata))(kev.udata, &kev); + } /* the callback may have tainted our ability to continue this for loop */ break; }

1 0