[netperf-dev] netperf2 commit notice r481 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2011-08-03 13:19:53 -0700 (Wed, 03 Aug 2011)
New Revision: 481

Modified:
   trunk/src/hist.h
   trunk/src/netlib.c
   trunk/src/nettest_omni.c
Log:
fix up some stuff for WANT_SPIN

Modified: trunk/src/hist.h
===================================================================
--- trunk/src/hist.h	2011-08-03 18:12:29 UTC (rev 480)
+++ trunk/src/hist.h	2011-08-03 20:19:53 UTC (rev 481)
@@ -35,10 +35,6 @@
 #ifndef _HIST_INCLUDED
 #define _HIST_INCLUDED
 
-#ifdef IRIX
-#include <sys/time.h>
-#endif /* IRIX */
-
 #if defined(HAVE_GET_HRT)
 #include "hrt.h"
 #endif

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2011-08-03 18:12:29 UTC (rev 480)
+++ trunk/src/netlib.c	2011-08-03 20:19:53 UTC (rev 481)
@@ -867,6 +867,22 @@
 }
 #endif /* WIN32 */
 
+
+ /* this routine will disable any running timer */
+void
+stop_timer()
+{
+#ifndef WIN32
+  alarm(0);
+#else
+  /* at some point we may need some win32 equivalent */
+  if (hAlarm != (HANDLE) INVALID_HANDLE_VALUE) {
+    SetEvent(hAlarm);
+  }
+#endif /* WIN32 */
+
+}
+
      
 
 /************************************************************************/
@@ -1146,22 +1162,7 @@
 
 } 
 
-
- /* this routine will disable any running timer */
-void
-stop_timer()
-{
-#ifndef WIN32
-  alarm(0);
-#else
-  /* at some point we may need some win32 equivalent */
-  if (hAlarm != (HANDLE) INVALID_HANDLE_VALUE) {
-    SetEvent(hAlarm);
-  }
-#endif /* WIN32 */
 
-}
-
 
 #ifdef WANT_INTERVALS
 /* this routine will enable the interval timer and set things up so

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2011-08-03 18:12:29 UTC (rev 480)
+++ trunk/src/nettest_omni.c	2011-08-03 20:19:53 UTC (rev 481)
@@ -321,7 +321,7 @@
 	} \
         \
         HIST_timestamp(&intvl_wait_start); \
-        do {
+        do { \
           HIST_timestamp(intvl_two_ptr); } \
         while(delta_micro(intvl_one_ptr,intvl_two_ptr) < interval_usecs); \
         interval_wait_microseconds += \