<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[23369] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23369">23369</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-11 13:05:15 -0700 (Tue, 11 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5418922> modifying the date/time confuses launchd's timers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23368 => 23369)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-10 20:43:52 UTC (rev 23368)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-11 20:05:15 UTC (rev 23369)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include <mach/mach.h>
</span><span class="cx"> #include <mach/mach_error.h>
</span><ins>+#include <mach/mach_time.h>
</ins><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">@@ -348,8 +349,8 @@
</span><span class="cx"> unsigned int exit_timeout;
</span><span class="cx"> int stdout_err_fd;
</span><span class="cx"> struct timeval sent_sigterm_time;
</span><del>- time_t start_time;
- time_t min_run_time;
</del><ins>+ uint64_t start_time;
+ uint32_t min_run_time;
</ins><span class="cx"> unsigned int start_interval;
</span><span class="cx"> unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1,
</span><span class="cx"> ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1,
</span><span class="lines">@@ -2284,15 +2285,20 @@
</span><span class="cx"> void
</span><span class="cx"> job_start(job_t j)
</span><span class="cx"> {
</span><ins>+ static mach_timebase_info_data_t tbi;
+ uint64_t td, tnow = mach_absolute_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="cx"> char nbuf[64];
</span><span class="cx"> pid_t c;
</span><span class="cx"> bool sipc = false;
</span><del>- time_t td;
</del><span class="cx"> u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT /* |NOTE_REAP */;
</span><span class="cx">
</span><ins>+ if (tbi.denom == 0) {
+ launchd_assert(mach_timebase_info(&tbi) == 0);
+ }
+
</ins><span class="cx"> if (!job_assumes(j, j->mgr != NULL)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2302,7 +2308,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- td = time(NULL) - j->start_time;
</del><ins>+ td = (tnow - j->start_time) * tbi.numer / tbi.denom;
+ td /= NSEC_PER_SEC;
</ins><span class="cx">
</span><span class="cx"> if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) {
</span><span class="cx"> time_t respawn_delta = j->min_run_time - td;
</span><span class="lines">@@ -2334,7 +2341,7 @@
</span><span class="cx"> job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- time(&j->start_time);
</del><ins>+ j->start_time = tnow;
</ins><span class="cx">
</span><span class="cx"> switch (c = runtime_fork(j->weird_bootstrap ? j->j_port : j->mgr->jm_port)) {
</span><span class="cx"> case -1:
</span></span></pre>
</div>
</div>
</body>
</html>