Merge pull request #138 from kovpas/uuid_time_fix

parkera · parkera · commit 281aa0ff962e · 2015-12-13T09:54:28.000-08:00
Fix nanoseconds calculation in uuid.c
diff --git a/uuid/uuid.c b/uuid/uuid.c
@@ -57,7 +57,7 @@ static inline void read_random(void *buffer, u_int numBytes) {
 static inline void nanotime(struct timespec *tv) {
     uint64_t now = mach_absolute_time();
     tv->tv_sec = now / 1000000000;
-    tv->tv_nsec = (tv->tv_sec * 10000000000) - now;
+    tv->tv_nsec = now - (tv->tv_sec * 1000000000);
 }
 
 #elif TARGET_OS_LINUX

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static inline void read_random(void *buffer, u_int numBytes) {`
`57`	`57`	`static inline void nanotime(struct timespec *tv) {`
`58`	`58`	`uint64_t now = mach_absolute_time();`
`59`	`59`	`tv->tv_sec = now / 1000000000;`
`60`		`- tv->tv_nsec = (tv->tv_sec * 10000000000) - now;`
	`60`	`+ tv->tv_nsec = now - (tv->tv_sec * 1000000000);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`#elif TARGET_OS_LINUX`