Changeset 23471

Timestamp:

12/19/07 11:48:57 (12 months ago)

Author:

zarzycki@…

Message:

Both Mach and Unix time concepts are weird.

We now use an 'int64_t' instead of 'struct timeval' for wall clock code.
We now wrap the 'timebase info' logic required by Mach absolute time.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (2 diffs)
• launchd_core_logic.c (modified) (11 diffs)
• launchd_runtime.c (modified) (7 diffs)
• launchd_runtime.h (modified) (2 diffs)
• libvproc_internal.h (modified) (1 diff)

trunk/launchd/src/launchd.c

@@ -246 +246 @@
 launchd_shutdown(void)
 {
-        struct timeval tvnow;
+        int64_t now;
 
         if (shutdown_in_progress) {
@@ -265 +265 @@
         runtime_log_push();
 
-        if (launchd_assumes(gettimeofday(&tvnow, NULL) != -1)) {
-                runtime_syslog(LOG_NOTICE, "Shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec);
-        }
+        now = runtime_get_wall_time();
+
+        runtime_syslog(LOG_NOTICE, "Shutdown began at: %lld.%06llu", now / USEC_PER_SEC, now % USEC_PER_SEC);
 
         launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL);

trunk/launchd/src/launchd_core_logic.c

@@ -24 +24 @@
 #include <mach/mach.h>
 #include <mach/mach_error.h>
-#include <mach/mach_time.h>
 #include <mach/boolean.h>
 #include <mach/message.h>
@@ -453 +452 @@
 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));
 static void do_unmounts(void);
 
@@ -464 +462 @@
 static jobmgr_t background_jobmgr;
 static job_t workaround_5477111;
-static mach_timebase_info_data_t tbi;
 
 /* process wide globals */
@@ -540 +537 @@
 
         job_assumes(j, runtime_kill(j->p, SIGTERM) != -1);
-        j->sent_sigterm_time = mach_absolute_time();
+        j->sent_sigterm_time = runtime_get_opaque_time();
 
         if (j->exit_timeout) {
@@ -2151 +2148 @@
 
         if (j->sent_sigterm_time) {
-                uint64_t td_sec, td_usec, td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
+                uint64_t td_sec, td_usec, td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
 
                 td_sec = td / NSEC_PER_SEC;
@@ -2433 +2430 @@
         } else if (&j->exit_timeout == ident) {
                 if (j->sent_sigkill) {
-                        uint64_t td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
+                        uint64_t td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
 
                         td /= NSEC_PER_SEC;
@@ -2482 +2479 @@
 jobmgr_callback(void *obj, struct kevent *kev)
 {
-        struct timeval tvnow;
         jobmgr_t jm = obj;
         job_t ji;
@@ -2505 +2501 @@
                         runtime_closelog(); /* HACK -- force 'start' time to be set */
 
-                        if (getpid() == 1 && jobmgr_assumes(jm, gettimeofday(&tvnow, NULL) != -1)) {
-                                jobmgr_log(jm, LOG_NOTICE, "Anticipatory shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec);
+                        if (getpid() == 1) {
+                                int64_t now = runtime_get_wall_time();
+
+                                jobmgr_log(jm, LOG_NOTICE, "Anticipatory shutdown began at: %lld.%06llu", now / USEC_PER_SEC, now % USEC_PER_SEC);
+
                                 LIST_FOREACH(ji, &root_jobmgr->jobs, sle) {
                                         if (ji->per_user && ji->p) {
@@ -2563 +2562 @@
 job_start(job_t j)
 {
-        uint64_t td, tnow = mach_absolute_time();
+        uint64_t td, tnow = runtime_get_opaque_time();
         int spair[2];
         int execspair[2];
@@ -2585 +2584 @@
         /*
          * Some users adjust the wall-clock and then expect software to not notice.
-         * Therefore, launchd must use an absolute clock instead of gettimeofday()
-         * or time() wherever possible.
+         * Therefore, launchd must use an absolute clock instead of the wall clock
+         * wherever possible.
          */
-        td = (tnow - j->start_time) * tbi.numer / tbi.denom;
+        td = runtime_opaque_time_to_nano(tnow - j->start_time);
         td /= NSEC_PER_SEC;
 
@@ -6738 +6737 @@
 
 void
-do_file_init(void)
-{
-        launchd_assert(mach_timebase_info(&tbi) == 0);
-
-}
-
-void
 do_unmounts(void)
 {

trunk/launchd/src/launchd_runtime.c

@@ -34 +34 @@
 #include <mach/host_info.h>
 #include <mach/mach_host.h>
+#include <mach/mach_time.h>
 #include <mach/exception.h>
 #include <sys/types.h>
@@ -110 +111 @@
 static void logmsg_remove(struct logmsg_s *lm);
 
+static void do_file_init(void) __attribute__((constructor));
+static mach_timebase_info_data_t tbi;
 
 static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM,
@@ -1210 +1213 @@
         data_off = lm->data;
 
-        launchd_assumes(gettimeofday(&lm->when, NULL) != -1);
+        lm->when = runtime_get_wall_time();
         lm->from_pid = attr->from_pid;
         lm->about_pid = attr->about_pid;
@@ -1308 +1311 @@
 {
         static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER;
-        static struct timeval shutdown_start;
-        struct timeval tvd;
+        static int64_t shutdown_start, log_delta;
         mach_msg_type_number_t outvalCnt;
         struct logmsg_s *lm;
@@ -1330 +1332 @@
         }
 
-        if (shutdown_start.tv_sec == 0) {
-                gettimeofday(&shutdown_start, NULL);
+        if (shutdown_start == 0) {
+                shutdown_start = runtime_get_wall_time();
                 launchd_log_vm_stats();
         }
@@ -1350 +1352 @@
 
         while ((lm = STAILQ_FIRST(&logmsg_queue))) {
-                timersub(&lm->when, &shutdown_start, &tvd);
-
-                /* don't ask */
-                if (tvd.tv_sec < 0) {
-                        tvd.tv_sec = 0;
-                        tvd.tv_usec = 0;
-                }
-
-                fprintf(ourlogfile, "%3ld.%06d%6u %-40s%6u %-40s %s\n", tvd.tv_sec, tvd.tv_usec,
+                log_delta = lm->when - shutdown_start;
+
+                fprintf(ourlogfile, "%8lld%6u %-40s%6u %-40s %s\n", log_delta,
                                 lm->from_pid, lm->from_name, lm->about_pid, lm->about_name, lm->msg);
 
@@ -1551 +1547 @@
         return (apple_internal_logging == 0);
 }
+
+int64_t
+runtime_get_wall_time(void)
+{
+        struct timeval tv;
+        int64_t r;
+
+        launchd_assumes(gettimeofday(&tv, NULL) != -1);
+
+        r = tv.tv_sec;
+        r *= USEC_PER_SEC;
+        r += tv.tv_usec;
+
+        return r;
+}
+
+uint64_t
+runtime_get_opaque_time(void)
+{
+        return mach_absolute_time();
+}
+
+uint64_t
+runtime_opaque_time_to_nano(uint64_t o)
+{
+#if defined(__i386__)
+        if (unlikely(tbi.numer != tbi.denom)) {
+#elif defined(__ppc__)
+        if (likely(tbi.numer != tbi.denom)) {
+#else
+        if (tbi.numer != tbi.denom) {
+#endif
+                if (o < INT32_MAX) {
+                        o *= tbi.numer;
+                        o /= tbi.denom;
+                } else {
+                        double d = o;
+                        d *= tbi.numer;
+                        d /= tbi.denom;
+                        o = d;
+                }
+        }
+
+        return o;
+}
+
+void
+do_file_init(void)
+{
+        launchd_assert(mach_timebase_info(&tbi) == 0);
+}
+

trunk/launchd/src/launchd_runtime.h

@@ -71 +71 @@
 #endif
 
+#define likely(x)       __builtin_expect((bool)(x), true)
+#define unlikely(x)     __builtin_expect((bool)(x), false)
 
 struct ldcred {
@@ -152 +154 @@
 void runtime_log_push(void);
 
+int64_t runtime_get_wall_time(void);
+uint64_t runtime_get_opaque_time(void);
+uint64_t runtime_opaque_time_to_nano(uint64_t o);
+
 
 kern_return_t launchd_set_bport(mach_port_t name);

trunk/launchd/src/libvproc_internal.h

@@ -60 +60 @@
 struct logmsg_s {
         STAILQ_ENTRY(logmsg_s) sqe;
-        struct timeval when;
+        int64_t when;
         pid_t from_pid;
         pid_t about_pid;