#3200 get the handlerton compiling again refs[t:3200]

git-svn-id: file:///svn/toku/tokudb@27486 c7de825b-a66e-492c-adef-691d508d4ae1

linux/linux.c

@@ -18,6 +18,7 @@
 #include <sys/statvfs.h>
 #include "toku_portability.h"
 #include "toku_os.h"
+#include "toku_time.h"
 
 static int
 toku_mallopt_init(void) {

linux/tests/test-gettime.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <sys/types.h>
 #include <toku_assert.h>
 #include <unistd.h>
 #include <toku_time.h>

linux/tests/test-gettimeofday.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <sys/types.h>
 #include <toku_assert.h>
 #include <toku_time.h>
 

linux/toku_time.h

@@ -1,4 +1,4 @@
-#ident "Copyright (c) 2007-2010 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007-2011 Tokutek Inc.  All rights reserved."
 
 #ifndef TOKU_TIME_H
 #define TOKU_TIME_H
@@ -14,8 +14,53 @@ static inline float toku_tdiff (struct timeval *a, struct timeval *b) {
     return (a->tv_sec - b->tv_sec) +1e-6*(a->tv_usec - b->tv_usec);
 }
 
+// *************** Performance timers ************************
+// What do you really want from a performance timer:
+//  (1) Can determine actual time of day from the performance time.
+//  (2) Time goes forward, never backward.
+//  (3) Same time on different processors (or even different machines).
+//  (4) Time goes forward at a constant rate (doesn't get faster and slower)
+//  (5) Portable.
+//  (6) Getting the time is cheap.
+// Unfortuately it seems tough to get Properties 1-5.  So we go for Property 6,, but we abstract it.
+// We offer a type tokutime_t which can hold the time.
+// This type can be subtracted to get a time difference.
+// We can get the present time cheaply.
+// We can convert this type to seconds (but that can be expensive).
+// The implementation is to use RDTSC (hence we lose property 3: not portable).
+// Recent machines have constant_tsc in which case we get property (4).
+// Recent OSs on recent machines (that have RDTSCP) fix the per-processor clock skew, so we get property (3).
+// We get property 2 with RDTSC (as long as there's not any skew).
+// We don't even try to get propety 1, since we don't need it.
+// The decision here is that these times are really accurate only on modern machines with modern OSs.
+typedef u_int64_t tokutime_t;             // Time type used in by tokutek timers.
+
+// The value of tokutime_t is not specified here. 
+// It might be microseconds since 1/1/1970 (if gettimeofday() is
+// used), or clock cycles since boot (if rdtsc is used).  Or something
+// else.
+// Two tokutime_t values can be subtracted to get a time difference.
+// Use tokutime_to_seconds to that convert difference  to seconds.
+// We want get_tokutime() to be fast, but don't care so much about tokutime_to_seconds();
+//
+// For accurate time calculations do the subtraction in the right order:
+//   Right:  tokutime_to_seconds(t1-t2);
+//   Wrong   tokutime_to_seconds(t1)-toku_time_to_seconds(t2);
+// Doing it the wrong way is likely to result in loss of precision.
+// A double can hold numbers up to about 53 bits.  RDTSC which uses about 33 bits every second, so that leaves
+// 2^20 seconds from booting (about 2 weeks) before the RDTSC value cannot be represented accurately as a double.
+//
+double tokutime_to_seconds(tokutime_t)  __attribute__((__visibility__("default"))); // Convert tokutime to seconds.
+
+// Get tokutime.  We want this to be fast, so we expose the implementation as RDTSC.
+static inline tokutime_t get_tokutime (void) {
+    u_int32_t lo, hi;
+    __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
+    return (uint64_t)hi << 32 | lo;
+}
+
 #if defined(__cplusplus) || defined(__cilkplusplus)
-};
+}
 #endif
 
 #endif

release/Makefile

@@ -8,6 +8,7 @@ setup:
 	cp ../lib/lib$(TOKUFRACTALTREE_LIBNAME).so lib
 	cp ../toku_include/toku_os.h include
 	cp ../linux/toku_os_types.h include
+	cp ../linux/toku_time.h include
 	cp ../lib/libtokuportability.a lib
 
 clean:

toku_include/toku_portability.h

@@ -207,51 +207,6 @@ int toku_set_func_pread (ssize_t (*)(int, void *, size_t, off_t));
 int toku_portability_init    (void);
 int toku_portability_destroy (void);
 
-// *************** Performance timers ************************
-// What do you really want from a performance timer:
-//  (1) Can determine actual time of day from the performance time.
-//  (2) Time goes forward, never backward.
-//  (3) Same time on different processors (or even different machines).
-//  (4) Time goes forward at a constant rate (doesn't get faster and slower)
-//  (5) Portable.
-//  (6) Getting the time is cheap.
-// Unfortuately it seems tough to get Properties 1-5.  So we go for Property 6,, but we abstract it.
-// We offer a type tokutime_t which can hold the time.
-// This type can be subtracted to get a time difference.
-// We can get the present time cheaply.
-// We can convert this type to seconds (but that can be expensive).
-// The implementation is to use RDTSC (hence we lose property 3: not portable).
-// Recent machines have constant_tsc in which case we get property (4).
-// Recent OSs on recent machines (that have RDTSCP) fix the per-processor clock skew, so we get property (3).
-// We get property 2 with RDTSC (as long as there's not any skew).
-// We don't even try to get propety 1, since we don't need it.
-// The decision here is that these times are really accurate only on modern machines with modern OSs.
-typedef u_int64_t tokutime_t;             // Time type used in by tokutek timers.
-
-// The value of tokutime_t is not specified here. 
-// It might be microseconds since 1/1/1970 (if gettimeofday() is
-// used), or clock cycles since boot (if rdtsc is used).  Or something
-// else.
-// Two tokutime_t values can be subtracted to get a time difference.
-// Use tokutime_to_seconds to that convert difference  to seconds.
-// We want get_tokutime() to be fast, but don't care so much about tokutime_to_seconds();
-//
-// For accurate time calculations do the subtraction in the right order:
-//   Right:  tokutime_to_seconds(t1-t2);
-//   Wrong   tokutime_to_seconds(t1)-toku_time_to_seconds(t2);
-// Doing it the wrong way is likely to result in loss of precision.
-// A double can hold numbers up to about 53 bits.  RDTSC which uses about 33 bits every second, so that leaves
-// 2^20 seconds from booting (about 2 weeks) before the RDTSC value cannot be represented accurately as a double.
-//
-double tokutime_to_seconds(tokutime_t)  __attribute__((__visibility__("default"))); // Convert tokutime to seconds.
-
-// Get tokutime.  We want this to be fast, so we expose the implementation as RDTSC.
-static inline tokutime_t get_tokutime (void) {
-    u_int32_t lo, hi;
-    __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
-    return (uint64_t)hi << 32 | lo;
-}
-
 #if defined(__cplusplus) || defined(__cilkplusplus)
 };
 #endif