Changeset 1973

Timestamp:

04/11/08 15:00:08 (8 months ago)

Author:

aturner

Message:

add support for rounding timespec's to usec accuracy for non-absolute timing
methods refs #41

Location:

features/performance/src

Files:

• common/timer.h (modified) (2 diffs)
• send_packets.c (modified) (4 diffs)
• sleep.h (modified) (1 diff)

features/performance/src/common/timer.h

@@ -60 +60 @@
         tvp->tv_sec = time;                     \
         tvp->tv_usec = (time - tvp->tv_sec) * 100000; \
-    } while (0);
+    } while (0)
 #endif
 
@@ -75 +75 @@
     (tv)->tv_usec = (ts)->tv_nsec / 1000; }
 #endif
+
+#ifndef ROUND_TIMESPEC_TO_MICROSEC(ts)
+#define ROUND_TIMESPEC_TO_MICROSEC(ts)       \
+    do {                                        \
+        (ts)->tv_nsec = (lroundf((float)(ts)->tv_nsec / 1000) * 1000);   \
+    } while (0)
+#endif
+
+
 
 /* zero out a timer */

features/performance/src/send_packets.c

@@ -385 +385 @@
             timesclear(&nap);
         }
+
+        /* round up/down as necessary */
+        if (accurate != ACCURATE_ABS_TIME)
+            ROUND_TIMESPEC_TO_MICROSEC(&nap);
+        
         break;
 
@@ -396 +401 @@
             nap.tv_sec = n;
             nap.tv_nsec = (n - nap.tv_sec)  * 1000000000;
+            
+            /* round up/down as necessary */
+            if (accurate != ACCURATE_ABS_TIME)
+                ROUND_TIMESPEC_TO_MICROSEC(&nap);
+
             dbgx(3, "packet size %d\t\tequals %f bps\t\tnap " TIMEVAL_FORMAT, len, n, 
                 nap.tv_sec, nap.tv_nsec);
@@ -458 +468 @@
 
 
+    /*
+     * Depending on the accurate method & packet rate computation method
+
     /* 
      * We have multiple methods of sleeping, pick the right one...
@@ -492 +505 @@
     case ACCURATE_NANOSLEEP:
         nanosleep_sleep(nap_this_time);
-
         break;
         /*

features/performance/src/sleep.h

@@ -114 +114 @@
  * sleep for some time using the select() call timeout method.   This is 
  * highly portable for sub-second sleeping, but only for about 1msec
- * resolution.
+ * resolution which is pretty much useless for our needs.  Keeping it here
+ * for furture reference
  */
 static inline void