Changeset 1971 for features/performance/src/send_packets.c

Timestamp:

04/09/08 15:37:35 (9 months ago)

Author:

aturner

Message:

switch to timespec (nanosecond precision) for sleeping. OS X's AbsoluteTime?
methods are really damn accurate! refs #41

Files:

• features/performance/src/send_packets.c (modified) (6 diffs)

features/performance/src/send_packets.c

@@ -327 +327 @@
     static int adjuster_flipper = 0;
 #ifdef HAVE_TCPREPLAY
-    struct timeval adjuster = { 0, OPT_VALUE_SLEEP_ACCEL }
+    struct timespec adjuster = { 0, OPT_VALUE_SLEEP_ACCEL * 1000 }
 #else
-    struct timeval adjuster = { 0, ADJUSTER_OFFSET };
-#endif
-    static struct timeval nap = { 0, 0 };
+    struct timespec adjuster = { 0, ADJUSTER_OFFSET * 1000 };
+#endif
+    static struct timespec nap = { 0, 0 };
     static u_int32_t double_up = 0;
-    struct timeval now, sleep_until, nap_this_time;
-    struct timespec ignore, sleep;
+    struct timeval nap_for, now, sleep_until;
+    struct timespec ignore, sleep, nap_this_time;
     float n;
     static u_int32_t send = 0;      /* accellerator.   # of packets to send w/o sleeping */
-    u_int32_t ppusec; /* packets per usec */
+    u_int64_t ppnsec; /* packets per usec */
     
     /* just return if topspeed */
@@ -373 +373 @@
          */
         if (timerisset(last) && timercmp(time, last, >)) {
-            timersub(time, last, &nap);
-            timerdiv(&nap, options.speed.speed);
+            timersub(time, last, &nap_for);
+            TIMEVAL_TO_TIMESPEC(&nap_for, &nap);
+            timesdiv(&nap, options.speed.speed);
         }
         else {
@@ -382 +383 @@
              * last packet.
              */
-            timerclear(&nap);
+            timesclear(&nap);
         }
         break;
@@ -394 +395 @@
             n = (float)len / (options.speed.speed * 1024 * 1024 / 8); /* convert Mbps to bps */
             nap.tv_sec = n;
-            nap.tv_usec = (n - nap.tv_sec)  * 1000000;
+            nap.tv_nsec = (n - nap.tv_sec)  * 1000000000;
             dbgx(3, "packet size %d\t\tequals %f bps\t\tnap " TIMEVAL_FORMAT, len, n, 
-                nap.tv_sec, nap.tv_usec);
+                nap.tv_sec, nap.tv_nsec);
         }
         else {
             /* don't sleep at all for the first packet */
-            timerclear(&nap);
+            timesclear(&nap);
         }
         break;
@@ -406 +407 @@
     case SPEED_PACKETRATE:
         /* only need to calculate this the first time */
-        if (! timerisset(&nap)) {
+        if (! timesisset(&nap)) {
             /* run in packets/sec */
-            ppusec = 1000000 / options.speed.speed;
-            MICROSEC_TO_TIMEVAL(ppusec, &nap);
-            dbgx(1, "sending 1 packet per %lu usec", nap.tv_usec);
+            ppnsec = 1000000000 / options.speed.speed;
+            NANOSEC_TO_TIMESPEC(ppnsec, &nap);
+            dbgx(1, "sending 1 packet per %lu nsec", nap.tv_nsec);
         }
         break;
@@ -439 +440 @@
      */
     nap_this_time.tv_sec = nap.tv_sec;
-    nap_this_time.tv_usec = nap.tv_usec;
+    nap_this_time.tv_nsec = nap.tv_nsec;
 
     /* apply the adjuster... */
-    if (timerisset(&adjuster)) {
-        if (timercmp(&nap_this_time, &adjuster, >)) {
-            timersub(&nap_this_time, &adjuster, &nap_this_time);
-            dbgx(1, "adjusting nap_this_time by %lu usec", adjuster.tv_usec);
+    if (timesisset(&adjuster)) {
+        if (timescmp(&nap_this_time, &adjuster, >)) {
+            timessub(&nap_this_time, &adjuster, &nap_this_time);
+            dbgx(1, "adjusting nap_this_time by %lu nsec", adjuster.tv_nsec);
         } else { 
             dbg(1, "resetting nap_this_time to 0");
-            timerclear(&nap_this_time);
+            timesclear(&nap_this_time);
         }
     }
     
     /* don't sleep if nap = { 0, 0} */
-    if (!timerisset(&nap_this_time))
+    if (!timesisset(&nap_this_time))
         return;