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

[23432] trunk/launchd/src
by source_changes＠macosforge.org 27 Sep '07

27 Sep '07

Revision: 23432 http://trac.macosforge.org/projects/launchd/changeset/23432 Author: zarzycki(a)apple.com Date: 2007-09-27 10:02:23 -0700 (Thu, 27 Sep 2007) Log Message: ----------- A debug function plus some random code comments. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-25 20:37:53 UTC (rev 23431) +++ trunk/launchd/src/launchd_runtime.c 2007-09-27 17:02:23 UTC (rev 23432) @@ -37,6 +37,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <sys/proc.h> #include <sys/event.h> #include <sys/queue.h> #include <sys/socket.h> @@ -180,6 +181,70 @@ } const char * +proc_flags_to_C_names(unsigned int flags) +{ +#define MAX_PFLAG_STR "P_ADVLOCK|P_CONTROLT|P_LP64|P_NOCLDSTOP|P_PPWAIT|P_PROFIL|P_SELECT|P_CONTINUED|P_SUGID|P_SYSTEM|P_TIMEOUT|P_TRACED|P_RESV3|P_WEXIT|P_EXEC|P_OWEUPC|P_AFFINITY|P_TRANSLATED|P_RESV5|P_CHECKOPENEVT|P_DEPENDENCY_CAPABLE|P_REBOOT|P_TBE|P_RESV7|P_THCWD|P_RESV9|P_RESV10|P_RESV11|P_NOSHLIB|P_FORCEQUOTA|P_NOCLDWAIT|P_NOREMOTEHANG|0xdeadbeeffeedface" + + static char flags_buf[sizeof(MAX_PFLAG_STR)]; + char *flags_off = NULL; + + if (!flags) { + return ""; + } + + while (flags) { + if (flags_off) { + *flags_off = '|'; + flags_off++; + *flags_off = '\0'; + } else { + flags_off = flags_buf; + } + +#define FLAGIF(f) if (flags & f) { flags_off += sprintf(flags_off, #f); flags &= ~f; } + + FLAGIF(P_ADVLOCK) + else FLAGIF(P_CONTROLT) + else FLAGIF(P_LP64) + else FLAGIF(P_NOCLDSTOP) + else FLAGIF(P_PPWAIT) + else FLAGIF(P_PROFIL) + else FLAGIF(P_SELECT) + else FLAGIF(P_CONTINUED) + else FLAGIF(P_SUGID) + else FLAGIF(P_SYSTEM) + else FLAGIF(P_TIMEOUT) + else FLAGIF(P_TRACED) + else FLAGIF(P_RESV3) + else FLAGIF(P_WEXIT) + else FLAGIF(P_EXEC) + else FLAGIF(P_OWEUPC) + else FLAGIF(P_AFFINITY) + else FLAGIF(P_TRANSLATED) + else FLAGIF(P_RESV5) + else FLAGIF(P_CHECKOPENEVT) + else FLAGIF(P_DEPENDENCY_CAPABLE) + else FLAGIF(P_REBOOT) + else FLAGIF(P_TBE) + else FLAGIF(P_RESV7) + else FLAGIF(P_THCWD) + else FLAGIF(P_RESV9) + else FLAGIF(P_RESV10) + else FLAGIF(P_RESV11) + else FLAGIF(P_NOSHLIB) + else FLAGIF(P_FORCEQUOTA) + else FLAGIF(P_NOCLDWAIT) + else FLAGIF(P_NOREMOTEHANG) + else { + flags_off += sprintf(flags_off, "0x%x", flags); + flags = 0; + } + } + + return flags_buf; +} + +const char * reboot_flags_to_C_names(unsigned int flags) { #define MAX_RB_STR "RB_ASKNAME|RB_SINGLE|RB_NOSYNC|RB_KDB|RB_HALT|RB_INITNAME|RB_DFLTROOT|RB_ALTBOOT|RB_UNIPROC|RB_SAFEBOOT|RB_UPSDELAY|0xdeadbeeffeedface" @@ -195,8 +260,6 @@ flags_off = flags_buf; } -#define FLAGIF(f) if (flags & f) { flags_off += sprintf(flags_off, #f); flags &= ~f; } - FLAGIF(RB_ASKNAME) else FLAGIF(RB_SINGLE) else FLAGIF(RB_NOSYNC) @@ -478,6 +541,14 @@ { fd_set rfds; + /* + * Yes, at first glance, calling select() on a kqueue seems silly. + * + * This avoids a race condition between the main thread and this helper + * thread by ensuring that we drain kqueue events on the same thread + * that manipulates the kqueue. + */ + for (;;) { FD_ZERO(&rfds); FD_SET(mainkq, &rfds); @@ -1356,6 +1427,15 @@ return runtime_log_pack(outval, outvalCnt); } +/* + * We should break this into two reference counts. + * + * One for hard references that would prevent exiting. + * One for soft references that would only prevent idle exiting. + * + * In the long run, reference counting should completely automate when a + * process can and should exit. + */ void runtime_add_ref(void) { Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-09-25 20:37:53 UTC (rev 23431) +++ trunk/launchd/src/launchd_runtime.h 2007-09-27 17:02:23 UTC (rev 23432) @@ -77,6 +77,7 @@ const char *signal_to_C_name(unsigned int sig); const char *reboot_flags_to_C_names(unsigned int flags); +const char *proc_flags_to_C_names(unsigned int flags); int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);

1 0

[23431] tags/launchd-256/
by source_changes＠macosforge.org 25 Sep '07

25 Sep '07

Revision: 23431 http://trac.macosforge.org/projects/launchd/changeset/23431 Author: zarzycki(a)apple.com Date: 2007-09-25 13:37:53 -0700 (Tue, 25 Sep 2007) Log Message: ----------- "Tagging launchd-256 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-256/ Copied: tags/launchd-256 (from rev 23430, trunk)

1 0

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

25 Sep '07

Revision: 23430 http://trac.macosforge.org/projects/launchd/changeset/23430 Author: zarzycki(a)apple.com Date: 2007-09-25 10:18:45 -0700 (Tue, 25 Sep 2007) Log Message: ----------- <rdar://problem/5502412> PubSubAgent isn't launched on schedule by launchd [PubSub isn't automatically refreshing] 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-25 17:15:32 UTC (rev 23429) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-25 17:18:45 UTC (rev 23430) @@ -5365,6 +5365,9 @@ } else if (inval) { if (j->start_interval == 0) { runtime_add_ref(); + } else { + /* Workaround 5225889 */ + job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1); } 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);

1 0

[23429] trunk/launchd/src/StartupItems.c
by source_changes＠macosforge.org 25 Sep '07

25 Sep '07

Revision: 23429 http://trac.macosforge.org/projects/launchd/changeset/23429 Author: zarzycki(a)apple.com Date: 2007-09-25 10:15:32 -0700 (Tue, 25 Sep 2007) Log Message: ----------- <rdar://problem/5503536> just installed startupitem will not start Modified Paths: -------------- trunk/launchd/src/StartupItems.c Modified: trunk/launchd/src/StartupItems.c =================================================================== --- trunk/launchd/src/StartupItems.c 2007-09-23 18:44:41 UTC (rev 23428) +++ trunk/launchd/src/StartupItems.c 2007-09-25 17:15:32 UTC (rev 23429) @@ -239,7 +239,11 @@ syslog(LOG_ERR, "lstat(\"%s\"): %m", aPath); return false; } - if (aStatBuf.st_ctimespec.tv_sec > boot_time.tv_sec) { + /* + * We check the boot time because of 5409386. + * We ignore the boot time if PPID != 1 because of 5503536. + */ + if ((aStatBuf.st_ctimespec.tv_sec > boot_time.tv_sec) && (getppid() == 1)) { syslog(LOG_WARNING, "\"%s\" failed sanity check: path was created after boot up", aPath); return false; }

1 0

[23428] tags/launchd-255/
by source_changes＠macosforge.org 23 Sep '07

23 Sep '07

Revision: 23428 http://trac.macosforge.org/projects/launchd/changeset/23428 Author: zarzycki(a)apple.com Date: 2007-09-23 11:44:41 -0700 (Sun, 23 Sep 2007) Log Message: ----------- "Tagging launchd-255 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-255/ Copied: tags/launchd-255 (from rev 23427, trunk)

1 0

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

22 Sep '07

Revision: 23427 http://trac.macosforge.org/projects/launchd/changeset/23427 Author: zarzycki(a)apple.com Date: 2007-09-21 19:46:20 -0700 (Fri, 21 Sep 2007) Log Message: ----------- <rdar://problem/5493389> Regression:VO QuickStart not working in 9A558 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-21 23:26:07 UTC (rev 23426) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-22 02:46:20 UTC (rev 23427) @@ -992,6 +992,7 @@ jr->mach_uid = uid; jr->ondemand = ond; jr->legacy_mach_job = true; + jr->abandon_pg = true; jr->priv_port_has_senders = true; /* the IPC that called us will make-send on this port */ if (!job_setup_machport(jr)) {

1 0

[23426] tags/launchd-254/
by source_changes＠macosforge.org 21 Sep '07

21 Sep '07

Revision: 23426 http://trac.macosforge.org/projects/launchd/changeset/23426 Author: zarzycki(a)apple.com Date: 2007-09-21 16:26:07 -0700 (Fri, 21 Sep 2007) Log Message: ----------- "Tagging launchd-254 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-254/ Copied: tags/launchd-254 (from rev 23425, trunk)

1 0

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

21 Sep '07

Revision: 23425 http://trac.macosforge.org/projects/launchd/changeset/23425 Author: zarzycki(a)apple.com Date: 2007-09-21 16:25:52 -0700 (Fri, 21 Sep 2007) Log Message: ----------- <rdar://problem/5487724> Leopard: M67 Hang on the way to power-off 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-21 20:36:08 UTC (rev 23424) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-21 23:25:52 UTC (rev 23425) @@ -4122,6 +4122,19 @@ jobmgr_log(jm, LOG_DEBUG, "Garbage collecting."); + /* + * Normally, we wait for all resources of a job (Unix PIDs/FDs and Mach ports) + * to reset before we conider the job truly dead and ready to be spawned again. + * + * In order to work around 5487724 and 3456090, we're going to call reboot() + * when the last PID dies and not wait for the associated resources to reset. + */ + if (getpid() == 1 && jm->parentmgr == NULL && total_children == 0) { + jobmgr_log(jm, LOG_DEBUG, "About to force a call to: reboot(%s)", reboot_flags_to_C_names(jm->reboot_flags)); + runtime_closelog(); + jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1); + } + if (jm->hopefully_first_cnt) { return jm; }

1 0

[23424] tags/launchd-253/
by source_changes＠macosforge.org 21 Sep '07

21 Sep '07

Revision: 23424 http://trac.macosforge.org/projects/launchd/changeset/23424 Author: zarzycki(a)apple.com Date: 2007-09-21 13:36:08 -0700 (Fri, 21 Sep 2007) Log Message: ----------- "Tagging launchd-253 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-253/ Copied: tags/launchd-253 (from rev 23423, trunk)

1 0

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

21 Sep '07

Revision: 23423 http://trac.macosforge.org/projects/launchd/changeset/23423 Author: zarzycki(a)apple.com Date: 2007-09-21 13:36:00 -0700 (Fri, 21 Sep 2007) Log Message: ----------- <rdar://problem/5495750> tftpd needs to adopt launchd AbandonProcessGroup key 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-20 23:22:05 UTC (rev 23422) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-21 20:36:00 UTC (rev 23423) @@ -1566,6 +1566,7 @@ case 'I': if (strcasecmp(key, LAUNCH_JOBKEY_INETDCOMPATIBILITY) == 0) { j->inetcompat = true; + j->abandon_pg = true; if ((tmp = launch_data_dict_lookup(value, LAUNCH_JOBINETDCOMPATIBILITY_WAIT))) { j->inetcompat_wait = launch_data_get_bool(tmp); }

1 0