Changeset 23045

Timestamp:

02/08/07 10:04:06 (22 months ago)

Author:

zarzycki@…

Message:

Dead code deletion.

Location:

trunk/launchd/src

Files:

• launchd.8 (modified) (1 diff)
• launchd.c (modified) (8 diffs)
• launchd.h (modified) (1 diff)
• launchd_core_logic.c (modified) (4 diffs)

trunk/launchd/src/launchd.8

@@ -38 +38 @@
 .Sh OPTIONS
 .Bl -tag -width -indent
-.It Fl d
-Daemonize. Useful when passing a command to launchd on the command line.
 .It Fl D
 Debug. Prints syslog messages to stderr and adjusts logging via
 .Xr syslog 3
 to LOG_DEBUG.
-.It Fl S Ar SessionType
-Instruct launchd to which session type it is.
 .El
 .Sh OPTIONS WHEN RUN AS PID 1

trunk/launchd/src/launchd.c

@@ -84 +84 @@
 
 static void signal_callback(void *, struct kevent *);
-static void ppidexit_callback(void);
 static void debugshutdown_callback(void);
 static void pfsystem_callback(void *, struct kevent *);
 
 static kq_callback kqsignal_callback = signal_callback;
-static kq_callback kqppidexit_callback = (kq_callback)ppidexit_callback;
 static kq_callback kqdebugshutdown_callback = (kq_callback)debugshutdown_callback;
 static kq_callback kqpfsystem_callback = pfsystem_callback;
@@ -124 +122 @@
                 SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2
         };
-        bool sflag = false, dflag = false, Dflag = false;
+        bool sflag = false, Dflag = false;
         char ldconf[PATH_MAX] = PID1LAUNCHD_CONF;
         const char *h = getenv("HOME");
-        const char *session_type = NULL;
         const char *optargs = NULL;
-        job_t fbj = NULL;
         struct stat sb;
         size_t i, checkin_fdcnt = 0;
         int *checkin_fds = NULL;
         mach_port_t checkin_mport = MACH_PORT_NULL;
-        int ch, ker, logopts;
+        int ch, logopts;
 
         testfd_or_openfd(STDIN_FILENO, _PATH_DEVNULL, O_RDONLY);
@@ -201 +197 @@
                 optargs = "s";
         } else {
-                optargs = "DS:dh";
+                optargs = "Dh";
         }
 
         while ((ch = getopt(argc, argv, optargs)) != -1) {
                 switch (ch) {
-                case 'S': session_type = optarg; break; /* what type of session we're creating */
                 case 'D': Dflag = true;   break;        /* debug */
-                case 'd': dflag = true;   break;        /* daemonize */
                 case 's': sflag = true;   break;        /* single user */
                 case 'h': usage(stdout);  break;        /* help */
@@ -223 +217 @@
         /* main phase three: get the party started */
 
-        if (dflag) {
-                launchd_assumes(daemon(0, 0) == 0);
-        }
-
         logopts = LOG_PID|LOG_CONS;
         if (Dflag) {
@@ -255 +245 @@
         launchd_assert(rlcj != NULL);
 
-        if (argv[0]) {
-                fbj = job_new(root_jobmgr, FIRSTBORN_LABEL, NULL, (const char *const *)argv, NULL);
-        }
-
         if (NULL == getenv("PATH")) {
                 setenv("PATH", _PATH_STDPATH, 1);
@@ -270 +256 @@
 
         monitor_networking_state();
-
-        if (session_type) {
-                pid_t pp = getppid();
-
-                /* As a per session launchd, we need to exit if our parent dies.
-                 *
-                 * Normally, in Unix, SIGHUP would cause us to exit, but we're a
-                 * daemon, and daemons use SIGHUP to signal the need to reread
-                 * configuration files. "Weee."
-                 */
-
-                if (pp == 1) {
-                        exit(EXIT_SUCCESS);
-                }
-
-                ker = kevent_mod(pp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqppidexit_callback);
-
-                if (ker == -1) {
-                        exit(launchd_assumes(errno == ESRCH) ? EXIT_SUCCESS : EXIT_FAILURE);
-                }
-        }
 
         /*
@@ -303 +268 @@
         if (!h && stat(ldconf, &sb) == 0) {
                 rlcj = job_dispatch(rlcj, true);
-        }
-
-        if (fbj) {
-                fbj = job_dispatch(fbj, true);
         }
 
@@ -432 +393 @@
 
 void
-ppidexit_callback(void)
-{
-        syslog(LOG_INFO, "Parent process exited");
-
-        launchd_shutdown();
-
-        /* Let's just bail for now. We should really try to wait for jobs to exit first. */
-        exit(EXIT_SUCCESS);
-}
-
-void
 launchd_shutdown(void)
 {

trunk/launchd/src/launchd.h

@@ -27 +27 @@
 #include "launchd_runtime.h"
 
-#define FIRSTBORN_LABEL "com.apple.launchd.firstborn"
 #define READCONF_LABEL "com.apple.launchd.readconfig"
 

trunk/launchd/src/launchd_core_logic.c

@@ -264 +264 @@
         time_t min_run_time;
         unsigned int start_interval;
-        unsigned int checkedin:1, firstborn:1, debug:1, inetcompat:1, inetcompat_wait:1,
+        unsigned int checkedin:1, anonymous: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;
+                     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,
@@ -927 +926 @@
         j->ondemand = true;
         j->checkedin = true;
-        j->firstborn = (strcmp(label, FIRSTBORN_LABEL) == 0);
 
         if (prog) {
@@ -1761 +1759 @@
         case EVFILT_PROC:
                 job_reap(j);
-
-                if (j->firstborn) {
-                        job_log(j, LOG_DEBUG, "first born died, begin shutdown");
-                        launchd_shutdown();
-                } else {
-                        job_dispatch(j, false);
-                }
+                job_dispatch(j, false);
                 break;
         case EVFILT_TIMER:
@@ -1880 +1872 @@
                 /* wait for our parent to say they've attached a kevent to us */
                 read(_fd(execspair[1]), &c, sizeof(c));
-                if (j->firstborn) {
-                        setpgid(getpid(), getpid());
-                        if (isatty(STDIN_FILENO)) {
-                                if (tcsetpgrp(STDIN_FILENO, getpid()) == -1) {
-                                        job_log_error(j, LOG_WARNING, "tcsetpgrp()");
-                                }
-                        }
-                }
 
                 if (sipc) {