From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 8 Aug 2016 00:41:48 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.2-8~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ae298f6beb2da43f07d00d32fb32545a16ae90e;p=imagemagick

...
---

diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index 7ba351f55..27819dace 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -188,7 +188,26 @@ MagickExport TimerInfo *DestroyTimerInfo(TimerInfo *timer_info)
 */
 static double ElapsedTime(void)
 {
-#if defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF)
+#if defined(HAVE_CLOCK_GETTIME)
+#define NANOSECONDS_PER_SECOND  1000000000.0
+#if defined(CLOCK_HIGHRES)
+#  define CLOCK_ID CLOCK_HIGHRES
+#elif defined(CLOCK_MONOTONIC_RAW)
+#  define CLOCK_ID CLOCK_MONOTONIC_RAW
+#elif defined(CLOCK_MONOTONIC_PRECISE)
+#  define CLOCK_ID CLOCK_MONOTONIC_PRECISE
+#elif defined(CLOCK_MONOTONIC)
+#  define CLOCK_ID CLOCK_MONOTONIC
+#else
+#  define CLOCK_ID CLOCK_REALTIME
+#endif
+
+  struct timespec 
+    timer;
+
+  (void) clock_gettime(CLOCK_ID,&timer);
+  return((double) timer.tv_sec+timer.tv_nsec/NANOSECONDS_PER_SECOND);
+#elif defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF)
   struct tms
     timer;