Changeset 1979

Timestamp:

04/16/08 21:17:25 (7 months ago)

Author:

aturner

Message:

fix get_delta_time() to take in account of packet writing time. refs #41

Location:

features/performance/src

Files:

• common/timer.h (modified) (2 diffs)
• send_packets.c (modified) (7 diffs)

features/performance/src/common/timer.h

@@ -191 +191 @@
         } while(0)
 
+#ifdef HAVE_ABSOLUTE_TIME
+    typedef AbsoluteTime delta_t;
+#else
+    typedef struct timeval delta_t;
+#endif
+
+/*
+ * starts a timer so we can figure out how much time has passed
+ * when we call get_delta_timer()
+ */
+static inline void
+start_delta_time(delta_t *ctx)
+{
+#ifdef HAVE_ABSOLUTE_TIME
+    *ctx = UpTime();
+#else
+    gettimeofday(ctx, NULL)
+#endif
+}
 
 /* 
  * returns the amount of time that has passed since the 
- * last time you called this function.
+ * last time you called start_delta_time()
  */
 static inline void
-get_delta_time(struct timespec *ret)
+get_delta_time(delta_t *ctx, struct timespec *ret)
 {
 /* OS X has absolute time */
 #ifdef HAVE_ABSOLUTE_TIME
-    static AbsoluteTime last = {0, 0};
     AbsoluteTime now, delta;
     Nanoseconds nano;
@@ -207 +225 @@
     now = UpTime();
     
-    if (! NonZero(last)) {
+    if (! NonZero(*ctx)) {
         timesclear(ret);
     } else {
-        delta = SubAbsoluteFromAbsolute(now, last);
+        delta = SubAbsoluteFromAbsolute(now, *ctx);
         nano = AbsoluteToNanoseconds(delta);
         NANOSEC_TO_TIMESPEC(UnsignedWideToUInt64(nano) / 10, ret);
     }
-
-    CopyAbsolute(last, now);
     
 /* Everyone else just uses gettimeofday */
 #else
-    static struct timeval last = {0, 0};
     struct timeval now, delta;
     
     gettimeofday(&now, NULL);
-    if (!timerisset(&last)) {
+
+    if (!timerisset(last)) {
         timesclear(ret);
     } else {
-        timersub(&now, &last, &delta);
+        timersub(&now, last, &delta);
         TIMEVAL_TO_TIMESPEC(&delta, ret);
     }
-    last.tv_sec = now.tv_sec;
-    last.tv_usec = now.tv_usec;
 #endif
 }

features/performance/src/send_packets.c

@@ -72 +72 @@
 
 static void do_sleep(struct timeval *time, struct timeval *last, int len, 
-    int accurate, sendpacket_t *sp, COUNTER counter);
+    int accurate, sendpacket_t *sp, COUNTER counter, delta_t *ctx);
 static const u_char *get_next_packet(pcap_t *pcap, struct pcap_pkthdr *pkthdr, 
     int file_idx, packet_cache_t **prev_packet);
@@ -96 +96 @@
     struct pcap_pkthdr *pkthdr_ptr;
 #endif
-
+    delta_t delta_ctx;
+    
     /* register signals */
     didsig = 0;
@@ -168 +169 @@
          */
          if (options.speed.mode != SPEED_TOPSPEED)
-            do_sleep((struct timeval *)&pkthdr.ts, &last, pktlen, options.accurate, sp, packetnum);
-        
+            do_sleep((struct timeval *)&pkthdr.ts, &last, pktlen, options.accurate, sp, packetnum, &delta_ctx);
+        
+        start_delta_time(&delta_ctx);
         /* write packet out on network */
         if (sendpacket(sp, pktdata, pktlen) < (int)pktlen)
@@ -321 +323 @@
 static void
 do_sleep(struct timeval *time, struct timeval *last, int len, int accurate, 
-    sendpacket_t *sp, COUNTER counter)
+    sendpacket_t *sp, COUNTER counter, delta_t *delta_ctx)
 {
     static struct timeval didsleep = { 0, 0 };
@@ -340 +342 @@
 #ifdef TCPREPLAY
     adjuster.tv_nsec = OPT_VALUE_SLEEP_ACCEL * 1000;
+    dbgx(2, "Adjuster: " TIMEVAL_FORMAT, adjuster.tv_sec, adjuster.tv_nsec);
 #else
-    adjuster.tv_nsec = ADJUSTER_OFFSET * 1000;
-#endif
-
-    dbgx(2, "Adjuster: " TIMEVAL_FORMAT, adjuster.tv_sec, adjuster.tv_nsec);
+    adjuster.tv_nsec = 0;
+#endif
     
     /* acclerator time? */
@@ -486 +487 @@
 
 
-    get_delta_time(&delta_time);
+    get_delta_time(delta_ctx, &delta_time);
     dbgx(2, "delta: " TIMESPEC_FORMAT, delta_time.tv_sec, delta_time.tv_nsec);
 
@@ -577 +578 @@
 #endif
 
-    get_delta_time(&delta_time);
     dbgx(2, "sleep delta: " TIMESPEC_FORMAT, delta_time.tv_sec, delta_time.tv_nsec);