April 2009 - launchd-changes - lists.macosforge.org

[23904] trunk/launchd/src
by source_changes＠macosforge.org 22 Apr '09

22 Apr '09

Revision: 23904 http://trac.macosforge.org/projects/launchd/changeset/23904 Author: dsorresso(a)apple.com Date: 2009-04-22 13:16:44 -0700 (Wed, 22 Apr 2009) Log Message: ----------- More documentation updates, typo fixes. Modified Paths: -------------- trunk/launchd/src/launchctl.1 trunk/launchd/src/launchd.8 trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchctl.1 =================================================================== --- trunk/launchd/src/launchctl.1 2009-04-22 19:59:41 UTC (rev 23903) +++ trunk/launchd/src/launchctl.1 2009-04-22 20:16:44 UTC (rev 23904) @@ -37,7 +37,7 @@ must not be group- or world-writable. These restrictions are in place for security reasons, as allowing writability to a launchd configuration file allows one to specify which executable will be launched. - +.Pp Note that allowing non-root write access to the /System/Library/LaunchDaemons directory WILL render your system unbootable. .Bl -tag -width -indent .It Fl w @@ -127,7 +127,7 @@ column is negative, it represents the negative of the signal which killed the job. Thus, "-15" would indicate that the job was terminated with SIGTERM. The third column is the job's label. - +.Pp Note that you may see some jobs in the list whose labels are in the style "0xdeadbeef.anonymous.program". These are jobs which are not managed by .Nm launchd , @@ -135,12 +135,12 @@ .Nm launchd claims no ownership and makes no guarantees regarding these jobs. They are stored purely for bookkeeping purposes. - +.Pp Similarly, you may see labels of the style "0xdeadbeef.mach_init.program". These are legacy jobs that run under mach_init emulation. This mechanism will be removed in future versions, and all remaining mach_init jobs should be converted over to .Nm launchd . - +.Pp If .Op Ar label is specified, prints information about the requested job. If @@ -195,11 +195,14 @@ .Nm launchd . .It Xo Ar bslist .Op Ar PID | .. +.Op Ar -j .Xc This prints out Mach bootstrap services and their respective states. While the namespace appears flat, it is in fact hierarchical, thus allowing for certain services to be only available to a subset of processes. The three states a -service can be in are active ("A"), inactive ("I") and on-demand ("D"). If +service can be in are active ("A"), inactive ("I") and on-demand ("D"). +.Pp +If .Op Ar PID is specified, print the Mach bootstrap services available to that PID. If .Op Ar .. @@ -207,11 +210,19 @@ current bootstrap. Note that in Mac OS X v10.6, the per-user Mach bootstrap namespace is flat, so you will only see a different set of services in a per-user bootstrap if you are in an explicitly-created bootstrap subset. +.Pp +If +.Op Ar -j +is specified, each service name will be followed by the name of the job which registered +it. .It Ar bsexec Ar PID command Op Ar args This executes the given command in the same Mach bootstrap namespace hierachy as the given PID. -.It Ar bstree -This prints a hierarchical view of the entire Mach bootstrap tree. Requires root +.It Ar bstree Op Ar -j +This prints a hierarchical view of the entire Mach bootstrap tree. If +.Op Ar -j +is specified, each service name will be followed by the name of the job which registered it. +Requires root privileges. .It Ar managerpid This prints the PID of the launchd which manages the current bootstrap. Modified: trunk/launchd/src/launchd.8 =================================================================== --- trunk/launchd/src/launchd.8 2009-04-22 19:59:41 UTC (rev 23903) +++ trunk/launchd/src/launchd.8 2009-04-22 20:16:44 UTC (rev 23904) @@ -40,10 +40,13 @@ as opposed to more traditional mechanisms or mechanisms provided in earlier versions of Mac OS X. These alternate methods should be considered deprecated and not suitable for new projects. .Pp -Also, in the +In the .Nm launchd lexicon, a "daemon" is, by definition, a system-wide service of which there is one instance for all clients. An "agent" is a service that runs on -a per-user basis. If you wish your service to run as a certain user, in that user's environment, making it a +a per-user basis. Daemons should not attempt to display UI or interact directly with a user's login session. Any and all work that involves interacting +with a user should be done through agents. +.Pp +If you wish your service to run as a certain user, in that user's environment, making it a .Nm launchd agent is the ONLY supported means of accomplishing this on Mac OS X. In other words, it is not sufficient to perform a .Xr setuid 2 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2009-04-22 19:59:41 UTC (rev 23903) +++ trunk/launchd/src/launchd.plist.5 2009-04-22 20:16:44 UTC (rev 23904) @@ -98,7 +98,7 @@ .Xr launchctl 1 .Ar list subcommand or use the ServiceManagement framework's SMJobCopyDictionary() method. - +.Pp Note that as of Mac OS X v10.6, this key's value in a configuration file conveys a default value, which is changed with the .Op Ar -w @@ -112,7 +112,7 @@ will apply. See .Xr launchctl 1 for more information. - +.Pp Please also be mindful that you should only use this key if the provided on-demand and KeepAlive criteria are insufficient to describe the conditions under which your job needs to run. The cost to have a job loaded in

1 0

[23903] trunk/launchd/src
by source_changes＠macosforge.org 22 Apr '09

22 Apr '09

Revision: 23903 http://trac.macosforge.org/projects/launchd/changeset/23903 Author: dsorresso(a)apple.com Date: 2009-04-22 12:59:41 -0700 (Wed, 22 Apr 2009) Log Message: ----------- More documentation updates. Modified Paths: -------------- trunk/launchd/src/launchctl.1 trunk/launchd/src/launchd.8 trunk/launchd/src/launchd.conf.5 trunk/launchd/src/launchd.plist.5 trunk/launchd/src/rc.8 Modified: trunk/launchd/src/launchctl.1 =================================================================== --- trunk/launchd/src/launchctl.1 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchctl.1 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchctl 1 .Os Darwin .Sh NAME Modified: trunk/launchd/src/launchd.8 =================================================================== --- trunk/launchd/src/launchd.8 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.8 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchd 8 .Os Darwin .Sh NAME @@ -22,33 +22,13 @@ Where possible, it is preferable for jobs to launch on demand based on criteria specified in their respective configuration files. .Pp -When run with a command, a specific instance of -.Nm -is created and the command is implicitly added to the list of jobs maintained by -.Nm . -If the command exits, that instance of -.Nm -will clean up all jobs maintained by itself and exit. All children of the command will use that -instance of -.Nm . -.Pp During boot .Nm is invoked by the kernel to run as the first process on the system and to further bootstrap the rest of the system. -.Sh OPTIONS -.Bl -tag -width -indent -.It Fl D -Debug. Prints syslog messages to stderr and adjusts logging via -.Xr syslog 3 -to LOG_DEBUG. -.El -.Sh OPTIONS WHEN RUN AS PID 1 -.Bl -tag -width -indent -.It Fl s -Single user mode. Instructs -.Nm launchd -to give a shell prompt before booting the system. -.El +.Pp +You cannot invoke +.Nm +directly. .Sh ENVIRONMENTAL VARIABLES .Bl -tag -width -indent .It Pa LAUNCHD_SOCKET @@ -59,7 +39,7 @@ .Nm launchd as opposed to more traditional mechanisms or mechanisms provided in earlier versions of Mac OS X. These alternate methods should be considered deprecated and not suitable for new projects. - +.Pp Also, in the .Nm launchd lexicon, a "daemon" is, by definition, a system-wide service of which there is one instance for all clients. An "agent" is a service that runs on @@ -84,5 +64,3 @@ .Sh SEE ALSO .Xr launchctl 1 , .Xr launchd.plist 5 , -.Xr rc 8 , -.Xr SystemStarter 8 Modified: trunk/launchd/src/launchd.conf.5 =================================================================== --- trunk/launchd/src/launchd.conf.5 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.conf.5 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd January 10, 2005 +.Dd 1 May, 2009 .Dt launchd.conf 5 .Os Darwin .Sh NAME @@ -9,15 +9,18 @@ .Nm /etc/launchd.conf .Sh DESCRIPTION .Nm -contains a list of subcommands to run via -.Nm launchctl +contains a list of subcommands +.Ar ( load , +.Ar unload , +etc.) to run via +.Xr launchctl 1 when -.Nm launchd +.Xr launchd 8 starts. .Sh FILES .Bl -tag -width "$HOME/.launchd.conf" -compact .It Pa $HOME/.launchd.conf -Your launchd configuration file. +Your launchd configuration file (currently unsupported). .It Pa /etc/launchd.conf The system's launchd configuration file. .El Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.plist.5 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchd.plist 5 .Os Darwin .Sh NAME @@ -171,7 +171,7 @@ is free to send the SIGKILL signal. .It Sy OnDemand <boolean> This key was used in Mac OS X 10.4 to control whether a job was kept alive or not. The default was true. -This key has been deprecated and replaced in Mac OS X 10.5 with the more powerful KeepAlive option. +This key has been deprecated and replaced in Mac OS X 10.5 and later with the more powerful KeepAlive option. .It Sy KeepAlive <boolean or dictionary of stuff> This optional key is used to control whether your job is to be kept continuously running or to let demand and conditions control the invocation. The @@ -485,15 +485,14 @@ .It Pa /Library/LaunchAgents Per-user agents provided by the administrator. .It Pa /Library/LaunchDaemons -System wide daemons provided by the administrator. +System-wide daemons provided by the administrator. .It Pa /System/Library/LaunchAgents -Mac OS X Per-user agents. +Per-user agents provided by Mac OS X. .It Pa /System/Library/LaunchDaemons -Mac OS X System wide daemons. +System-wide daemons provided by Mac OS X. .El .Sh SEE ALSO .Xr launchctl 1 , -.Xr launch 3 , .Xr sysctl 3 , .Xr launchd 8 , .Xr plist 5 Modified: trunk/launchd/src/rc.8 =================================================================== --- trunk/launchd/src/rc.8 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/rc.8 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd May 31, 2006 +.Dd 1 May, 2009 .Dt RC 8 .Os Darwin .Sh NAME @@ -8,22 +8,15 @@ .Nm rc .Nm rc.local .Sh DESCRIPTION -Prior to Mac OS X 10.5, the -.Nm rc -script -was used to bootstrap the OS. As of Leopard, the system is self-bootstrapped via -.Xr launchd 8 -which uses the -.Xr launchctl 1 -bootstrap subcommand to read in launchd jobs from the standard locations. -For compatibility reasons, the .Nm rc.local -script still continues to work. -.Pp -The startup file -.Nm rc.local -reside in -.Pa /etc . +is now unsupported and has been replaced with +.Xr launchd 8 , +which bootstraps itself via the +.Xr launchctl 1 +.Ar bootstrap +subcommand to read in +.Xr launchd 8 +jobs from the standard locations. .Sh SEE ALSO .Xr launchd 8 , .Xr launchctl 1

1 0

[23902] trunk/launchd/src
by source_changes＠macosforge.org 20 Apr '09

20 Apr '09

Revision: 23902 http://trac.macosforge.org/projects/launchd/changeset/23902 Author: dsorresso(a)apple.com Date: 2009-04-20 15:46:16 -0700 (Mon, 20 Apr 2009) Log Message: ----------- <rdar://problem/6802599> ?\195?\162?\194?\152?\194?\130: launchd needs documentation updates Modified Paths: -------------- trunk/launchd/src/launchctl.1 trunk/launchd/src/launchd.8 trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchctl.1 =================================================================== --- trunk/launchd/src/launchctl.1 2009-04-17 22:04:16 UTC (rev 23901) +++ trunk/launchd/src/launchctl.1 2009-04-20 22:46:16 UTC (rev 23902) @@ -32,9 +32,18 @@ Load the specified configuration files or directories of configuration files. Jobs that are not on-demand will be started as soon as possible. All specified jobs will be loaded before any of them are allowed to start. +Note that per-user configuration files (LaunchAgents) must be owned by the user +loading them. All system-wide daemons (LaunchDaemons) must be owned by root. Configuration files +must not be group- or world-writable. These restrictions are in place for security reasons, +as allowing writability to a launchd configuration file allows one to specify which executable +will be launched. + +Note that allowing non-root write access to the /System/Library/LaunchDaemons directory WILL render your system unbootable. .Bl -tag -width -indent .It Fl w -Remove the disabled key and write the configuration files back out to disk. +Overrides the Disabled key and sets it to false. In previous versions, this option +would modify the configuration file. Now the state of the Disabled key is stored +elsewhere on-disk. .It Fl F Force the loading of the plist. Ignore the Disabled key. .It Fl S Ar sessiontype @@ -61,7 +70,9 @@ This will also stop the job if it is running. .Bl -tag -width -indent .It Fl w -Add the disabled key and write the configuration files back out to disk. +Overrides the Disabled key and sets it to true. In previous versions, this option +would modify the configuration file. Now the state of the Disabled key is stored +elsewhere on-disk. .It Fl S Ar sessiontype Some jobs only make sense in certain contexts. This flag instructs .Nm launchctl @@ -105,9 +116,36 @@ restart the job if launchd finds any criteria that is satisfied. Non-demand based jobs will always be restarted. Use of this subcommand is discouraged. Jobs should ideally idle timeout by themselves. -.It Ar list -List all of the jobs loaded into +.It Xo Ar list +.Op Ar -x +.Op Ar label +.Xc +With no arguments, list all of the jobs loaded into +.Nm launchd +in three columns. The first column displays the PID of the job if it is running. +The second column displays the last exit status of the job. If the number in this +column is negative, it represents the negative of the signal which killed the job. +Thus, "-15" would indicate that the job was terminated with SIGTERM. The third column +is the job's label. + +Note that you may see some jobs in the list whose labels are in the style "0xdeadbeef.anonymous.program". +These are jobs which are not managed by +.Nm launchd , +but, at one point, made a request to it. +.Nm launchd +claims no ownership and makes no guarantees regarding these jobs. They are stored purely for +bookkeeping purposes. + +Similarly, you may see labels of the style "0xdeadbeef.mach_init.program". These are legacy jobs that run +under mach_init emulation. This mechanism will be removed in future versions, and all remaining mach_init +jobs should be converted over to .Nm launchd . + +If +.Op Ar label +is specified, prints information about the requested job. If +.Op Ar -x +is specified, the information for the specified job is output as an XML property list. .It Ar setenv Ar key Ar value Set an environmental variable inside of .Nm launchd . @@ -155,14 +193,35 @@ .Xr umask 2 of .Nm launchd . -.It Ar bslist Op Ar PID +.It Xo Ar bslist +.Op Ar PID | .. +.Xc This prints out Mach bootstrap services and their respective states. While the namespace appears flat, it is in fact hierarchical, thus allowing for certain services to be only available to a subset of processes. The three states a -service can be in are active ("A"), inactive ("I") and on-demand ("D"). +service can be in are active ("A"), inactive ("I") and on-demand ("D"). If +.Op Ar PID +is specified, print the Mach bootstrap services available to that PID. If +.Op Ar .. +is specified, print the Mach bootstrap services available in the parent of the +current bootstrap. Note that in Mac OS X v10.6, the per-user Mach bootstrap namespace +is flat, so you will only see a different set of services in a per-user bootstrap +if you are in an explicitly-created bootstrap subset. .It Ar bsexec Ar PID command Op Ar args This executes the given command in the same Mach bootstrap namespace hierachy as the given PID. +.It Ar bstree +This prints a hierarchical view of the entire Mach bootstrap tree. Requires root +privileges. +.It Ar managerpid +This prints the PID of the launchd which manages the current bootstrap. +.It Ar manageruid +This prints the UID of the launchd which manages the current bootstrap. +.It Ar managername +This prints the name of the launchd job manager which manages the current bootstrap. +See LimitLoadToSessionType in +.Xr launchd.plist 5 +for more details. .It Ar help Print out a quick usage statement. .El Modified: trunk/launchd/src/launchd.8 =================================================================== --- trunk/launchd/src/launchd.8 2009-04-17 22:04:16 UTC (rev 23901) +++ trunk/launchd/src/launchd.8 2009-04-20 22:46:16 UTC (rev 23902) @@ -55,14 +55,19 @@ This variable is exported when invoking a command via the launchd command line. It informs launchctl how to find the correct launchd to talk to. .El .Sh NOTES -In Darwin it is preferable to have your daemon launch via launchd instead of modifying -.Nm rc -or creating a -.Nm SystemStarter -Startup Item. -.Pp -At some point in the future, we hope to completely phase out the use of -.Nm rc . +In Darwin, the canonical way to launch a daemon is through +.Nm launchd +as opposed to more traditional mechanisms or mechanisms provided in earlier versions of Mac OS X. These alternate methods should +be considered deprecated and not suitable for new projects. + +Also, in the +.Nm launchd +lexicon, a "daemon" is, by definition, a system-wide service of which there is one instance for all clients. An "agent" is a service that runs on +a per-user basis. If you wish your service to run as a certain user, in that user's environment, making it a +.Nm launchd +agent is the ONLY supported means of accomplishing this on Mac OS X. In other words, it is not sufficient to perform a +.Xr setuid 2 +to become a user in the truest sense on Mac OS X. .Sh FILES .Bl -tag -width "/System/Library/LaunchDaemons" -compact .It Pa ~/Library/LaunchAgents @@ -70,11 +75,11 @@ .It Pa /Library/LaunchAgents Per-user agents provided by the administrator. .It Pa /Library/LaunchDaemons -System wide daemons provided by the administrator. +System-wide daemons provided by the administrator. .It Pa /System/Library/LaunchAgents -Mac OS X Per-user agents. +Per-user agents provided by Mac OS X. .It Pa /System/Library/LaunchDaemons -Mac OS X System wide daemons. +System-wide daemons provided by Mac OS X. .El .Sh SEE ALSO .Xr launchctl 1 , Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2009-04-17 22:04:16 UTC (rev 23901) +++ trunk/launchd/src/launchd.plist.5 2009-04-20 22:46:16 UTC (rev 23902) @@ -79,13 +79,45 @@ Property lists are Apple's standard configuration file format. Please see .Xr plist 5 for more information. Please note: property list files are expected to have their name end in ".plist". +Also please note that it is the expected convention for launchd property list files to be named <Label>.plist. +Thus, if your job label is "com.apple.sshd", your plist file should be named "com.apple.sshd.plist". .Pp .Bl -ohang .It Sy Label <string> This required key uniquely identifies the job to .Nm launchd . .It Sy Disabled <boolean> -This optional key is used to disable your job. The default is false. +This optional key is used as a hint to +.Xr launchctl 1 +that it should not submit this job to +.Nm launchd +when loading a job or jobs. The value of this key does NOT reflect the current state of the job on the running system. If you wish to know whether a job is loaded in launchd, reading this key from a configuration file yourself is not a +sufficient test. You should query +.Nm launchd +for the presence of the job using the +.Xr launchctl 1 +.Ar list +subcommand or use the ServiceManagement framework's SMJobCopyDictionary() method. + +Note that as of Mac OS X v10.6, this key's value in a configuration +file conveys a default value, which is changed with the +.Op Ar -w +option of the +.Xr launchctl 1 +.Ar load +and +.Ar unload +subcommands. These subcommands no longer modify the configuration file, so the value displayed in the configuration file is not necessarily the value that +.Xr launchctl 1 +will apply. See +.Xr launchctl 1 +for more information. + +Please also be mindful that you should only use this key if the provided +on-demand and KeepAlive criteria are insufficient to describe the conditions under which your job needs to run. The cost +to have a job loaded in +.Nm launchd +is negligible, so there is no harm in loading a job which only runs once or very rarely. .It Sy UserName <string> This optional key specifies the user to run the job as. This key is only applicable when launchd is running as root. .It Sy GroupName <string> @@ -186,7 +218,7 @@ .Xr chdir 2 to before running the job. .It Sy EnvironmentVariables <dictionary of strings> -This optional key is used to specify additional environmental variables to be setup before running the job. +This optional key is used to specify additional environmental variables to be set before running the job. .It Sy Umask <integer> This optional key specifies what value should be passed to .Xr umask 2 @@ -206,9 +238,9 @@ The principle behind this is that jobs should linger around just in case they are needed again in the near future. This not only reduces the latency of responses, but it encourages developers to amortize the cost of program invocation. .It Sy InitGroups <boolean> -This optional key specifies whether the job should have +This optional key specifies whether .Xr initgroups 3 -be called before running the job. +should be called before running the job. The default is true in 10.5 and false in 10.4. This key will be ignored if the UserName key is not set. .It Sy WatchPaths <array of strings> This optional key causes the job to be started if any one of the listed paths are modified. @@ -356,8 +388,8 @@ know when to run the job. The job must check-in to get a copy of the file descriptors using APIs outlined in .Xr launch 3 . The keys of the top level Sockets dictionary can be anything. They are meant for the application developer to use to -differentiate different which descriptors correspond to which application level protocols (e.g. http vs. ftp vs. DNS...). -At check in time, the value of each Sockets dictionary key will be an array of descriptors. Daemon/Agent writers should +differentiate which descriptors correspond to which application level protocols (e.g. http vs. ftp vs. DNS...). +At check-in time, the value of each Sockets dictionary key will be an array of descriptors. Daemon/Agent writers should consider all descriptors of a given key to be to be effectively equivalent, even though each file descriptor likely represents a different networking protocol which conforms to the criteria specified in the job configuration file. .Pp

1 0

[23901] tags/launchd-318/
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 23901 http://trac.macosforge.org/projects/launchd/changeset/23901 Author: dsorresso(a)apple.com Date: 2009-04-17 15:04:16 -0700 (Fri, 17 Apr 2009) Log Message: ----------- "Tagging launchd-318 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-318/ Property changes on: tags/launchd-318 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0

[23900] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 23900 http://trac.macosforge.org/projects/launchd/changeset/23900 Author: dsorresso(a)apple.com Date: 2009-04-17 14:38:42 -0700 (Fri, 17 Apr 2009) Log Message: ----------- <rdar://problem/6787049> 10A330 won't shut down: launchd still alive with 13/6 (normal/anon) children Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-17 21:37:51 UTC (rev 23899) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-17 21:38:42 UTC (rev 23900) @@ -2919,7 +2919,7 @@ return; } - if (j->sampling_complete || j->per_user) { + if( !job_assumes(j, !j->sampling_complete) ) { return; } @@ -3342,6 +3342,10 @@ * with the long SIGKILL */ + if( j->per_user ) { + /* Don't sample per-user launchd's. */ + j->sampling_complete = true; + } bool was_is_or_will_be_sampled = ( j->sampling_complete || j->is_being_sampled || j->pending_sample ); bool should_enqueue = ( !was_is_or_will_be_sampled && do_apple_internal_logging );

1 0

[23899] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 23899 http://trac.macosforge.org/projects/launchd/changeset/23899 Author: dsorresso(a)apple.com Date: 2009-04-17 14:37:51 -0700 (Fri, 17 Apr 2009) Log Message: ----------- <rdar://problem/6787083> Finder refuses to launch after Force Quit (error -10810) Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-16 22:18:10 UTC (rev 23898) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-17 21:37:51 UTC (rev 23899) @@ -8532,9 +8532,24 @@ otherj = job_dispatch(otherj, true); if (!job_assumes(j, otherj && otherj->p)) { + /* <rdar://problem/6787083> Clear this flag if we failed to start the job. */ + otherj->stall_before_exec = false; return BOOTSTRAP_NO_MEMORY; } + /* If any of these proceeding steps fail, we return an error to the client. + * the problem is that, if the client has requested the job be stalled before + * exec(2), the client won't be able to uncork the fork(2), leaving the job + * forever stalled until the client tries again and we successfully start + * the job. + * + * See <rdar://problem/6787083> for more about the implications. + * + * Fortunately, these next actions should pretty much never fail. In the + * future, we should look at cleaning up after these failures if the job + * was started in a stalled state. + */ + kern_return_t kr = task_name_for_pid(mach_task_self(), otherj->p, out_name_port); if (!job_assumes(j, kr == 0)) { return kr;

1 0

[23898] trunk/launchd/src
by source_changes＠macosforge.org 16 Apr '09

16 Apr '09

Revision: 23898 http://trac.macosforge.org/projects/launchd/changeset/23898 Author: dsorresso(a)apple.com Date: 2009-04-16 15:18:10 -0700 (Thu, 16 Apr 2009) Log Message: ----------- <rdar://problem/6787653> launchd's periodic sync() seems to be bad for shutdown time when it happens during shutdown. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2009-04-15 21:27:54 UTC (rev 23897) +++ trunk/launchd/src/launchd.c 2009-04-16 22:18:10 UTC (rev 23898) @@ -112,7 +112,6 @@ static bool re_exec_in_single_user_mode; static void *crash_addr; static pid_t crash_pid; -static unsigned int g_sync_frequency = 30; bool shutdown_in_progress; bool fake_shutdown_in_progress; @@ -121,6 +120,7 @@ char g_my_label[128] = "__Uninitialized__"; char g_launchd_database_dir[PATH_MAX]; FILE *g_console = NULL; +int32_t g_sync_frequency = 30; int main(int argc, char *const *argv) @@ -263,6 +263,7 @@ sleep(g_sync_frequency); } + runtime_syslog(LOG_DEBUG, "Update thread exiting."); return NULL; } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-15 21:27:54 UTC (rev 23897) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-16 22:18:10 UTC (rev 23898) @@ -982,6 +982,10 @@ if (jm->parentmgr == NULL && pid1_magic) { jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 5, jm)); + #if !TARGET_OS_EMBEDDED + /* Kill the update thread. */ + jobmgr_assumes(jm, __sync_sub_and_fetch(&g_sync_frequency, 30) == 0); + #endif } return jobmgr_do_garbage_collection(jm); Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2009-04-15 21:27:54 UTC (rev 23897) +++ trunk/launchd/src/launchd_runtime.h 2009-04-16 22:18:10 UTC (rev 23898) @@ -108,6 +108,7 @@ extern bool g_log_per_user_shutdown; extern bool g_log_strict_usage; extern bool g_embedded_shutdown_log; +extern int32_t g_sync_frequency; extern pid_t g_wsp; mach_port_t runtime_get_kernel_port(void);

1 0

[23897] tags/launchd-317/
by source_changes＠macosforge.org 15 Apr '09

15 Apr '09

Revision: 23897 http://trac.macosforge.org/projects/launchd/changeset/23897 Author: dsorresso(a)apple.com Date: 2009-04-15 14:27:54 -0700 (Wed, 15 Apr 2009) Log Message: ----------- "Tagging launchd-317 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-317/ Property changes on: tags/launchd-317 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0

[23896] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 15 Apr '09

15 Apr '09

Revision: 23896 http://trac.macosforge.org/projects/launchd/changeset/23896 Author: dsorresso(a)apple.com Date: 2009-04-15 01:45:01 -0700 (Wed, 15 Apr 2009) Log Message: ----------- <rdar://problem/6780952> sampling processes at shutdown should not use Spotlight Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-14 21:34:28 UTC (rev 23895) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-15 08:45:01 UTC (rev 23896) @@ -2889,7 +2889,12 @@ { char pidstr[32]; snprintf(pidstr, sizeof(pidstr), "%u", j->p); +#if !TARGET_OS_EMBEDDED + /* -nodsyms so sample doesn't try to use Spotlight to find dsym files after mds has gone away. */ + char *sample_args[] = { "/usr/bin/sample", pidstr, "1", "-unsupportedShowArch", "-mayDie", "-nodsyms", "-file", j->mgr->sample_log_file, NULL }; +#else char *sample_args[] = { "/usr/bin/sample", pidstr, "1", "-unsupportedShowArch", "-mayDie", "-file", j->mgr->sample_log_file, NULL }; +#endif execve(sample_args[0], sample_args, environ); _exit(EXIT_FAILURE);

1 0

[23895] tags/launchd-316/
by source_changes＠macosforge.org 14 Apr '09

14 Apr '09

Revision: 23895 http://trac.macosforge.org/projects/launchd/changeset/23895 Author: dsorresso(a)apple.com Date: 2009-04-14 14:34:28 -0700 (Tue, 14 Apr 2009) Log Message: ----------- "Tagging launchd-316 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-316/ Property changes on: tags/launchd-316 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828

1 0