Changeset 23379

Timestamp:

09/13/07 10:40:43 (15 months ago)

Author:

zarzycki@…

Message:

Smarter idle exit logic.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (5 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -251 +251 @@
 static void semaphoreitem_watch(job_t j, struct semaphoreitem *si);
 static void semaphoreitem_ignore(job_t j, struct semaphoreitem *si);
+static void semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add);
 
 #define ACTIVE_JOB_HASH_SIZE    32
@@ -2330 +2331 @@
                 time_t respawn_delta = j->min_run_time - td;
 
+                /*
+                 * We technically should ref-count throttled jobs to prevent idle exit,
+                 * but we're not directly tracking the 'throttled' state at the moment.
+                 */
+
                 job_log(j, LOG_WARNING, "Throttling respawn: Will start in %ld seconds", respawn_delta);
                 job_assumes(j, kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, respawn_delta, j) != -1);
@@ -4573 +4579 @@
         SLIST_INSERT_HEAD(&j->semaphores, si, sle);
 
-        runtime_add_ref();
+        semaphoreitem_runtime_mod_ref(si, true);
 
         return true;
@@ -4579 +4585 @@
 
 void
+semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add)
+{
+        /*
+         * External events need to be tracked.
+         * Internal events do NOT need to be tracked.
+         */
+
+        switch (si->why) {
+        case SUCCESSFUL_EXIT:
+        case FAILED_EXIT:
+        case OTHER_JOB_ENABLED:
+        case OTHER_JOB_DISABLED:
+        case OTHER_JOB_ACTIVE:
+        case OTHER_JOB_INACTIVE:
+                return;
+        default:
+                break;
+        }
+
+        if (add) {
+                runtime_add_ref();
+        } else {
+                runtime_del_ref();
+        }
+}
+
+void
 semaphoreitem_delete(job_t j, struct semaphoreitem *si)
 {
+        semaphoreitem_runtime_mod_ref(si, false);
+
         SLIST_REMOVE(&j->semaphores, si, semaphoreitem, sle);
 
@@ -4588 +4623 @@
 
         free(si);
-
-        runtime_del_ref();
 }