Changeset 23369

Timestamp:

09/11/07 13:05:15 (15 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5418922> modifying the date/time confuses launchd's timers

Files:

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

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>
@@ -349 +350 @@
         int stdout_err_fd;
         struct timeval sent_sigterm_time;
-        time_t start_time;
-        time_t min_run_time;
+        uint64_t start_time;
+        uint32_t min_run_time;
         unsigned int start_interval;
         unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1,
@@ -2285 +2286 @@
 job_start(job_t j)
 {
+        static mach_timebase_info_data_t tbi;
+        uint64_t td, tnow = mach_absolute_time();
         int spair[2];
         int execspair[2];
@@ -2291 +2294 @@
         pid_t c;
         bool sipc = false;
-        time_t td;
         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)) {
@@ -2303 +2309 @@
         }
 
-        td = time(NULL) - j->start_time;
+        td = (tnow - j->start_time) * tbi.numer / tbi.denom;
+        td /= NSEC_PER_SEC;
 
         if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) {
@@ -2335 +2342 @@
         }
 
-        time(&j->start_time);
+        j->start_time = tnow;
 
         switch (c = runtime_fork(j->weird_bootstrap ? j->j_port : j->mgr->jm_port)) {