unix, test: make NANOSEC a 64 bits unsigned int

Avoids accidental overflow / truncation when it's used in 32 bits arithmetic.
joyent · Jun 7, 2012 · 59cda86 · 59cda86
1 parent e2aa39a
commit 59cda86
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/unix/cygwin.c b/src/unix/cygwin.c
@@ -29,7 +29,7 @@
 #include <time.h>
 
 #undef NANOSEC
-#define NANOSEC 1000000000
+#define NANOSEC ((uint64_t) 1e9)
 
 
 uint64_t uv_hrtime() {

diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 
 #undef NANOSEC
-#define NANOSEC 1000000000
+#define NANOSEC ((uint64_t) 1e9)
 
 #ifndef CPUSTATES
 # define CPUSTATES 5U

diff --git a/src/unix/linux/core.c b/src/unix/linux/core.c
@@ -46,7 +46,7 @@
 #endif
 
 #undef NANOSEC
-#define NANOSEC 1000000000
+#define NANOSEC ((uint64_t) 1e9)
 
 /* This is rather annoying: CLOCK_BOOTTIME lives in <linux/time.h> but we can't
  * include that file because it conflicts with <time.h>. We'll just have to

diff --git a/src/unix/netbsd.c b/src/unix/netbsd.c
@@ -32,7 +32,7 @@
 #include <time.h>
 
 #undef NANOSEC
-#define NANOSEC 1000000000
+#define NANOSEC ((uint64_t) 1e9)
 
 
 uint64_t uv_hrtime(void) {

diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #undef NANOSEC
-#define NANOSEC 1000000000
+#define NANOSEC ((uint64_t) 1e9)
 
 
 static char *process_title;

diff --git a/test/benchmark-pound.c b/test/benchmark-pound.c
@@ -26,7 +26,7 @@
 #define MAX_CONNS 1000
 
 #undef NANOSEC
-#define NANOSEC ((uint64_t)10e8)
+#define NANOSEC ((uint64_t) 1e9)
 
 #undef DEBUG
 #define DEBUG 0

diff --git a/test/test-hrtime.c b/test/test-hrtime.c
@@ -27,7 +27,7 @@
 #endif
 
 #ifndef NANOSEC
-# define NANOSEC 1000000000
+# define NANOSEC ((uint64_t) 1e9)
 #endif