projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ipv4' of github.com:fatbob313/umurmur into ipv4
[umurmur.git]
/
src
/
timer.c
diff --git
a/src/timer.c
b/src/timer.c
index 53a63c9d58b85b5bb62b61e09e717feacb0cdec9..55f5f9cf2905e82492dbbbdaf9e17d6a9fd5d4bf 100644
(file)
--- a/
src/timer.c
+++ b/
src/timer.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 20
10
, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-201
0
, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 20
09-2013
, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-201
3
, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
All rights reserved.
@@
-36,12
+36,12
@@
static uint64_t Timer_now()
{
static uint64_t Timer_now()
{
- struct time
val tv
;
+ struct time
spec ts
;
uint64_t e;
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;
}
return e;
}