Changeset 1975

Timestamp:

04/12/08 22:40:06 (7 months ago)

Author:

aturner

Message:

cleanup refs #41

Files:

• features/performance/src/defines.h.in (modified) (3 diffs)

features/performance/src/defines.h.in

@@ -219 +219 @@
 #define MILLISEC_TO_TIMEVAL(x, tv)          \
     do {                                    \
-        (tv)->tv_sec = (x) / 1000;            \
+        (tv)->tv_sec = (x) / 1000;          \
         (tv)->tv_usec = (x * 1000) - ((tv)->tv_sec * 1000000);   \
     } while(0)
@@ -225 +225 @@
 #define MICROSEC_TO_TIMEVAL(x, tv)          \
     do {                                    \
-        (tv)->tv_sec = (x) / 1000000;         \
+        (tv)->tv_sec = (x) / 1000000;       \
         (tv)->tv_usec = (x) - ((tv)->tv_sec * 1000000);   \
     } while(0)
-/*
+
 #define NANOSEC_TO_TIMEVAL(x, tv)           \
     do {                                    \
-        (tv)->tv_sec = (x) / 1000000000;      \
-        (tv)->tv_usec = (x / 1000) - (tv)->tv_sec * 1000000);   \
+        (tv)->tv_sec =  (x) / 1000000000;   \
+        (tv)->tv_usec = ((x) % 1000000000) / 1000);   \
     } while(0)
 
 #define NANOSEC_TO_TIMESPEC(x, ts)          \
     do {                                    \
-        (ts)->tv_sec = (x) / 1000000000;      \
-        (ts)->tv_nsec = (x) - ((ts)->tv_sec * 1000000000);   \
-    } while(0)
-*/
-#define NANOSEC_TO_TIMEVAL(x, tv)           \
-    do {                                    \
-        (tv)->tv_sec =  (x) / 1000000000;      \
-        (tv)->tv_usec = ((x) % 1000000000) / 1000);   \
-    } while(0)
-
-#define NANOSEC_TO_TIMESPEC(x, ts)          \
-    do {                                    \
-        (ts)->tv_sec = (x) / 1000000000;      \
+        (ts)->tv_sec = (x) / 1000000000;    \
         (ts)->tv_nsec = (x) % 1000000000;   \
     } while(0)
@@ -257 +245 @@
 #define TIMESPEC_TO_NANOSEC(x) ((u_int64_t)((x)->tv_sec * 1000000000) + ((u_int64_t)(x)->tv_nsec))
 
-
-
 #endif /* DEFINES */