projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
c7a24ac
)
Merge branch 'ipv4' of github.com:fatbob313/umurmur into ipv4
author
Martin Johansson
<martin@fatbob.nu>
Sun, 10 Nov 2013 18:42:56 +0000
(19:42 +0100)
committer
Martin Johansson
<martin@fatbob.nu>
Sun, 10 Nov 2013 18:42:56 +0000
(19:42 +0100)
src/timer.c
patch
|
blob
|
history
diff --git
a/src/timer.c
b/src/timer.c
index 5383e0e85d06ad0fbac2eb45db10ddb32b60b3dc..55f5f9cf2905e82492dbbbdaf9e17d6a9fd5d4bf 100644
(file)
--- a/
src/timer.c
+++ b/
src/timer.c
@@
-36,12
+36,12
@@
static uint64_t Timer_now()
{
- struct time
val tv
;
+ struct time
spec ts
;
uint64_t e;
-
gettimeofday(&tv, NULL
);
-
e = tv
.tv_sec * 1000000LL;
- e += tv.tv_usec;
+
clock_gettime(CLOCK_MONOTONIC, &ts
);
+
e = ts
.tv_sec * 1000000LL;
+ e += ts.tv_nsec / 1000LL; //convert to microseconds
return e;
}