Changeset 1880

Timestamp:

07/18/07 20:52:55 (16 months ago)

Author:

aturner

Message:

commit work in progress. this doesn't seem to actually work though. :(
Anyways, this just commits my work up to this point, but at some point it's
going to need to be reworked. refs #41

Location:

features/performance/src

Files:

• common.h (modified) (1 diff)
• common/Makefile.am (modified) (2 diffs)
• common/rdtsc.c (added)
• common/rdtsc.h (added)
• common/timer.h (modified) (1 diff)
• send_packets.c (modified) (3 diffs)
• tcpprep.c (modified) (1 diff)
• tcpreplay.c (modified) (2 diffs)
• tcpreplay_opts.def (modified) (1 diff)

features/performance/src/common.h

@@ -16 +16 @@
 #include "common/utils.h"
 #include "common/xX.h"
+#include "common/rdtsc.h"
 #include "common/tcpdump.h"
 #include "common/timer.h"

features/performance/src/common/Makefile.am

@@ -15 +15 @@
                       fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c \
                       timer.c svn_version.c abort.c sendpacket.c \
-                          dlt_names.c mac.c interface.c
+                          dlt_names.c mac.c interface.c rdtsc.c
 
 if ENABLE_TCPDUMP
@@ -28 +28 @@
                  fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
                  tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
-                 dlt_names.h mac.h interface.h
+                 dlt_names.h mac.h interface.h rdtsc.h
 
 MOSTLYCLEANFILES = *~

features/performance/src/common/timer.h

@@ -122 +122 @@
         } while(0)
 
-
-/* device tvp by x.  store in tvp */
-#define timerdiv2(tvp, x)                                               \
-        do {                                                                    \
-                (tvp)->tv_sec = (tvp)->tv_sec / x;              \
-                (tvp)->tv_usec = (tvp)->tv_usec / x;    \
-        } while(0)
-
 #endif
-

features/performance/src/send_packets.c

@@ -326 +326 @@
     static u_int32_t send = 0;      /* remember # of packets to send btw calls */
     u_int32_t loop;
+    u_int64_t loop2;
 
     /* just return if topspeed */
@@ -447 +448 @@
     }
 
-    if (!accurate) {
+
+    if (accurate == 2) {
+        loop2 = rdtsc_sleep(nap);
+        //fprintf(stderr, "rdtsc slept for %llu clicks\n", loop2);
+        dbgx(3, "rdtsc slept for  %llu times", loop);
+    } else if (accurate == 1) { 
+        /* gettimeofday() loop */
+        timeradd(&now, &nap, &delta);
+        loop = sleep_loop(delta);
+        dbgx(3, "sleep_loop looped %u times", loop);    
+    } else {
         timeradd(&didsleep, &nap, &didsleep);
 
@@ -465 +476 @@
             }
         }
-    } else {
-        timeradd(&now, &nap, &delta);
-        loop = sleep_loop(delta);
-        dbgx(3, "sleep_loop looped %u times", loop);
     }
 #ifdef DEBUG

features/performance/src/tcpprep.c

@@ -421 +421 @@
                       check_dst_port(ip_hdr, (pkthdr.caplen - l2len)));
             break;
+            
+        default:
+            errx(1, "Whops!  What mode are we in anyways? %d", options.mode);
         }
 #ifdef ENABLE_VERBOSE

features/performance/src/tcpreplay.c

@@ -286 +286 @@
         warn("not configured with --enable-debug.  Debugging disabled.");
 #endif
-    
+        
     options.loop = OPT_VALUE_LOOP;
 
@@ -328 +328 @@
     if (HAVE_OPT(ACCURATE))
         options.accurate = 1;
-        
+    
+    if (HAVE_OPT(ACCURATE2)) {
+        options.accurate = 2;
+        rdtsc_calibrate();
+    }
+
     if (HAVE_OPT(PKTLEN))
         warn("--pktlen may cause problems.  Use with caution.");

features/performance/src/tcpreplay_opts.def

@@ -131 +131 @@
     max         = 1;
     flags-cant  = accurate;
-    arg-type    = number;
     descrip     = "Enable even more accurate packet timing";
     doc         = <<- EOText
 Enables the "even more" accurate timing at the cost of higher CPU
-utilization by using a tight loop which increments a counter.   This method
-provides the most accurate timing of any option, but requires you to specify
-a cost for each loop.  This cost value is VERY system dependent, so you will
-need to run --loop-test to get this value.
+utilization by using the RDTSC counter available on newer CPU's.
+Only works on more recent x86, x86_64 and PPC
 EOText;
 };