Changeset 23589

Timestamp:

2008-04-02 13:57:44 (6 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5834789> Observably inaccurate logging during shutdown (exit duration)

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (7 diffs)
• launchd_runtime.c (modified) (3 diffs)
• launchd_runtime.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -2327 +2327 @@
 
         if (j->sent_sigterm_time) {
-                uint64_t td_sec, td_usec, td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
+                uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
 
                 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));
+                job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", td_sec, td_usec, signal_to_C_name(SIGTERM));
         }
 
@@ -2621 +2620 @@
         } else if (&j->exit_timeout == ident) {
                 if (j->sent_sigkill) {
-                        uint64_t td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
+                        uint64_t td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
 
                         td /= NSEC_PER_SEC;
@@ -2753 +2752 @@
 job_start(job_t j)
 {
-        uint64_t td, tnow = runtime_get_opaque_time();
+        uint64_t td;
         int spair[2];
         int execspair[2];
@@ -2771 +2770 @@
         }
 
-        job_assumes(j, tnow > j->start_time);
-
         /*
          * Some users adjust the wall-clock and then expect software to not notice.
@@ -2778 +2775 @@
          * wherever possible.
          */
-        td = runtime_opaque_time_to_nano(tnow - j->start_time);
+        td = runtime_get_nanoseconds_since(j->start_time);
         td /= NSEC_PER_SEC;
 
@@ -2814 +2811 @@
                 job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1);
         }
-
-        j->start_time = tnow;
 
         switch (c = runtime_fork(j->weird_bootstrap ? j->j_port : j->mgr->jm_port)) {
@@ -2853 +2848 @@
                 break;
         default:
+                j->start_time = runtime_get_opaque_time();
+
                 job_log(j, LOG_DEBUG, "Started as PID: %u", c);
 

trunk/launchd/src/launchd_runtime.c

@@ -118 +118 @@
 static mach_timebase_info_data_t tbi;
 static uint64_t tbi_safe_math_max;
+static uint64_t time_of_mach_msg_return;
 static double tbi_float_val;
 
@@ -1026 +1027 @@
                                 msg_size, ipc_port_set, to, MACH_PORT_NULL);
 
+                time_of_mach_msg_return = runtime_get_opaque_time();
+
                 tmp_options = options;
 
@@ -1640 +1643 @@
 
 INTERNAL_ABI uint64_t
+runtime_get_opaque_time_of_event(void)
+{
+        return time_of_mach_msg_return;
+}
+
+INTERNAL_ABI uint64_t
+runtime_get_nanoseconds_since(uint64_t o)
+{
+        return runtime_opaque_time_to_nano(runtime_get_opaque_time_of_event() - o);
+}
+
+INTERNAL_ABI uint64_t
 runtime_opaque_time_to_nano(uint64_t o)
 {
-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
         if (unlikely(tbi.numer != tbi.denom)) {
-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__ppc64__)
         if (likely(tbi.numer != tbi.denom)) {
 #else

trunk/launchd/src/launchd_runtime.h

@@ -188 +188 @@
 INTERNAL_ABI void runtime_log_push(void);
 
-INTERNAL_ABI int64_t runtime_get_wall_time(void);
-INTERNAL_ABI uint64_t runtime_get_opaque_time(void);
-INTERNAL_ABI uint64_t runtime_opaque_time_to_nano(uint64_t o);
+INTERNAL_ABI int64_t runtime_get_wall_time(void) __attribute__((warn_unused_result));
+INTERNAL_ABI uint64_t runtime_get_opaque_time(void) __attribute__((warn_unused_result));
+INTERNAL_ABI uint64_t runtime_get_opaque_time_of_event(void) __attribute__((pure, warn_unused_result));
+INTERNAL_ABI uint64_t runtime_opaque_time_to_nano(uint64_t o) __attribute__((const, warn_unused_result));
+INTERNAL_ABI uint64_t runtime_get_nanoseconds_since(uint64_t o) __attribute__((pure, warn_unused_result));
 
 INTERNAL_ABI kern_return_t launchd_set_bport(mach_port_t name);