Changeset 23371

Timestamp:

09/11/07 16:44:27 (15 months ago)

Author:

zarzycki@…

Message:

More wall-clock versus absolute-clock fun...

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -349 +349 @@
         unsigned int exit_timeout;
         int stdout_err_fd;
-        struct timeval sent_sigterm_time;
+        uint64_t sent_sigterm_time;
         uint64_t start_time;
         uint32_t min_run_time;
@@ -448 +448 @@
 static void extract_rcsid_substr(const char *i, char *o, size_t osz);
 static void do_first_per_user_launchd_hack(void);
+static void do_file_init(void) __attribute__((constructor));
 
 /* file local globals */
@@ -454 +455 @@
 static bool did_first_per_user_launchd_BootCache_hack;
 static jobmgr_t background_jobmgr;
+static mach_timebase_info_data_t tbi;
 
 /* process wide globals */
@@ -523 +525 @@
 
         job_assumes(j, kill(j->p, SIGTERM) != -1);
-        job_assumes(j, gettimeofday(&j->sent_sigterm_time, NULL) != -1);
+        j->sent_sigterm_time = mach_absolute_time();
 
         if (j->exit_timeout) {
@@ -1899 +1901 @@
 job_reap(job_t j)
 {
-        struct timeval tve, tvd;
         struct rusage ru;
         int status;
@@ -1944 +1945 @@
         LIST_REMOVE(j, pid_hash_sle);
 
-        job_assumes(j, gettimeofday(&tve, NULL) != -1);
-
         if (j->wait_reply_port) {
                 job_log(j, LOG_DEBUG, "MPM wait reply being sent");
@@ -1952 +1951 @@
         }
 
-        if (j->sent_sigterm_time.tv_sec) {
-                timersub(&tve, &j->sent_sigterm_time,  &tvd);
-
-                job_log(j, LOG_INFO, "Exited %ld.%06d seconds after %s was sent",
-                                tvd.tv_sec, tvd.tv_usec, signal_to_C_name(j->sent_sigkill ? SIGKILL : SIGTERM));
+        if (j->sent_sigterm_time) {
+                uint64_t td_sec, td_usec, td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
+
+                td_sec = td / NSEC_PER_SEC;
+                td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC;
+
+                job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent",
+                                td_sec, td_usec, signal_to_C_name(j->sent_sigkill ? SIGKILL : SIGTERM));
         }
 
@@ -2176 +2178 @@
         } else if (&j->exit_timeout == ident) {
                 if (j->sent_sigkill) {
-                        struct timeval tvd, tve;
-
-                        job_assumes(j, gettimeofday(&tve, NULL) != -1);
-                        timersub(&tve, &j->sent_sigterm_time,  &tvd);
-                        tvd.tv_sec -= j->exit_timeout;
-                        job_log(j, LOG_ERR, "Did not die after sending SIGKILL %lu seconds ago...", tvd.tv_sec);
+                        uint64_t td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
+
+                        td /= NSEC_PER_SEC;
+                        td -= j->exit_timeout;
+
+                        job_log(j, LOG_ERR, "Did not die after sending SIGKILL %llu seconds ago...", td);
                 } else {
                         job_force_sampletool(j);
@@ -2286 +2288 @@
 job_start(job_t j)
 {
-        static mach_timebase_info_data_t tbi;
         uint64_t td, tnow = mach_absolute_time();
         int spair[2];
@@ -2296 +2297 @@
         u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT /* |NOTE_REAP */;
 
-        if (tbi.denom == 0) {
-                launchd_assert(mach_timebase_info(&tbi) == 0);
-        }
-
         if (!job_assumes(j, j->mgr != NULL)) {
                 return;
@@ -2321 +2318 @@
         }
 
-        j->sent_sigterm_time.tv_sec = 0;
-        j->sent_sigterm_time.tv_usec = 0;
+        j->sent_sigterm_time = 0;
 
         if (!j->legacy_mach_job) {
@@ -6325 +6321 @@
         free(w4r);
 }
+
+void
+do_file_init(void)
+{
+        launchd_assert(mach_timebase_info(&tbi) == 0);
+
+}