October 2006 - launchd-changes - lists.macosforge.org

[22908] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 20 Oct '06

20 Oct '06

Revision: 22908 http://trac.macosforge.org/projects/launchd/changeset/22908 Author: zarzycki(a)apple.com Date: 2006-10-20 16:23:59 -0700 (Fri, 20 Oct 2006) Log Message: ----------- <rdar://problem/4795693> launchd-164 breaks LaunchServices-232.1, in that the uncork_fork() stuff doesn't work Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-19 22:44:06 UTC (rev 22907) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-20 23:23:59 UTC (rev 22908) @@ -3951,6 +3951,11 @@ return BOOTSTRAP_NO_MEMORY; } + if (!job_setup_machport(jr)) { + job_remove(jr); + return BOOTSTRAP_NO_MEMORY; + } + job_log(j, LOG_INFO, "Spawned with flags:%s%s", flags & SPAWN_WANTS_FORCE_PPC ? " ppc": "", flags & SPAWN_WANTS_WAIT4DEBUGGER ? " stopped": "");

1 0

[22907] trunk/launchd/src/launchd.c
by source_changes＠macosforge.org 19 Oct '06

19 Oct '06

Revision: 22907 http://trac.macosforge.org/projects/launchd/changeset/22907 Author: zarzycki(a)apple.com Date: 2006-10-19 15:44:06 -0700 (Thu, 19 Oct 2006) Log Message: ----------- Note to self. Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2006-10-17 20:46:21 UTC (rev 22906) +++ trunk/launchd/src/launchd.c 2006-10-19 22:44:06 UTC (rev 22907) @@ -429,6 +429,8 @@ shutdown_in_progress = true; if (stat("/var/db/debugShutdownHangs", &sb) != -1) { + // When this changes to a more sustainable API, update this: + // http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown debug_shutdown_hangs = true; }

1 0

[22906] tags/launchd-164/
by source_changes＠macosforge.org 17 Oct '06

17 Oct '06

Revision: 22906 http://trac.macosforge.org/projects/launchd/changeset/22906 Author: zarzycki(a)apple.com Date: 2006-10-17 13:46:21 -0700 (Tue, 17 Oct 2006) Log Message: ----------- "Tagging launchd-164 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-164/ Copied: tags/launchd-164 (from rev 22905, trunk)

1 0

[22905] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Oct '06

17 Oct '06

Revision: 22905 http://trac.macosforge.org/projects/launchd/changeset/22905 Author: zarzycki(a)apple.com Date: 2006-10-17 11:29:44 -0700 (Tue, 17 Oct 2006) Log Message: ----------- Deallocate the per job Mach port sooner. This port is used if-and-only-if the job is created via bootstrap_create_server(). Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-17 17:56:58 UTC (rev 22904) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-17 18:29:44 UTC (rev 22905) @@ -689,10 +689,12 @@ } /* preflight the string so we know how big it is */ - sprintf(buf, "100000.%s", basename((char *)argv[0])); + sprintf(buf, "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", basename((char *)argv[0])); j = job_new(jbs, buf, NULL, argv, NULL, MACH_PORT_NULL); + sprintf(j->label, "%p.%s", j, basename(j->argv[0])); + free(argv); if (!job_assumes(jbs, j != NULL)) { @@ -713,10 +715,8 @@ goto out_bad; } - sprintf(j->label, "%d.%s", MACH_PORT_INDEX(j->bs_port), basename(j->argv[0])); + job_log(j, LOG_INFO, "Legacy%s server created in bootstrap: %x", ond ? " on-demand" : "", jbs->bs_port); - job_log(j, LOG_INFO, "New%s server in bootstrap: %x", ond ? " on-demand" : "", jbs->bs_port); - return j; out_bad: @@ -3175,6 +3175,9 @@ { j->priv_port_has_senders = false; + job_assumes(j, launchd_mport_close_recv(j->bs_port) == KERN_SUCCESS); + j->bs_port = 0; + job_log(j, LOG_DEBUG, "No more senders on privileged Mach bootstrap port"); job_dispatch(j, false);

1 0

[22904] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Oct '06

17 Oct '06

Revision: 22904 http://trac.macosforge.org/projects/launchd/changeset/22904 Author: zarzycki(a)apple.com Date: 2006-10-17 10:56:58 -0700 (Tue, 17 Oct 2006) Log Message: ----------- <rdar://problem/4773940> 9A282 launchd throttling tftpd Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-16 23:58:59 UTC (rev 22903) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-17 17:56:58 UTC (rev 22904) @@ -1654,7 +1654,7 @@ td = time(NULL) - j->start_time; - if (td < j->min_run_time && !j->legacy_mach_job) { + if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) { time_t respawn_delta = j->min_run_time - td; job_log(j, LOG_WARNING, "Throttling respawn: Will start in %ld seconds", respawn_delta);

1 0

[22903] trunk/launchd/src/launchd.plist.5
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22903 http://trac.macosforge.org/projects/launchd/changeset/22903 Author: zarzycki(a)apple.com Date: 2006-10-16 16:58:59 -0700 (Mon, 16 Oct 2006) Log Message: ----------- <rdar://problem/4786088> 9A283: First elem of ProgramArguments being used as argv[0] even though Program present Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2006-10-16 23:44:45 UTC (rev 22902) +++ trunk/launchd/src/launchd.plist.5 2006-10-16 23:58:59 UTC (rev 22903) @@ -106,13 +106,17 @@ This configuration file only applies to sessions of the type specified. This key is used in concert with the -S flag to .Nm launchctl . -.It Sy ProgramArguments <array of strings> -This required key maps to the second argument of -.Xr execvp 3 . .It Sy Program <string> -This optional key maps to the first argument of +This key maps to the first argument of .Xr execvp 3 . If this key is missing, then the first element of the array of strings provided to the ProgramArguments will be used instead. +This key is required in the absence of the ProgramArguments key. +.It Sy ProgramArguments <array of strings> +This key maps to the second argument of +.Xr execvp 3 . +This key is required in the absence of the Program key. Please note! Many people are confused by this key. Please read +.Xr execvp 3 +very carefully! .It Sy EnableGlobbing <boolean> This flag causes .Nm launchd

1 0

[22902] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22902 http://trac.macosforge.org/projects/launchd/changeset/22902 Author: zarzycki(a)apple.com Date: 2006-10-16 16:44:45 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Better 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 2006-10-16 23:43:11 UTC (rev 22901) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-16 23:44:45 UTC (rev 22902) @@ -280,6 +280,7 @@ static void job_uncork_fork(job_t j); static struct machservice *job_lookup_service(job_t jbs, const char *name, bool check_parent); static void job_foreach_service(job_t jbs, void (*bs_iter)(struct machservice *, void *), void *context, bool only_anonymous); +static void job_logv(job_t j, int pri, const char *msg, va_list ap); static void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_bug(job_t j, const char *rcs_rev, const char *path, unsigned int line, const char *test); @@ -335,7 +336,7 @@ if (j->currently_ignored) { return; } - + j->currently_ignored = true; SLIST_FOREACH(sg, &j->sockets, sle) { @@ -836,6 +837,7 @@ j->parent = p ? job_get_bs(p) : NULL; j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME; j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT; + j->currently_ignored = true; j->ondemand = true; j->checkedin = true; j->firstborn = (strcmp(label, FIRSTBORN_LABEL) == 0); @@ -1567,13 +1569,7 @@ job_callback(void *obj, struct kevent *kev) { job_t j = obj; - bool d = j->debug; - int oldmask = 0; - if (d) { - oldmask = setlogmask(LOG_UPTO(LOG_DEBUG)); - } - switch (kev->filter) { case EVFILT_PROC: job_reap(j); @@ -1631,11 +1627,6 @@ job_assumes(j, false); break; } - - if (d) { - /* the job might have been removed, must not call job_log() */ - setlogmask(oldmask); - } } void @@ -2086,34 +2077,47 @@ } void -job_log_error(job_t j, int pri, const char *msg, ...) +job_logv(job_t j, int pri, const char *msg, va_list ap) { char newmsg[10000]; - va_list ap; + int oldmask = 0; size_t o; o = job_prep_log_preface(j, newmsg); - sprintf(newmsg + o, ": %s: %s", msg, strerror(errno)); + sprintf(newmsg + o, ": %s", msg); - va_start(ap, msg); + if (j->debug) { + oldmask = setlogmask(LOG_UPTO(LOG_DEBUG)); + } + vsyslog(pri, newmsg, ap); - va_end(ap); + + if (j->debug) { + setlogmask(oldmask); + } } void -job_log(job_t j, int pri, const char *msg, ...) +job_log_error(job_t j, int pri, const char *msg, ...) { char newmsg[10000]; va_list ap; - size_t o; - o = job_prep_log_preface(j, newmsg); + sprintf(newmsg, "%s: %s", msg, strerror(errno)); - sprintf(newmsg + o, ": %s", msg); + va_start(ap, msg); + job_logv(j, pri, newmsg, ap); + va_end(ap); +} +void +job_log(job_t j, int pri, const char *msg, ...) +{ + va_list ap; + va_start(ap, msg); - vsyslog(pri, newmsg, ap); + job_logv(j, pri, msg, ap); va_end(ap); }

1 0

[22901] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22901 http://trac.macosforge.org/projects/launchd/changeset/22901 Author: zarzycki(a)apple.com Date: 2006-10-16 16:43:11 -0700 (Mon, 16 Oct 2006) Log Message: ----------- <rdar://problem/4773962> Bug: launchd_core_logic.c:2170 (22866):2: kevent_mod(sg->fds[i], EVFILT_READ, EV_DELETE, 0, 0, NULL) != -1 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-16 21:57:58 UTC (rev 22900) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-16 23:43:11 UTC (rev 22901) @@ -234,7 +234,7 @@ anonymous:1; mode_t mask; unsigned int globargv:1, wait4debugger:1, transfer_bstrap:1, unload_at_exit:1, force_ppc:1, - stall_before_exec:1, only_once:1; + stall_before_exec:1, only_once:1, currently_ignored:1; char label[0]; }; @@ -332,6 +332,12 @@ struct machservice *ms; struct watchpath *wp; + if (j->currently_ignored) { + return; + } + + j->currently_ignored = true; + SLIST_FOREACH(sg, &j->sockets, sle) { socketgroup_ignore(j, sg); } @@ -352,6 +358,12 @@ struct machservice *ms; struct watchpath *wp; + if (!job_assumes(j, j->currently_ignored)) { + return; + } + + j->currently_ignored = false; + SLIST_FOREACH(sg, &j->sockets, sle) { socketgroup_watch(j, sg); }

1 0

[22900] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22900 http://trac.macosforge.org/projects/launchd/changeset/22900 Author: zarzycki(a)apple.com Date: 2006-10-16 14:57:58 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Typo Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-10-16 21:57:27 UTC (rev 22899) +++ trunk/launchd/src/launchctl.c 2006-10-16 21:57:58 UTC (rev 22900) @@ -131,7 +131,7 @@ static int touch_file(const char *path, mode_t m); static void do_sysversion_sysctl(void); static void workaround4465949(void); -static void do_application_firewal_magic(int sfd, launch_data_t thejob); +static void do_application_firewall_magic(int sfd, launch_data_t thejob); static int bootstrap_cmd(int argc, char *const argv[]); static int load_and_unload_cmd(int argc, char *const argv[]); @@ -844,7 +844,7 @@ return; } - do_application_firewal_magic(sfd, thejob); + do_application_firewall_magic(sfd, thejob); if (hints.ai_flags & AI_PASSIVE) { if (AF_INET6 == res->ai_family && -1 == setsockopt(sfd, IPPROTO_IPV6, IPV6_V6ONLY, @@ -2667,7 +2667,7 @@ } void -do_application_firewal_magic(int sfd, launch_data_t thejob) +do_application_firewall_magic(int sfd, launch_data_t thejob) { const char *prog = NULL, *partialprog = NULL; char *path, *pathtmp, **pathstmp;

1 0

[22899] trunk/launchd/src
by source_changes＠macosforge.org 16 Oct '06

16 Oct '06

Revision: 22899 http://trac.macosforge.org/projects/launchd/changeset/22899 Author: zarzycki(a)apple.com Date: 2006-10-16 14:57:27 -0700 (Mon, 16 Oct 2006) Log Message: ----------- <rdar://problem/4768702> Launchd needs "launch once and only once" capability Modified Paths: -------------- trunk/launchd/src/launch.h trunk/launchd/src/launchd.plist.5 trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launch.h =================================================================== --- trunk/launchd/src/launch.h 2006-10-16 21:18:21 UTC (rev 22898) +++ trunk/launchd/src/launch.h 2006-10-16 21:57:27 UTC (rev 22899) @@ -93,6 +93,7 @@ #define LAUNCH_JOBKEY_PID "PID" #define LAUNCH_JOBKEY_SUBJOBS "SubJobs" #define LAUNCH_JOBKEY_THROTTLEINTERVAL "ThrottleInterval" +#define LAUNCH_JOBKEY_LAUNCHONLYONCE "LaunchOnlyOnce" #define LAUNCH_JOBINETDCOMPATIBILITY_WAIT "Wait" Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2006-10-16 21:18:21 UTC (rev 22898) +++ trunk/launchd/src/launchd.plist.5 2006-10-16 21:57:27 UTC (rev 22899) @@ -172,7 +172,7 @@ The recommended idle time out (in seconds) to pass to the job. If no value is specified, a default time out will be supplied by .Nm launchd for use by the job at check in time. -.It Sy ThrottleInternval <integer> +.It Sy ThrottleInterval <integer> This key lets one override the default throttling policy imposed on jobs by .Nm launchd . The value is in seconds, and by default, jobs will not be spawned more than once every 10 seconds. @@ -265,20 +265,31 @@ value should be applied to the daemon. .It Sy LowPriorityIO <boolean> This optional key specifies whether the kernel should consider this daemon to be low priority when doing file system I/O. -.It Sy MachServices <dictionary of booleans> +.It Sy LaunchOnlyOnce <boolean> +This optional key specifies whether the job can only be run once and only once. +In other words, if the job cannot be safely respawned without a full machine +reboot, then set this key to be true. +.It Sy MachServices <dictionary of booleans or a dictionary of dictionaries> This optional key is used to specify Mach services to be registered with the Mach bootstrap sub-system. Each key in this dictionary should be the name of -service to be advertised. The value of the key must be a boolean. If the -boolean is true, the port is recycled, thus leaving clients to remain oblivious -to the demand nature of job. If the value is set to false, clients receive port +service to be advertised. The value of the key must be a boolean and set to true. +Alternatively, a dictionary can be used instead of a simple true value. +.Bl -ohang -offset indent +.It Sy ResetAtClose <boolean> +If this boolean is false, the port is recycled, thus leaving clients to remain oblivious +to the demand nature of job. If the value is set to true, clients receive port death notifications when the job lets go of the receive right. The port will be recreated atomically with respect to bootstrap_look_up() calls, so that clients can trust that after receiving a port death notification, the new port will -have already been recreated. Setting the value to false should be done with -care. Not all clients may be able to handle this behavior. Finally, for the job -itself, the values will be replaced with Mach ports at the time of check-in -with +have already been recreated. Setting the value to true should be done with +care. Not all clients may be able to handle this behavior. The default value is false. +.It Sy HideUntilCheckIn <boolean> +Reserve the name in the namespace, but cause bootstrap_look_up() to fail until the job has checked in with .Nm launchd . +.El +.Pp +Finally, for the job itself, the values will be replaced with Mach ports at the time of check-in with +.Nm launchd . .It Sy Sockets <dictionary of dictionaries... OR dictionary of array of dictionaries...> This optional key is used to specify launch on demand sockets that can be used to let .Nm launchd Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-16 21:18:21 UTC (rev 22898) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-16 21:57:27 UTC (rev 22899) @@ -229,10 +229,12 @@ time_t min_run_time; unsigned int start_interval; unsigned int checkedin:1, firstborn:1, debug:1, inetcompat:1, inetcompat_wait:1, - ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, - importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1, anonymous:1; + ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, + importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1, + anonymous:1; mode_t mask; - unsigned int globargv:1, wait4debugger:1, transfer_bstrap:1, unload_at_exit:1, force_ppc:1, stall_before_exec:1, __pad:26; + unsigned int globargv:1, wait4debugger:1, transfer_bstrap:1, unload_at_exit:1, force_ppc:1, + stall_before_exec:1, only_once:1; char label[0]; }; @@ -967,6 +969,8 @@ case 'L': if (strcasecmp(key, LAUNCH_JOBKEY_LOWPRIORITYIO) == 0) { j->low_pri_io = value; + } else if (strcasecmp(key, LAUNCH_JOBKEY_LAUNCHONLYONCE) == 0) { + j->only_once = value; } break; case 'i': @@ -2489,7 +2493,9 @@ bool job_useless(job_t j) { - if (j->unload_at_exit && j->start_time != 0) { + /* Yes, j->unload_at_exit and j->j->only_once seem the same, but they'll differ someday... */ + + if ((j->unload_at_exit || j->only_once) && j->start_time != 0) { job_log(j, LOG_INFO, "Exited. Was only configured to run once."); return true; } else if (shutdown_in_progress) { @@ -2608,14 +2614,6 @@ } if (j->priv_port_has_senders) { - if (j->start_time && !j->checkedin) { - if (j->legacy_mach_job) { - job_log(j, LOG_NOTICE, "Daemonized. Extremely expensive no-op."); - } else if (!j->unload_at_exit) { - job_log(j, LOG_ERR, "Daemonization is not supported under launchd."); - return false; - } - } return true; }

1 0