Changeset 23376

Timestamp:

09/12/07 17:48:46 (15 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5475980> The per-user launchd needs to idle exit

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (17 diffs)
• launchd_runtime.c (modified) (5 diffs)
• launchd_runtime.h (modified) (2 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -94 +94 @@
 
 #define LAUNCHD_MIN_JOB_RUN_TIME 10
-#define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
 #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
 #define LAUNCHD_SIGKILL_TIMER 5
@@ -451 +450 @@
 
 /* file local globals */
-static unsigned int total_children;
+static size_t total_children;
 static mach_port_t the_exception_server;
 static bool did_first_per_user_launchd_BootCache_hack;
@@ -647 +646 @@
 still_alive_with_check(void)
 {
-        jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %u children.", total_children);
+        jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu children.", total_children);
 
         runtime_closelog(); /* hack to flush logs */
@@ -741 +740 @@
         struct envitem *ei;
 
+        if (j == workaround_5477111) {
+                job_log(j, LOG_NOTICE, "@@@@@ Tried to remove ahead of schedule!");
+        }
+
         if (j->p && j->anonymous) {
                 job_reap(j);
@@ -838 +841 @@
         }
         if (j->start_interval) {
+                runtime_del_ref();
                 job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1);
         }
@@ -1123 +1127 @@
         j->mgr = jm;
         j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME;
-        j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT;
+        j->timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT;
         j->exit_timeout = LAUNCHD_DEFAULT_EXIT_TIMEOUT;
         j->currently_ignored = true;
@@ -1461 +1465 @@
                                 job_log(j, LOG_WARNING, "StartInterval is not greater than zero, ignoring");
                         } else {
+                                runtime_add_ref();
                                 j->start_interval = value;
                         }
@@ -1951 +1956 @@
         }
 
+        if (!j->anonymous) {
+                runtime_del_ref();
+        }
         total_children--;
         LIST_REMOVE(j, pid_hash_sle);
@@ -2389 +2397 @@
                 j->start_pending = false;
 
+                runtime_add_ref();
                 total_children++;
                 LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
@@ -3263 +3272 @@
         calendarinterval_setalarm(j, ci);
 
+        runtime_add_ref();
+
         return true;
 }
@@ -3273 +3284 @@
 
         free(ci);
+
+        runtime_del_ref();
 }
 
@@ -3330 +3343 @@
         SLIST_INSERT_HEAD(&j->sockets, sg, sle);
 
+        runtime_add_ref();
+
         return true;
 }
@@ -3346 +3361 @@
         free(sg->fds);
         free(sg);
+
+        runtime_del_ref();
 }
 
@@ -3543 +3560 @@
                 return true;
         } else if (j->mgr->shutting_down) {
-                job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %u", total_children);
+                job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu", total_children);
                 return true;
         } else if (j->legacy_mach_job) {
@@ -4560 +4577 @@
         SLIST_INSERT_HEAD(&j->semaphores, si, sle);
 
+        runtime_add_ref();
+
         return true;
 }
@@ -4573 +4592 @@
 
         free(si);
+
+        runtime_del_ref();
 }
 
@@ -5123 +5144 @@
         case VPROC_GSK_START_INTERVAL:
                 if ((unsigned int)inval > 0) {
+                        if (j->start_interval == 0) {
+                                runtime_add_ref();
+                        }
                         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);
                 } else if (j->start_interval) {
                         job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1);
+                        if (j->start_interval != 0) {
+                                runtime_del_ref();
+                        }
                         j->start_interval = 0;
                 }

trunk/launchd/src/launchd_runtime.c

@@ -91 +91 @@
 static mig_callback *mig_cb_table;
 static size_t mig_cb_table_sz;
-static timeout_callback runtime_idle_callback;
-static mach_msg_timeout_t runtime_idle_timeout;
+static timeout_callback runtime_idle_callback = launchd_shutdown;
+static mach_msg_timeout_t runtime_idle_timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT * 1000;
 static audit_token_t *au_tok;
+static size_t runtime_busy_cnt;
 
 
@@ -636 +637 @@
 
 void
-runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to)
-{
-        if (to == 0 || to_cb == NULL) {
+runtime_set_timeout(timeout_callback to_cb, unsigned int sec)
+{
+        if (sec == 0 || to_cb == NULL) {
                 runtime_idle_callback = NULL;
                 runtime_idle_timeout = 0;
@@ -644 +645 @@
 
         runtime_idle_callback = to_cb;
-        runtime_idle_timeout = to;
+        runtime_idle_timeout = sec * 1000;
 }
 
@@ -912 +913 @@
                 }
 
-                if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback) {
+                if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback && (runtime_busy_cnt == 0)) {
                         tmp_options |= MACH_RCV_TIMEOUT;
 
@@ -1350 +1351 @@
         return runtime_log_pack(outval, outvalCnt);
 }
+
+void
+runtime_add_ref(void)
+{
+        runtime_busy_cnt++;
+}
+
+void
+runtime_del_ref(void)
+{
+        runtime_busy_cnt--;
+}

trunk/launchd/src/launchd_runtime.h

@@ -57 +57 @@
 boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply);
 
+void runtime_add_ref(void);
+void runtime_del_ref(void);
+
 void launchd_runtime_init(void);
 void launchd_runtime_init2(void);
@@ -64 +67 @@
 int runtime_fsync(int fd);
 
-void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to);
+#define RUNTIME_ADVISABLE_IDLE_TIMEOUT 30
+
+void runtime_set_timeout(timeout_callback to_cb, unsigned int sec);
 kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size);
 kern_return_t runtime_remove_mport(mach_port_t name);