2 files changed, 17 insertions, 5 deletions

diff --git a/Spear/Sys/Timer/timer.c b/Spear/Sys/Timer/timer.c
index 8487f48..55e64b5 100644
--- a/Spear/Sys/Timer/timer.c
+++ b/Spear/Sys/Timer/timer.c
@@ -48,7 +48,7 @@ void time_now(time_point* t) {
 #ifdef _WIN32

   QueryPerformanceCounter((LARGE_INTEGER*)t);

 #else

-  clock_gettime(CLOCK_REALTIME, t);

+  clock_gettime(CLOCK_MONOTONIC_RAW, t);

 #endif

 }

 

@@ -59,7 +59,7 @@ time_delta time_diff(time_point* start, time_point* end) {
   // another processor, then the delta time can be negative.

   return std::max(0, *end - *start);

 #else

-  return (end->tv_sec - start->tv_sec) * 1e9 + (end->tv_nsec - start->tv_nsec);

+  return (end->tv_sec - start->tv_sec) * nanoseconds + (end->tv_nsec - start->tv_nsec);

 #endif

 }

 

@@ -83,16 +83,25 @@ uint64_t time_point_to_ns(time_point* t) {
 #ifdef _WIN32

   return (uint64_t)((double)*t * seconds_per_count * 1.0e+9);

 #else

-  return (uint64_t)t->tv_sec * 1e+9 + (uint64_t)t->tv_nsec;

+  return (uint64_t)t->tv_sec * nanoseconds + (uint64_t)t->tv_nsec;

+#endif

+}

+

+void time_add(const time_point* t, time_delta dt, time_point* out) {

+#ifdef _WIN32

+  *out = *t + dt;

+#else

+  out->tv_sec  = t->tv_sec + (__time_t)(dt / nanoseconds);

+  out->tv_nsec = t->tv_nsec + (__time_t)(dt % nanoseconds);

 #endif

 }

 

 void time_sleep(time_delta dt) {

 #ifdef _WIN32

-  const int64_t ms = dt / microseconds;

+  const uint64_t ms = dt / microseconds;

   Sleep((DWORD)(ms));

 #else

-  const int64_t   sec = dt / nanoseconds;

+  const uint64_t sec = dt / nanoseconds;

   struct timespec ts;

   ts.tv_sec  = (long)sec;

   ts.tv_nsec = (long)(dt % nanoseconds);

diff --git a/Spear/Sys/Timer/timer.h b/Spear/Sys/Timer/timer.h
index e426135..da4e7c7 100644
--- a/Spear/Sys/Timer/timer.h
+++ b/Spear/Sys/Timer/timer.h
@@ -53,6 +53,9 @@ time_delta sec_to_time_delta(double seconds);
 /// Convert the time point to nanoseconds.
 uint64_t time_point_to_ns(time_point*);
 
+/// Add a time delta to a timestamp.
+void time_add(const time_point*, time_delta, time_point* out);
+
 /// Put the caller thread to sleep for the given amount of time.
 void time_sleep(time_delta dt);