Changeset 23274

Timestamp:

06/07/07 16:00:50 (18 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5257979> merge launchd's two kqueues into one

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (2 diffs)
• launchd.h (modified) (1 diff)
• launchd_core_logic.c (modified) (11 diffs)
• launchd_runtime.c (modified) (6 diffs)
• launchd_runtime.h (modified) (1 diff)
• launchd_unix_ipc.c (modified) (3 diffs)
• launchd_unix_ipc.h (modified) (1 diff)
• liblaunch.c (modified) (1 diff)

trunk/launchd/src/launchd.c

@@ -103 +103 @@
 bool debug_shutdown_hangs = false;
 bool network_up = false;
-int batch_disabler_count = 0;
 
 int
@@ -316 +315 @@
 }
 
-void
-batch_job_enable(bool e, struct conncb *c)
-{
-        if (e && c->disabled_batch) {
-                batch_disabler_count--;
-                c->disabled_batch = 0;
-                if (batch_disabler_count == 0) {
-                        runtime_force_on_demand(false);
-                }
-        } else if (!e && !c->disabled_batch) {
-                if (batch_disabler_count == 0) {
-                        runtime_force_on_demand(true);
-                }
-                batch_disabler_count++;
-                c->disabled_batch = 1;
-        }
-}
-
 bool
 get_network_state(void)

trunk/launchd/src/launchd.h

@@ -34 +34 @@
 extern bool debug_shutdown_hangs;
 extern bool network_up;
-extern int batch_disabler_count;
 extern mach_port_t inherited_bootstrap_port;
 
 bool init_check_pid(pid_t);
-
-void batch_job_enable(bool e, struct conncb *c);
 
 launch_data_t launchd_setstdio(int d, launch_data_t o);

trunk/launchd/src/launchd_core_logic.c

@@ -336 +336 @@
         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;
+                     importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, start_pending:1;
         mode_t mask;
         unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
@@ -1225 +1225 @@
         case 'R':
                 if (strcasecmp(key, LAUNCH_JOBKEY_RUNATLOAD) == 0) {
-                        j->runatload = value;
+                        if (value) {
+                                /* We don't want value == false to change j->start_pending */
+                                j->start_pending = true;
+                        }
                         found_key = true;
                 }
@@ -1943 +1946 @@
 
         LIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
-                job_dispatch(ji, newmounthack ? ji->start_on_mount : false);
+                if (newmounthack && ji->start_on_mount) {
+                        ji->start_pending = true;
+                }
+
+                job_dispatch(ji, false);
         }
 }
@@ -2068 +2075 @@
 job_callback_timer(job_t j, void *ident)
 {
-        if (j == ident || &j->start_interval == ident) {
+        if (j == ident) {
                 job_dispatch(j, true);
+        } else if (&j->start_interval == ident) {
+                j->start_pending = true;
+                job_dispatch(j, false);
         } else if (&j->exit_timeout == ident) {
                 if (j->sent_sigkill) {
@@ -2263 +2273 @@
                 job_log(j, LOG_DEBUG, "Started as PID: %u", c);
 
+                j->start_pending = false;
+
                 total_children++;
                 LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
@@ -2995 +3007 @@
         job_log(j, LOG_DEBUG, "Watch path modified: %s", si->what);
 
-        job_dispatch(j, si->why == PATH_CHANGES ? true : false);
+        if (si->why == PATH_CHANGES) {
+                j->start_pending = true;
+        }
+
+        job_dispatch(j, false);
+}
+
+static void
+calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context)
+{
+        struct tm *tmptm = context;
+        int64_t val;
+
+        if (LAUNCH_DATA_INTEGER != launch_data_get_type(obj)) {
+                /* hack to let caller know something went wrong */
+                tmptm->tm_sec = -1;
+                return;
+        }
+
+        val = launch_data_get_integer(obj);
+
+        if (strcasecmp(key, LAUNCH_JOBKEY_CAL_MINUTE) == 0) {
+                tmptm->tm_min = val;
+        } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_HOUR) == 0) {
+                tmptm->tm_hour = val;
+        } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_DAY) == 0) {
+                tmptm->tm_mday = val;
+        } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_WEEKDAY) == 0) {
+                tmptm->tm_wday = val;
+        } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_MONTH) == 0) {
+                tmptm->tm_mon = val;
+                tmptm->tm_mon -= 1; /* 4798263 cron compatibility */
+        }
 }
 
@@ -3001 +3045 @@
 calendarinterval_new_from_obj(job_t j, launch_data_t obj)
 {
-        launch_data_t tmp_k;
         struct tm tmptm;
 
@@ -3020 +3063 @@
         }
 
-        if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_MINUTE))) {
-                tmptm.tm_min = launch_data_get_integer(tmp_k);
-        }
-        if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_HOUR))) {
-                tmptm.tm_hour = launch_data_get_integer(tmp_k);
-        }
-        if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_DAY))) {
-                tmptm.tm_mday = launch_data_get_integer(tmp_k);
-        }
-        if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_WEEKDAY))) {
-                tmptm.tm_wday = launch_data_get_integer(tmp_k);
-        }
-        if ((tmp_k = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_CAL_MONTH))) {
-                tmptm.tm_mon = launch_data_get_integer(tmp_k);
-                tmptm.tm_mon -= 1; /* 4798263 cron compatibility */
+        launch_data_dict_iterate(obj, calendarinterval_new_from_obj_dict_walk, &tmptm);
+
+        if (tmptm.tm_sec == -1) {
+                return false;
         }
 
@@ -3081 +3113 @@
         if (job_assumes(j, ci != NULL)) {
                 calendarinterval_setalarm(j, ci);
-                job_dispatch(j, true);
+                j->start_pending = true;
+                job_dispatch(j, false);
         }
 }
@@ -3356 +3389 @@
         }
 
-        if (j->runatload && j->start_time == 0) {
+        if (j->start_pending && j->start_time == 0) {
                 job_log(j, LOG_DEBUG, "KeepAlive check: job needs to run at least once.");
                 return true;
@@ -4361 +4394 @@
                         why = launch_data_get_bool(obj) ? SUCCESSFUL_EXIT : FAILED_EXIT;
                         semaphoreitem_new(j, why, NULL);
-                        j->runatload = true;
+                        j->start_pending = true;
                 } else {
                         job_assumes(j, false);

trunk/launchd/src/launchd_runtime.c

@@ -70 +70 @@
 static mach_port_t launchd_internal_port;
 static int mainkq;
-static int asynckq;
 
 #define BULK_KEV_MAX 100
@@ -83 +82 @@
 static void *kqueue_demand_loop(void *arg);
 static void log_kevent_struct(int level, struct kevent *kev, int indx);
-
-static void async_callback(void);
-static kq_callback kqasync_callback = (kq_callback)async_callback;
 
 static void record_caller_creds(mach_msg_header_t *mh);
@@ -103 +99 @@
 
         launchd_assert((mainkq = kqueue()) != -1);
-        launchd_assert((asynckq = kqueue()) != -1);
-
-        launchd_assert(kevent_mod(asynckq, EVFILT_READ, EV_ADD, 0, 0, &kqasync_callback) != -1);
 
         launchd_assert((errno = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &demand_port_set)) == KERN_SUCCESS);
@@ -692 +685 @@
 {
         struct kevent kev;
-        int q = mainkq;
 
         switch (filter) {
@@ -698 +690 @@
         case EVFILT_WRITE:
                 break;
-        case EVFILT_TIMER:
-        case EVFILT_VNODE:
-        case EVFILT_FS:
-                q = asynckq;
-                /* fall through */
         default:
                 flags |= EV_CLEAR;
@@ -715 +702 @@
         EV_SET(&kev, ident, filter, flags, fflags, data, udata);
 
-        return kevent(q, &kev, 1, NULL, 0, NULL);
-}
-
-void
-async_callback(void)
-{
-        struct timespec timeout = { 0, 0 };
-        struct kevent kev;
-
-        if (launchd_assumes(kevent(asynckq, NULL, 0, &kev, 1, &timeout) == 1)) {
-                log_kevent_struct(LOG_DEBUG, &kev, 0);
-                (*((kq_callback *)kev.udata))(kev.udata, &kev);
-        }
-}
-
-void
-runtime_force_on_demand(bool b)
-{
-        launchd_assumes(kevent_mod(asynckq, EVFILT_READ, b ? EV_DISABLE : EV_ENABLE, 0, 0, &kqasync_callback) != -1);
+        return kevent(mainkq, &kev, 1, NULL, 0, NULL);
 }
 

trunk/launchd/src/launchd_runtime.h

@@ -62 +62 @@
 int runtime_close(int fd);
 
-void runtime_force_on_demand(bool);
 void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to);
 kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size);

trunk/launchd/src/launchd_unix_ipc.c

@@ -370 +370 @@
                         getrusage(RUSAGE_CHILDREN, &rusage);
                         resp = launch_data_new_opaque(&rusage, sizeof(rusage));
-                } else if (!strcmp(cmd, LAUNCH_KEY_BATCHQUERY)) {
-                        resp = launch_data_alloc(LAUNCH_DATA_BOOL);
-                        launch_data_set_bool(resp, batch_disabler_count == 0);
                 }
         } else if (!strcmp(cmd, LAUNCH_KEY_STARTJOB)) {
@@ -416 +413 @@
                         ipc_revoke_fds(resp);
                 }
-        } else if (!strcmp(cmd, LAUNCH_KEY_BATCHCONTROL)) {
-                batch_job_enable(launch_data_get_bool(data), rmc->c);
-                resp = launch_data_new_errno(0);
         }
 
@@ -427 +421 @@
 ipc_close(struct conncb *c)
 {
-        batch_job_enable(true, c);
-
         LIST_REMOVE(c, sle);
         launchd_close(c->conn, runtime_close);

trunk/launchd/src/launchd_unix_ipc.h

@@ -32 +32 @@
         launch_t conn;
         job_t j;
-        int disabled_batch:1, futureflags:31;
 };
 

trunk/launchd/src/liblaunch.c

@@ -1068 +1068 @@
 }
 
-void launchd_batch_enable(bool val)
-{
-        launch_data_t resp, tmp, msg;
-
-        tmp = launch_data_alloc(LAUNCH_DATA_BOOL);
-        launch_data_set_bool(tmp, val);
-
-        msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY);
-        launch_data_dict_insert(msg, tmp, LAUNCH_KEY_BATCHCONTROL);
-
-        resp = launch_msg(msg);
-
-        launch_data_free(msg);
-
-        if (resp)
-                launch_data_free(resp);
-}
-
-bool launchd_batch_query(void)
-{
-        launch_data_t resp, msg = launch_data_alloc(LAUNCH_DATA_STRING);
-        bool rval = true;
-
-        launch_data_set_string(msg, LAUNCH_KEY_BATCHQUERY);
-
-        resp = launch_msg(msg);
-
-        launch_data_free(msg);
-
-        if (resp) {
-                if (launch_data_get_type(resp) == LAUNCH_DATA_BOOL)
-                        rval = launch_data_get_bool(resp);
-                launch_data_free(resp);
-        }
-        return rval;
+void
+launchd_batch_enable(bool b)
+{
+        int64_t val = b;
+
+        vproc_swap_integer(NULL, VPROC_GSK_GLOBAL_ON_DEMAND, &val, NULL);
+}
+
+bool
+launchd_batch_query(void)
+{
+        int64_t val;
+
+        if (vproc_swap_integer(NULL, VPROC_GSK_GLOBAL_ON_DEMAND, NULL, &val) == NULL) {
+                return (bool)val;
+        }
+
+        return false;
 }