summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2016-10-05 20:32:53 -0700
committerGarrett D'Amore <garrett@damore.org>2016-10-05 20:32:53 -0700
commit45144c12a69b6ed99ed35b0102bce77f92852e9f (patch)
tree820c1fcbd997a29acffc5700268f00071d3af8f3 /src/utils
parent0c392cfe11b92d9bcb11d211d21e555b3bbb4c0d (diff)
downloadnanomsg-45144c12a69b6ed99ed35b0102bce77f92852e9f.tar.gz
fixes #815 Prefer gethrtime over clock_gettime
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/clock.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/utils/clock.c b/src/utils/clock.c
index 28d7f9b..9a0ef44 100644
--- a/src/utils/clock.c
+++ b/src/utils/clock.c
@@ -1,6 +1,7 @@
/*
Copyright (c) 2012 Martin Sustrik All rights reserved.
Copyright (c) 2012 Julien Ammous
+ Copyright 2016 Garrett D'Amore <garrett@damore.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"),
@@ -62,6 +63,10 @@ uint64_t nn_clock_ms (void)
return ticks * nn_clock_timebase_info.numer /
nn_clock_timebase_info.denom / 1000000;
+#elif defined NN_HAVE_GETHRTIME
+
+ return gethrtime () / 1000000;
+
#elif defined NN_HAVE_CLOCK_MONOTONIC
int rc;
@@ -71,10 +76,6 @@ uint64_t nn_clock_ms (void)
errno_assert (rc == 0);
return tv.tv_sec * (uint64_t) 1000 + tv.tv_nsec / 1000000;
-#elif defined NN_HAVE_GETHRTIME
-
- return gethrtime () / 1000000;
-
#else
int rc;