Merge pull request wjwwood#116 from pao/patch-1

Use CLOCK_MONOTONIC (Linux)/SYSTEM_CLOCK (OS X) to time select()
asegermany · Nov 10, 2015 · e12d81e · e12d81e
2 parents ef7f77d + c5b4bbd
commit e12d81e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/impl/unix.cc b/src/impl/unix.cc
@@ -85,13 +85,13 @@ MillisecondTimer::timespec_now ()
 # ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
   clock_serv_t cclock;
   mach_timespec_t mts;
-  host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+  host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
   clock_get_time(cclock, &mts);
   mach_port_deallocate(mach_task_self(), cclock);
   time.tv_sec = mts.tv_sec;
   time.tv_nsec = mts.tv_nsec;
 # else
-  clock_gettime(CLOCK_REALTIME, &time);
+  clock_gettime(CLOCK_MONOTONIC, &time);
 # endif
   return time;
 }