<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23471] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23471">23471</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-12-19 11:48:57 -0800 (Wed, 19 Dec 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchdc">trunk/launchd/src/launchd.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimeh">trunk/launchd/src/launchd_runtime.h</a></li>
<li><a href="#trunklaunchdsrclibvproc_internalh">trunk/launchd/src/libvproc_internal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23470 => 23471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-12-19 18:13:19 UTC (rev 23470)
+++ trunk/launchd/src/launchd.c 2007-12-19 19:48:57 UTC (rev 23471)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> void
</span><span class="cx"> launchd_shutdown(void)
</span><span class="cx"> {
</span><del>- struct timeval tvnow;
</del><ins>+ int64_t now;
</ins><span class="cx">
</span><span class="cx"> if (shutdown_in_progress) {
</span><span class="cx"> return;
</span><span class="lines">@@ -264,10 +264,10 @@
</span><span class="cx">
</span><span class="cx"> runtime_log_push();
</span><span class="cx">
</span><del>- if (launchd_assumes(gettimeofday(&tvnow, NULL) != -1)) {
- runtime_syslog(LOG_NOTICE, "Shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec);
- }
</del><ins>+ now = runtime_get_wall_time();
</ins><span class="cx">
</span><ins>+ runtime_syslog(LOG_NOTICE, "Shutdown began at: %lld.%06llu", now / USEC_PER_SEC, now % USEC_PER_SEC);
+
</ins><span class="cx"> launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23470 => 23471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-12-19 18:13:19 UTC (rev 23470)
+++ trunk/launchd/src/launchd_core_logic.c 2007-12-19 19:48:57 UTC (rev 23471)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">
</span><span class="cx"> #include <mach/mach.h>
</span><span class="cx"> #include <mach/mach_error.h>
</span><del>-#include <mach/mach_time.h>
</del><span class="cx"> #include <mach/boolean.h>
</span><span class="cx"> #include <mach/message.h>
</span><span class="cx"> #include <mach/notify.h>
</span><span class="lines">@@ -452,7 +451,6 @@
</span><span class="cx"> static size_t our_strhash(const char *s) __attribute__((pure));
</span><span class="cx"> static void extract_rcsid_substr(const char *i, char *o, size_t osz);
</span><span class="cx"> static void do_first_per_user_launchd_hack(void);
</span><del>-static void do_file_init(void) __attribute__((constructor));
</del><span class="cx"> static void do_unmounts(void);
</span><span class="cx">
</span><span class="cx"> /* file local globals */
</span><span class="lines">@@ -463,7 +461,6 @@
</span><span class="cx"> #define JOB_BOOTCACHE_HACK_CHECK(j) (j->per_user && !did_first_per_user_launchd_BootCache_hack && (j->mach_uid >= 500) && (j->mach_uid != (uid_t)-2))
</span><span class="cx"> static jobmgr_t background_jobmgr;
</span><span class="cx"> static job_t workaround_5477111;
</span><del>-static mach_timebase_info_data_t tbi;
</del><span class="cx">
</span><span class="cx"> /* process wide globals */
</span><span class="cx"> mach_port_t inherited_bootstrap_port;
</span><span class="lines">@@ -539,7 +536,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> job_assumes(j, runtime_kill(j->p, SIGTERM) != -1);
</span><del>- j->sent_sigterm_time = mach_absolute_time();
</del><ins>+ j->sent_sigterm_time = runtime_get_opaque_time();
</ins><span class="cx">
</span><span class="cx"> if (j->exit_timeout) {
</span><span class="cx"> job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
</span><span class="lines">@@ -2150,7 +2147,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (j->sent_sigterm_time) {
</span><del>- uint64_t td_sec, td_usec, td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
</del><ins>+ uint64_t td_sec, td_usec, td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
</ins><span class="cx">
</span><span class="cx"> td_sec = td / NSEC_PER_SEC;
</span><span class="cx"> td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC;
</span><span class="lines">@@ -2432,7 +2429,7 @@
</span><span class="cx"> job_dispatch(j, false);
</span><span class="cx"> } else if (&j->exit_timeout == ident) {
</span><span class="cx"> if (j->sent_sigkill) {
</span><del>- uint64_t td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom;
</del><ins>+ uint64_t td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time);
</ins><span class="cx">
</span><span class="cx"> td /= NSEC_PER_SEC;
</span><span class="cx"> td -= j->exit_timeout;
</span><span class="lines">@@ -2481,7 +2478,6 @@
</span><span class="cx"> void
</span><span class="cx"> jobmgr_callback(void *obj, struct kevent *kev)
</span><span class="cx"> {
</span><del>- struct timeval tvnow;
</del><span class="cx"> jobmgr_t jm = obj;
</span><span class="cx"> job_t ji;
</span><span class="cx">
</span><span class="lines">@@ -2504,8 +2500,11 @@
</span><span class="cx">
</span><span class="cx"> runtime_closelog(); /* HACK -- force 'start' time to be set */
</span><span class="cx">
</span><del>- 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);
</del><ins>+ 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);
+
</ins><span class="cx"> LIST_FOREACH(ji, &root_jobmgr->jobs, sle) {
</span><span class="cx"> if (ji->per_user && ji->p) {
</span><span class="cx"> job_assumes(ji, runtime_kill(ji->p, SIGUSR2) != -1);
</span><span class="lines">@@ -2562,7 +2561,7 @@
</span><span class="cx"> void
</span><span class="cx"> job_start(job_t j)
</span><span class="cx"> {
</span><del>- uint64_t td, tnow = mach_absolute_time();
</del><ins>+ uint64_t td, tnow = runtime_get_opaque_time();
</ins><span class="cx"> int spair[2];
</span><span class="cx"> int execspair[2];
</span><span class="cx"> int oepair[2];
</span><span class="lines">@@ -2584,10 +2583,10 @@
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Some users adjust the wall-clock and then expect software to not notice.
</span><del>- * Therefore, launchd must use an absolute clock instead of gettimeofday()
- * or time() wherever possible.
</del><ins>+ * Therefore, launchd must use an absolute clock instead of the wall clock
+ * wherever possible.
</ins><span class="cx"> */
</span><del>- td = (tnow - j->start_time) * tbi.numer / tbi.denom;
</del><ins>+ td = runtime_opaque_time_to_nano(tnow - j->start_time);
</ins><span class="cx"> td /= NSEC_PER_SEC;
</span><span class="cx">
</span><span class="cx"> if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) {
</span><span class="lines">@@ -6737,13 +6736,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-do_file_init(void)
-{
- launchd_assert(mach_timebase_info(&tbi) == 0);
-
-}
-
-void
</del><span class="cx"> do_unmounts(void)
</span><span class="cx"> {
</span><span class="cx"> struct statfs buf[250];
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23470 => 23471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-12-19 18:13:19 UTC (rev 23470)
+++ trunk/launchd/src/launchd_runtime.c 2007-12-19 19:48:57 UTC (rev 23471)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <mach/mach_interface.h>
</span><span class="cx"> #include <mach/host_info.h>
</span><span class="cx"> #include <mach/mach_host.h>
</span><ins>+#include <mach/mach_time.h>
</ins><span class="cx"> #include <mach/exception.h>
</span><span class="cx"> #include <sys/types.h>
</span><span class="cx"> #include <sys/stat.h>
</span><span class="lines">@@ -109,6 +110,8 @@
</span><span class="cx"> static bool logmsg_add(struct runtime_syslog_attr *attr, int err_num, const char *msg);
</span><span class="cx"> static void logmsg_remove(struct logmsg_s *lm);
</span><span class="cx">
</span><ins>+static void do_file_init(void) __attribute__((constructor));
+static mach_timebase_info_data_t tbi;
</ins><span class="cx">
</span><span class="cx"> static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM,
</span><span class="cx"> SIGURG, SIGTSTP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGIO, SIGXCPU,
</span><span class="lines">@@ -1209,7 +1212,7 @@
</span><span class="cx">
</span><span class="cx"> data_off = lm->data;
</span><span class="cx">
</span><del>- launchd_assumes(gettimeofday(&lm->when, NULL) != -1);
</del><ins>+ lm->when = runtime_get_wall_time();
</ins><span class="cx"> lm->from_pid = attr->from_pid;
</span><span class="cx"> lm->about_pid = attr->about_pid;
</span><span class="cx"> lm->err_num = err_num;
</span><span class="lines">@@ -1307,8 +1310,7 @@
</span><span class="cx"> runtime_log_push(void)
</span><span class="cx"> {
</span><span class="cx"> static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER;
</span><del>- static struct timeval shutdown_start;
- struct timeval tvd;
</del><ins>+ static int64_t shutdown_start, log_delta;
</ins><span class="cx"> mach_msg_type_number_t outvalCnt;
</span><span class="cx"> struct logmsg_s *lm;
</span><span class="cx"> vm_offset_t outval;
</span><span class="lines">@@ -1329,8 +1331,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (shutdown_start.tv_sec == 0) {
- gettimeofday(&shutdown_start, NULL);
</del><ins>+ if (shutdown_start == 0) {
+ shutdown_start = runtime_get_wall_time();
</ins><span class="cx"> launchd_log_vm_stats();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1349,15 +1351,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while ((lm = STAILQ_FIRST(&logmsg_queue))) {
</span><del>- timersub(&lm->when, &shutdown_start, &tvd);
</del><ins>+ log_delta = lm->when - shutdown_start;
</ins><span class="cx">
</span><del>- /* 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,
</del><ins>+ fprintf(ourlogfile, "%8lld%6u %-40s%6u %-40s %s\n", log_delta,
</ins><span class="cx"> lm->from_pid, lm->from_name, lm->about_pid, lm->about_name, lm->msg);
</span><span class="cx">
</span><span class="cx"> logmsg_remove(lm);
</span><span class="lines">@@ -1550,3 +1546,55 @@
</span><span class="cx">
</span><span class="cx"> return (apple_internal_logging == 0);
</span><span class="cx"> }
</span><ins>+
+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);
+}
+
</ins></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimeh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.h (23470 => 23471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.h 2007-12-19 18:13:19 UTC (rev 23470)
+++ trunk/launchd/src/launchd_runtime.h 2007-12-19 19:48:57 UTC (rev 23471)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#define likely(x) __builtin_expect((bool)(x), true)
+#define unlikely(x) __builtin_expect((bool)(x), false)
</ins><span class="cx">
</span><span class="cx"> struct ldcred {
</span><span class="cx"> uid_t euid;
</span><span class="lines">@@ -151,7 +153,11 @@
</span><span class="cx"> void runtime_vsyslog(struct runtime_syslog_attr *attr, const char *message, va_list args) __attribute__((format(printf, 2, 0)));
</span><span class="cx"> void runtime_log_push(void);
</span><span class="cx">
</span><ins>+int64_t runtime_get_wall_time(void);
+uint64_t runtime_get_opaque_time(void);
+uint64_t runtime_opaque_time_to_nano(uint64_t o);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> kern_return_t launchd_set_bport(mach_port_t name);
</span><span class="cx"> kern_return_t launchd_get_bport(mach_port_t *name);
</span><span class="cx"> kern_return_t launchd_mport_notify_req(mach_port_t name, mach_msg_id_t which);
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_internalh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_internal.h (23470 => 23471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_internal.h 2007-12-19 18:13:19 UTC (rev 23470)
+++ trunk/launchd/src/libvproc_internal.h 2007-12-19 19:48:57 UTC (rev 23471)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> struct logmsg_s {
</span><span class="cx"> STAILQ_ENTRY(logmsg_s) sqe;
</span><del>- struct timeval when;
</del><ins>+ int64_t when;
</ins><span class="cx"> pid_t from_pid;
</span><span class="cx"> pid_t about_pid;
</span><span class="cx"> uid_t sender_uid;
</span></span></pre>
</div>
</div>
</body>
</html>