Merge branch 'master' into Enhancement_improve_--mbps_option_stabilit…

…y_and_performance Conflicts: src/Makefile.am src/send_packets.c src/sleep.c src/sleep.h src/tcpreplay.c
appneta · fklassen · Dec 3, 2013 · Dec 2, 2013 · Dec 2, 2013 · Dec 2, 2013
commit 7513447313dc4f6a791f9e959772cb7b624d1331
diff --git a/configure b/configure
@@ -23248,9 +23248,9 @@ Please see: http://tcpreplay.synfin.net/trac/ticket/142 for more details" >&2;}
 
     *-*-cygwin)
         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Windows/Cygwin support is still somewhat experimental.
-Please report any bugs! http://tcpreplay.synfin.net/trac/newticket" >&5
+Please report any bugs!	http://tcpreplay.synfin.net/trac/newticket" >&5
 $as_echo "$as_me: WARNING: Windows/Cygwin support is still somewhat experimental.
-Please report any bugs! http://tcpreplay.synfin.net/trac/newticket" >&2;}
+Please report any bugs!	http://tcpreplay.synfin.net/trac/newticket" >&2;}
     ;;
 esac
 
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,6 +1,7 @@
 $Id$
 
 ??/??/2013 Version 3.5.0
+    - Enhance accuracy and performance of --mbps option (appneta #2)
     - Add netmap injector (appneta #1)
     - Add --sleepmode option to handle high precision timing (#421)
     - Update URL's to point to new tcpreplay website (#430)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -31,10 +31,10 @@ tcprewrite.1: tcprewrite_opts.def tcpedit/tcpedit_opts.def
 	@AUTOGEN@ -T agman1.tpl $(opts_list) tcprewrite_opts.def
 
 tcpreplay-edit.1: tcpreplay_opts.def
-	@AUTOGEN@ -T agman1.tpl $(opts_list) -DTCPREPLAY_EDIT -DTCPREPLAY_EDIT_MAN tcpreplay_opts.def
+	@AUTOGEN@ -T agman1.tpl $(opts_list) @NETMAPFLAGS@ -DTCPREPLAY_EDIT -DTCPREPLAY_EDIT_MAN tcpreplay_opts.def
 
 tcpreplay.1: tcpreplay_opts.def
-	@AUTOGEN@ -T agman1.tpl $(opts_list) tcpreplay_opts.def
+	@AUTOGEN@ -T agman1.tpl $(opts_list) @NETMAPFLAGS@ tcpreplay_opts.def
 
 tcpbridge.1: tcpbridge_opts.def tcpedit/tcpedit_opts.def
 	@AUTOGEN@ -T agman1.tpl $(opts_list) tcpbridge_opts.def

diff --git a/src/sleep.c b/src/sleep.c
@@ -159,17 +159,6 @@ do_sleep(struct timeval *time, struct timeval *last, int len, int accurate,
         return;
     }
 
-    /* also an accelerator, but exposed externally to avoid expensive "now" timestamp */
-    if (*skip_timestamp) {
-        if (len < skip_length) {
-            skip_length -= len;
-            return;
-        }
-
-        skip_length = 0;
-        *skip_timestamp = 0;
-    }
-
     /*
      * pps_multi accelerator.    This uses the existing send accelerator above
      * and hence requires the funky math to get the expected timings.
@@ -358,7 +347,6 @@ do_sleep(struct timeval *time, struct timeval *last, int len, int accurate,
         memcpy(&nap_this_time, &(options.maxsleep), sizeof(struct timespec));
     }
 
-SLEEP_NOW:
     dbgx(2, "Sleeping:                   " TIMESPEC_FORMAT, nap_this_time.tv_sec, nap_this_time.tv_nsec);
 
     /* don't sleep if nap = {0, 0} */