Changeset 1977

Timestamp:

04/16/08 20:34:21 (7 months ago)

Author:

aturner

Message:

fix compile issues under linux refs #41

Location:

features/performance

Files:

• configure.in (modified) (2 diffs)
• src/common/timer.h (modified) (2 diffs)
• src/config.h.in (modified) (3 diffs)
• src/sleep.c (modified) (1 diff)
• src/sleep.h (modified) (1 diff)
• src/tcpreplay_opts.def (modified) (1 diff)

features/performance/configure.in

@@ -132 +132 @@
 
 dnl Check for other header files
-AC_CHECK_HEADERS([fcntl.h stddef.h sys/socket.h  arpa/inet.h sys/time.h signal.h string.h strings.h sys/types.h sys/select.h netinet/in.h poll.h sys/poll.h unistd.h sys/param.h sys/io.h architecture/i386/pio.h sys/select.h])
+AC_CHECK_HEADERS([fcntl.h stddef.h sys/socket.h  arpa/inet.h sys/time.h signal.h string.h strings.h sys/types.h sys/select.h netinet/in.h poll.h sys/poll.h unistd.h sys/param.h sys/io.h architecture/i386/pio.h sys/select.h sys/event.h])
 
 dnl OpenBSD has special requirements
@@ -1037 +1037 @@
 dnl Do we support the RDTSC?
 case $host in
-    i386-*|x86_64-*|powerpc-*)
+    i?86-*|x86_64-*|powerpc-*)
     AC_DEFINE([HAVE_RDTSC], [1], [Does the CPU support the RDTSC?])
     ;;

features/performance/src/common/timer.h

@@ -97 +97 @@
 #endif
 
-#ifndef ROUND_TIMESPEC_TO_MICROSEC(ts)
+#ifndef ROUND_TIMESPEC_TO_MICROSEC
 #define ROUND_TIMESPEC_TO_MICROSEC(ts)      \
     do {                                    \
@@ -230 +230 @@
     }
     last.tv_sec = now.tv_sec;
-    last.tv_nsec = now.tv_nsec;
+    last.tv_usec = now.tv_usec;
 #endif
 }

features/performance/src/config.h.in

@@ -283 +283 @@
 #undef HAVE_SYS_DIR_H
 
+/* Define to 1 if you have the <sys/event.h> header file. */
+#undef HAVE_SYS_EVENT_H
+
 /* Define to 1 if you have the <sys/io.h> header file. */
 #undef HAVE_SYS_IO_H
@@ -412 +415 @@
 #undef RETSIGTYPE
 
-/* The size of `char*', as computed by sizeof. */
+/* The size of a `char*', as computed by sizeof. */
 #undef SIZEOF_CHARP
 
-/* The size of `int', as computed by sizeof. */
+/* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of `long', as computed by sizeof. */
+/* The size of a `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of `short', as computed by sizeof. */
+/* The size of a `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
@@ -470 +473 @@
 #undef malloc
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 

features/performance/src/sleep.c

@@ -38 +38 @@
 #include <sys/time.h>
 #include <unistd.h>     
-#include <sys/event.h>
 #include <errno.h>
 #include <string.h>
+
+#ifdef HAVE_SYS_EVENT
+#include <sys/event.h>
+#endif
 
 /* necessary for ioport_sleep() functions */

features/performance/src/sleep.h

@@ -42 +42 @@
 #include <sys/time.h>
 #include <unistd.h>     
-#include <sys/event.h>
 #include <errno.h>
 #include <string.h>
+#ifdef HAVE_SYS_EVENT
+#include <sys/event.h>
+#endif
 
 /* necessary for ioport_sleep() functions */

features/performance/src/tcpreplay_opts.def

@@ -156 +156 @@
 
 flag = {
-    ifdef       = HAVE_RDTSC;
     name        = rdtsc-clicks;
     max         = 1;