Changeset 1970

Timestamp:

04/09/08 16:36:23 (2 years ago)

Author:

aturner

Message:

sync up my test code so far. refs #41

Location:

features/performance

Files:

• aclocal.m4 (modified) (96 diffs)
• configure.in (modified) (7 diffs)
• src/Makefile.am (modified) (3 diffs)
• src/common/Makefile.am (modified) (1 diff)
• src/common/rdtsc.c (modified) (2 diffs)
• src/common/rdtsc.h (modified) (6 diffs)
• src/common/timer.c (modified) (1 diff)
• src/common/timer.h (modified) (1 diff)
• src/config.h.in (modified) (5 diffs)
• src/defines.h.in (modified) (1 diff)
• src/send_packets.c (modified) (15 diffs)
• src/sleep.c (added)
• src/sleep.h (added)
• src/tcpreplay.c (modified) (4 diffs)
• src/tcpreplay.h (modified) (5 diffs)
• src/tcpreplay_opts.def (modified) (9 diffs)

features/performance/aclocal.m4

@@ -1 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12 +12 @@
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
 
 
@@ -182 +185 @@
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
@@ -269 +272 @@
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
@@ -282 +286 @@
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
@@ -299 +304 @@
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+        /^0/ {
+            s/^0  *\(.*\)$/\1/
+            p
+        }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
@@ -535 +548 @@
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -542 +556 @@
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
@@ -558 +575 @@
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
@@ -629 +649 @@
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -670 +690 @@
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
@@ -788 +809 @@
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
                = "XX$teststring") >/dev/null 2>&1 &&
-            new_result=`expr "X$teststring" : ".*" 2>&1` &&
-            lt_cv_sys_max_cmd_len=$new_result &&
-            test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+              new_result=`expr "X$teststring" : ".*" 2>&1` &&
+              lt_cv_sys_max_cmd_len=$new_result &&
+              test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
@@ -1032 +1056 @@
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
@@ -1040 +1065 @@
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
@@ -1180 +1205 @@
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
@@ -1197 +1223 @@
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
@@ -1211 +1238 @@
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+        lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
@@ -1381 +1446 @@
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
@@ -1401 +1462 @@
 freebsd1*)
   dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
   ;;
 
@@ -1452 +1501 @@
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
@@ -1515 +1564 @@
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
@@ -1570 +1619 @@
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -1586 +1635 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,    ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
@@ -1597 +1646 @@
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
   ;;
 
@@ -1692 +1729 @@
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
@@ -1797 +1838 @@
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
@@ -2058 +2100 @@
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
@@ -2121 +2163 @@
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
@@ -2268 +2310 @@
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -2307 +2349 @@
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
@@ -2316 +2364 @@
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
@@ -2354 +2402 @@
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
@@ -2370 +2418 @@
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2401 +2449 @@
 
 osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2456 +2508 @@
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
@@ -2672 +2724 @@
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
@@ -2777 +2829 @@
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -2926 +2978 @@
         then
           # We have reworked collect2
-          _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+          :
         else
           # We have old collect2
@@ -3085 +3137 @@
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
@@ -3122 +3174 @@
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
@@ -3171 +3223 @@
 
       case $host_cpu in
-      hppa*64*|ia64*)
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
@@ -3241 +3291 @@
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3281 +3331 @@
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
@@ -3361 +3411 @@
         output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+        *Sun\ C*)
+          # Sun C++ 5.9
+          _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+          # Not sure whether something based on
+          # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+          # would be better.
+          output_verbose_link_cmd='echo'
+
+          # Archives containing C++ object files must be created using
+          # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+          # necessary to make sure instantiated templates are included
+          # in the archive.
+          _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+          ;;
+        esac
+        ;;
     esac
     ;;
@@ -3399 +3472 @@
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
@@ -3570 +3647 @@
           solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
           *)
-            # The C++ compiler is used as linker so we must use $wl
-            # flag to pass the commands to the underlying system
-            # linker. We must also pass each convience library through
-            # to the system linker between allextract/defaultextract.
-            # The C++ compiler will combine linker options so we
-            # cannot just pass the convience library names through
-            # without $wl.
+            # The compiler driver will combine and reorder linker options,
+            # but understands `-z linker_flag'.
             # Supported since Solaris 2.6 (maybe 2.5.1?)
-            _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+            _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
             ;;
         esac
@@ -3625 +3697 @@
 
           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+          case $host_os in
+          solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+          *)
+            _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+            ;;
+          esac
         fi
         ;;
@@ -3868 +3946 @@
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
@@ -3876 +3954 @@
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
@@ -3931 +4042 @@
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -4013 +4131 @@
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
@@ -4069 +4187 @@
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
@@ -4158 +4276 @@
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
@@ -4204 +4323 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
@@ -4529 +4648 @@
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
@@ -4612 +4731 @@
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
@@ -4648 +4768 @@
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
@@ -4838 +4958 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
@@ -4855 +4977 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -4921 +5043 @@
         esac
         ;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
         # FreeBSD uses GNU C++
         ;;
@@ -4964 +5086 @@
         esac
         ;;
-      linux*)
+      linux* | k*bsd*-gnu)
         case $cc_basename in
           KCC*)
@@ -4991 +5113 @@
             ;;
           *)
+            case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              # Sun C++ 5.9
+              _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+              _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+              _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+              ;;
+            esac
             ;;
         esac
@@ -5111 +5241 @@
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
@@ -5127 +5259 @@
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -5185 +5317 @@
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
@@ -5218 +5350 @@
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
@@ -5237 +5369 @@
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+        *Sun\ C*)
+          # Sun C 5.9
+          _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+          _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+          ;;
+        *Sun\ F*)
+          # Sun Fortran 8.3 passes all unrecognized flags to the linker
+          _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+          _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+          ;;
+        esac
+        ;;
       esac
       ;;
@@ -5243 +5391 @@
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # All OSF/1 code is PIC.
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
@@ -5340 +5492 @@
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5357 +5510 @@
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
@@ -5496 +5649 @@
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
@@ -5514 +5667 @@
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5529 +5682 @@
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         tmp_addflag=
@@ -5547 +5700 @@
           tmp_addflag=' -nofor_main' ;;
         esac
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        case `$CC -V 2>&1 | sed 5q` in
+        *Sun\ C*)                       # Sun C 5.9
+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+          tmp_sharedflag='-G' ;;
+        *Sun\ F*)                       # Sun Fortran 8.3
+          tmp_sharedflag='-G' ;;
+        *)
+          tmp_sharedflag='-shared' ;;
+        esac
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
         if test $supports_anon_versioning = yes; then
@@ -5553 +5715 @@
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-          $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+          $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
         fi
       else
@@ -5593 +5755 @@
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
         _LT_AC_TAGVAR(ld_shlibs, $1)=no
         cat <<_LT_EOF 1>&2
@@ -5712 +5874 @@
           then
           # We have reworked collect2
-          _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+          :
           else
           # We have old collect2
@@ -5805 +5967 @@
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5847 +6009 @@
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
@@ -5890 +6052 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -6012 +6174 @@
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+          _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        else
+          case $host_os in
+           openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+             _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+             ;;
+           *)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+             _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+             ;;
+          esac
+        fi
       else
-       case $host_os in
-         openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-           _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-           ;;
-         *)
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           ;;
-       esac
+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
@@ -6088 +6254 @@
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
-        # The compiler driver will combine linker options so we
-        # cannot just pass the convience library names through
-        # without $wl, iff we do not link with $LD.
-        # Luckily, gcc supports the same syntax we need for Sun Studio.
+        # The compiler driver will combine and reorder linker options,
+        # but understands `-z linker_flag'.  GCC discards it without `$wl',
+        # but is careful enough not to reorder.
         # Supported since Solaris 2.6 (maybe 2.5.1?)
-        case $wlarc in
-        '')
-          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-        *)
-          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-        esac ;;
+        if test "$GCC" = yes; then
+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+        else
+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+        fi
+        ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -6155 +6320 @@
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6230 +6395 @@
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
@@ -6333 +6498 @@
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
@@ -6353 +6542 @@
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
@@ -6359 +6548 @@
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
@@ -6391 +6581 @@
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -6409 +6600 @@
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
@@ -6425 +6616 @@
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
@@ -6698 +6891 @@
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
@@ -6786 +6979 @@
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -6792 +6985 @@
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
@@ -6897 +7090 @@
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
@@ -6906 +7100 @@
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
@@ -7207 +7401 @@
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])

features/performance/configure.in

@@ -132 +132 @@
 
 dnl Check for other header files
-AC_CHECK_HEADERS([fcntl.h stddef.h sys/socket.h  arpa/inet.h sys/time.h signal.h string.h strings.h sys/types.h sys/select.h netinet/in.h poll.h sys/poll.h unistd.h sys/param.h])
+AC_CHECK_HEADERS([fcntl.h stddef.h sys/socket.h  arpa/inet.h sys/time.h signal.h string.h strings.h sys/types.h sys/select.h netinet/in.h poll.h sys/poll.h unistd.h sys/param.h sys/io.h architecture/i386/pio.h sys/select.h])
 
 dnl OpenBSD has special requirements
@@ -161 +161 @@
 AC_CHECK_MEMBERS([struct timeval.tv_sec])
 
-AC_CHECK_FUNCS([gettimeofday ctime memset regcomp strdup strchr strerror strtol strncpy strtoull poll ntohll mmap snprintf vsnprintf])
+AC_CHECK_FUNCS([gettimeofday ctime memset regcomp strdup strchr strerror strtol strncpy strtoull poll ntohll mmap snprintf vsnprintf ioperm select kqueue])
 
 dnl Look for strlcpy since some BSD's have it
@@ -1035 +1035 @@
 fi
 
+dnl Do we support the RDTSC?
+case $host in
+    i386-*|x86_64-*|powerpc-*)
+    AC_DEFINE([HAVE_RDTSC], [1], [Does the CPU support the RDTSC?])
+    ;;
+esac
+
+
 dnl Allows user to choose which nic to use for testing purposes
 AC_ARG_WITH(testnic,
@@ -1047 +1055 @@
 disable_pcap_findalldevs=no
 
-
+osx_frameworks=no
 dnl these need to be dynamic based on OS
 case $host in
@@ -1074 +1082 @@
         disable_pcap_findalldevs=yes
     fi
+    AC_DEFINE([HAVE_ABSOLUTE_TIME], [1], [Have OS X UpTime()/AbsoluteTime high-precision timing])
+    osx_frameworks=yes
         AC_MSG_RESULT(Apple OS X)
         ;;
@@ -1095 +1105 @@
         ;;
 esac])
+
+AM_CONDITIONAL([ENABLE_OSX_FRAMEWORKS], test "$osx_frameworks" == "yes")
 
 
@@ -1155 +1167 @@
 )
 
-
 case $host in
         *-apple-darwin*)

features/performance/src/Makefile.am

@@ -49 +49 @@
 tcpreplay_LDADD = ./tcpedit/libtcpedit.a ./common/libcommon.a $(LIBSTRL) \
                   @LNETLIB@ @LPCAPLIB@ $(LIBOPTS_LDADD)
-tcpreplay_SOURCES = tcpreplay_opts.c send_packets.c signal_handler.c tcpreplay.c
+if ENABLE_OSX_FRAMEWORKS
+tcpreplay_LDFLAGS = -framework CoreServices -framework Carbon
+endif
+tcpreplay_SOURCES = tcpreplay_opts.c send_packets.c signal_handler.c tcpreplay.c sleep.c
 tcpreplay_OBJECTS: tcpreplay_opts.h
 tcpreplay_opts.h: tcpreplay_opts.c
@@ -86 +89 @@
 tcpbridge_LDADD = ./tcpedit/libtcpedit.a ./common/libcommon.a \
                   $(LIBSTRL) @LNETLIB@ @LPCAPLIB@ $(LIBOPTS_LDADD)
-tcpbridge_SOURCES = tcpbridge_opts.c tcpbridge.c bridge.c send_packets.c                
+if ENABLE_OSX_FRAMEWORKS
+tcpbridge_LDFLAGS = -framework CoreServices -framework Carbon
+endif
+tcpbridge_SOURCES = tcpbridge_opts.c tcpbridge.c bridge.c send_packets.c sleep.c
 tcpbridge_OBJECTS: tcpbridge_opts.h
 tcpbridge_opts.h: tcpbridge_opts.c
@@ -98 +104 @@
                  tcpprep_opts.def tcprewrite_opts.def tcpreplay_opts.def \
                  flowreplay_opts.def tcpbridge_opts.def tcpbridge.h \
-                 flowreplay_opts.h tcpbridge_opts.h tcpr.h
+                 flowreplay_opts.h tcpbridge_opts.h tcpr.h sleep.h
 
 

features/performance/src/common/Makefile.am

@@ -5 +5 @@
 
 svn_version.c:
-        echo -n 'const char SVN_Version[] = "'   > svn_version.c
+        $(ECHO) -n 'const char SVN_Version[] = "'   > svn_version.c
         svnversion -n ../..                     >> svn_version.c
-        echo '";'                                                               >> svn_version.c
-        echo 'const char *svn_version(void) {'  >> svn_version.c
-        echo '  return SVN_Version;'                    >> svn_version.c
-        echo '}'                                                        >> svn_version.c
+        $(ECHO) '";'                                                            >> svn_version.c
+        $(ECHO) 'const char *svn_version(void) {'  >> svn_version.c
+        $(ECHO) '       return SVN_Version;'                    >> svn_version.c
+        $(ECHO) '}'                                                     >> svn_version.c
 
 libcommon_a_SOURCES = cidr.c err.c list.c cache.c services.c get.c \

features/performance/src/common/rdtsc.c

@@ -2 +2 @@
 
 /*
- * Copyright (c) 2007 Aaron Turner.
+ * Copyright (c) 2008 Aaron Turner.
  * All rights reserved.
  *
@@ -45 +45 @@
  */
 u_int64_t
-rdtsc_calibrate(void)
+rdtsc_calibrate(u_int32_t mhz)
 {
     static u_int64_t x = 0;
+    u_int64_t v = 0;
+    struct timeval start, end, diff;
     u_int64_t x1, x2;
+    u_int16_t n;
     
-    if (x != 0)
+    if (x != 0) {
         return x;
-    
-    /* haven't calculated clicks/usec yet */
-    x1 = rdtsc();
-    usleep(100000); /* .1 sec = 100,000 usec */
-    x2 = rdtsc();
-    x = (x2 - x1) / 100000;
+    } else if (mhz > 0 && x == 0) {
+        x = (u_int64_t)mhz;
+        notice("Using user specification of %llu Mhz", x);
+    } else {
+        /* haven't calculated clicks/usec yet */
+        for (n=0; n<16; ++n) {
+            gettimeofday(&start, 0);
+            x1 = rdtsc();
+
+            usleep(100000);
+
+            x2 = rdtsc();
+            gettimeofday(&end, 0);
+
+            timersub(&end, &start, &diff);
+
+            v = (x2 - x1)/(diff.tv_sec * 1000000 + diff.tv_usec);
+            x = x ? (x + v)/2 : v;
+        }
+        notice("Using guessimate of %llu Mhz", x);
+    }
     return x;
 }
-
-/*
- * sleeps for sleep time, using the rdtsc counter for accuracy
- * you need to call rdtsc_calibrate() BEFORE this or you'll sleep for 
- * an additional .1 sec the very first time you call it.
- */
-u_int64_t
-rdtsc_sleep(const struct timeval sleep)
-{
-    u_int64_t sleep_for, now;
-    
-    sleep_for = rdtsc_calibrate() * (sleep.tv_sec * 1000000 + sleep.tv_usec);
-    now = rdtsc();
-    sleep_for += now;
-    
-    while (now < sleep_for)
-        now += (rdtsc() - now);
-        
-    return now;
-}

features/performance/src/common/rdtsc.h

@@ +1 @@
+/* $Id:$ */
+
+/*
+ * Copyright (c) 2008 Aaron Turner.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright owners nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
 /*
  * Read TimeStamp Counter (RDTSC)
@@ -4 +37 @@
  * I'm not really sure what the license is, but I'll assume Kazutomo Yoshii is 
  * cool with me using it since he published it on his website.
+ * Should also check out: http://www.fftw.org/cycle.h
  */
 
@@ -10 +44 @@
 
 
-u_int64_t rdtsc_calibrate(void);
-u_int64_t rdtsc_sleep(const struct timeval sleep);
+u_int64_t rdtsc_calibrate(u_int32_t mhz);
 
 #if defined(__i386__)
 #define HAVE_RDTSC 1
-static __inline__ u_int64_t rdtsc(void)
+
+static inline u_int64_t 
+rdtsc(void)
 {
     u_int64_t x;
@@ -21 +56 @@
     return x;
 }
+
 #elif defined(__x86_64__)
 #define HAVE_RDTSC 1
 
-static __inline__ u_int64_t rdtsc(void)
+static inline u_int64_t 
+rdtsc(void)
 {
-  unsigned hi, lo;
-  __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-  return ( (u_int64_t)lo)|( ((u_int64_t)hi)<<32 );
+    unsigned hi, lo;
+    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+    return ( (u_int64_t)lo)|( ((u_int64_t)hi)<<32 );
 }
 
@@ -34 +71 @@
 #define HAVE_RDTSC 1
 
-static __inline__ u_int64_t rdtsc(void)
+static inline u_int64_t 
+rdtsc(void)
 {
-  u_int64_t result=0;
-  u_int32_t upper, lower,tmp;
-  __asm__ volatile(
-                "0:                  \n"
-                "\tmftbu   %0           \n"
-                "\tmftb    %1           \n"
-                "\tmftbu   %2           \n"
-                "\tcmpw    %2,%0        \n"
-                "\tbne     0b         \n"
-                : "=r"(upper),"=r"(lower),"=r"(tmp)
-                );
-  result = upper;
-  result = result<<32;
-  result = result|lower;
+    u_int64_t result=0;
+    u_int32_t upper, lower,tmp;
+    __asm__ volatile(
+        "0:                  \n"
+        "\tmftbu   %0           \n"
+        "\tmftb    %1           \n"
+        "\tmftbu   %2           \n"
+        "\tcmpw    %2,%0        \n"
+        "\tbne     0b         \n"
+        : "=r"(upper),"=r"(lower),"=r"(tmp)
+        );
+    result = upper;
+    result = result<<32;
+    result = result|lower;
 
-  return(result);
+    return(result);
 }
 
@@ -60 +98 @@
 #endif
 
+/* only define rdtsc_sleep() if we have rdtsc() */
+#ifdef HAVE_RDTSC
+/*
+ * sleeps for sleep time, using the rdtsc counter for accuracy
+ * you need to call rdtsc_calibrate() BEFORE this or you'll sleep for 
+ * an additional .1 sec the very first time you call it.
+ */
+static inline void
+rdtsc_sleep(const struct timeval sleep)
+{
+    u_int64_t sleep_until;
+    u_int64_t now = 0;
+    static u_int64_t clicks_per_usec = 0;
+
+    sleep_until = rdtsc();
+    clicks_per_usec = clicks_per_usec > 0 ? clicks_per_usec : rdtsc_calibrate(0);
+    
+    sleep_until += clicks_per_usec * TIMEVAL_TO_MICROSEC(&sleep);
+    
+    while (now < sleep_until)
+        now = rdtsc();
+}
 #endif
 
+#endif /* __RDTSC_H__ */
+

features/performance/src/common/timer.c

@@ -54 +54 @@
     tvp->tv_usec = interval - (tvp->tv_sec * 1000000);
 }
-
-/*
- * converts a float to a timeval structure
- * converted to a #define
-void
-float2timer(float time, struct timeval *tvp)
-{
-    float n;
-
-    n = time;
-
-    tvp->tv_sec = n;
-
-    n -= tvp->tv_sec;
-    tvp->tv_usec = n * 100000;
-
-}
- */

features/performance/src/common/timer.h

@@ -44 +44 @@
 
 /*
- * 1 sec = 1,000,000 microsec
+ * 1 sec = 1,0000 millisec (ms)
+ * 1 sec = 1,000,000 microsec (us)
+ * 1 sec = 1,000,000,000 nanosec (ns)
+ * 1 millisec = 1,000 microsec
  * 1 microsec = 1,000 nanosec
- * 1 sec = 1,000,000,000 nanosec
  */
 

features/performance/src/config.h.in

@@ -48 +48 @@
 /* Enable GNU Profiler */
 #undef GPROF
+
+/* Have OS X UpTime()/AbsoluteTime high-precision timing */
+#undef HAVE_ABSOLUTE_TIME
+
+/* Define to 1 if you have the <architecture/i386/pio.h> header file. */
+#undef HAVE_ARCHITECTURE_I386_PIO_H
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
@@ -122 +128 @@
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `ioperm' function. */
+#undef HAVE_IOPERM
+
+/* Define to 1 if you have the `kqueue' function. */
+#undef HAVE_KQUEUE
+
 /* Define to 1 if you have the `gen' library (-lgen). */
 #undef HAVE_LIBGEN
@@ -198 +210 @@
 #undef HAVE_POLL_H
 
+/* Does the CPU support the RDTSC? */
+#undef HAVE_RDTSC
+
 /* Define this if we have a functional realpath(3C) */
 #undef HAVE_REALPATH
@@ -203 +218 @@
 /* Define to 1 if you have the `regcomp' function. */
 #undef HAVE_REGCOMP
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
 
 /* Define to 1 if you have the <setjmp.h> header file. */
@@ -264 +282 @@
    */
 #undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/io.h> header file. */
+#undef HAVE_SYS_IO_H
 
 /* Define to 1 if you have the <sys/limits.h> header file. */

features/performance/src/defines.h.in

@@ -203 +203 @@
 #endif
 
+/* Time converters */
+#define SEC_TO_MILLISEC(x) (x * 1000)
+#define SEC_TO_MICROSEC(x) (x * 1000000)
+#define SEC_TO_NANOSEC(x)  ((u_int64_t)x * 1000000000)
+
+#define MILLISEC_TO_SEC(x) (x / 1000)
+#define MICROSEC_TO_SEC(x) (x / 1000000)
+#define NANOSEC_TO_SEC(x)  ((u_int64_t)x / 1000000000)
+
+#define TIMEVAL_TO_MILLISEC(x)  (((x)->tv_sec * 1000) + ((x)->tv_usec / 1000))
+#define TIMEVAL_TO_MICROSEC(x)  (((x)->tv_sec * 1000000) + (x)->tv_usec)
+#define TIMEVAL_TO_NANOSEC(x)   ((u_int64_t)((x)->tv_sec * 1000000000) + ((u_int64_t)(x)->tv_usec * 1000))
+
+#define MILLISEC_TO_TIMEVAL(x, tv)          \
+    do {                                    \
+        (tv)->tv_sec = x / 1000;            \
+        (tv)->tv_usec = (x * 1000) - ((tv)->tv_sec * 1000000);   \
+    } while(0)
+    
+#define MICROSEC_TO_TIMEVAL(x, tv)          \
+    do {                                    \
+        (tv)->tv_sec = x / 1000000;         \
+        (tv)->tv_usec = x - ((tv)->tv_sec * 1000000);   \
+    } while(0)
+
+#define NANOSEC_TO_TIMEVAL(x, tv)           \
+    do {                                    \
+        (tv)->tv_sec = x / 1000000000;      \
+        (tv)->tv_usec = (x / 1000) - (tv)->tv_sec * 1000000);   \
+    } while(0)
+
 #endif /* DEFINES */

features/performance/src/send_packets.c

@@ -2 +2 @@
 
 /*
- * Copyright (c) 2001-2007 Aaron Turner.
+ * Copyright (c) 2001-2008 Aaron Turner.
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 
+#define ADJUSTER_OFFSET 5 /* number of usec to compensate for packet timing */
 
 #include "config.h"
@@ -59 +60 @@
 
 #include "send_packets.h"
+#include "sleep.h"
 
 extern tcpreplay_opt_t options;
@@ -69 +71 @@
 #endif
 
-static void do_sleep(struct timeval *time, struct timeval *last, int len, int accurate, 
-    sendpacket_t *sp, COUNTER counter);
-static u_int32_t sleep_loop(struct timeval time);
-static u_char *get_next_packet(pcap_t *pcap, struct pcap_pkthdr *pkthdr, int file_idx, packet_cache_t **prev_packet);
+static void do_sleep(struct timeval *time, struct timeval *last, int len, 
+    int accurate, sendpacket_t *sp, COUNTER counter);
+static u_char *get_next_packet(pcap_t *pcap, struct pcap_pkthdr *pkthdr, 
+    int file_idx, packet_cache_t **prev_packet);
+static u_int32_t get_user_count(sendpacket_t *sp, COUNTER counter);
+
 
 /*
@@ -185 +189 @@
         }
 }
+
 
 /*
@@ -269 +274 @@
 }
 
+
 /*
  * determines based upon the cachedata which interface the given packet 
@@ -311 +317 @@
  */
 static void
-do_sleep(struct timeval *time, struct timeval *last, int len, int accurate, sendpacket_t *sp,
-    COUNTER counter)
+do_sleep(struct timeval *time, struct timeval *last, int len, int accurate, 
+    sendpacket_t *sp, COUNTER counter)
 {
     static struct timeval didsleep = { 0, 0 };
@@ -319 +325 @@
     static struct timeval totalsleep = { 0, 0 };
 #endif
-    struct timeval nap, now, delta;
+    static int adjuster_flipper = 0;
+#ifdef HAVE_TCPREPLAY
+    struct timeval adjuster = { 0, OPT_VALUE_SLEEP_ACCEL }
+#else
+    struct timeval adjuster = { 0, ADJUSTER_OFFSET };
+#endif
+    static struct timeval nap = { 0, 0 };
+    static u_int32_t double_up = 0;
+    struct timeval now, sleep_until, nap_this_time;
     struct timespec ignore, sleep;
     float n;
-    struct pollfd poller[1];        /* use poll to read from the keyboard */
-    char input[EBUF_SIZE];
-    static u_int32_t send = 0;      /* remember # of packets to send btw calls */
-    u_int32_t loop;
-    u_int64_t loop2;
-
+    static u_int32_t send = 0;      /* accellerator.   # of packets to send w/o sleeping */
+    u_int32_t ppusec; /* packets per usec */
+    
     /* just return if topspeed */
     if (options.speed.mode == SPEED_TOPSPEED)
         return;
 
+    /* acclerator time? */
+    if (send > 0) {
+        send --;
+        return;
+    }
+        
     dbgx(3, "Last time: " TIMEVAL_FORMAT, last->tv_sec, last->tv_usec);
 
@@ -343 +360 @@
     if (pkts_sent == 0 || ((options.speed.mode != SPEED_MBPSRATE) && (counter == 0))) {
         start = now;
-        timerclear(&delta);
+        timerclear(&sleep_until);
         timerclear(&didsleep);
     }
     else {
-        timersub(&now, &start, &delta);
+        timersub(&now, &start, &sleep_until);
     }
 
@@ -377 +394 @@
             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_usec = (n - nap.tv_sec)  * 1000000;
             dbgx(3, "packet size %d\t\tequals %f bps\t\tnap " TIMEVAL_FORMAT, len, n, 
                 nap.tv_sec, nap.tv_usec);
         }
         else {
+            /* don't sleep at all for the first packet */
             timerclear(&nap);
         }
@@ -387 +405 @@
 
     case SPEED_PACKETRATE:
-        /* run in packets/sec */
-        n = 1 / options.speed.speed;
-        nap.tv_sec = n;
-        n -= nap.tv_sec;
-        nap.tv_usec = n * 1000000;
+        /* only need to calculate this the first time */
+        if (! timerisset(&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);
+        }
         break;
 
@@ -397 +417 @@
         /* do we skip prompting for a key press? */
         if (send == 0) {
-            printf("**** Next packet #" COUNTER_SPEC " out %s.  How many packets do you wish to send? ",
-                counter, (sp == options.intf1 ? options.intf1_name : options.intf2_name));
-            fflush(NULL);
-            poller[0].fd = STDIN_FILENO;
-            poller[0].events = POLLIN | POLLPRI | POLLNVAL;
-            poller[0].revents = 0;
-
-            if (fcntl(0, F_SETFL, fcntl(0, F_GETFL) & ~O_NONBLOCK)) 
-                   errx(1, "Unable to clear non-blocking flag on stdin: %s", strerror(errno));
-
-            /* wait for the input */
-            if (poll(poller, 1, -1) < 0)
-                errx(1, "Error reading user input from stdin: %s", strerror(errno));
-            
-            /*
-             * read to the end of the line or EBUF_SIZE,
-             * Note, if people are stupid, and type in more text then EBUF_SIZE
-             * then the next fgets() will pull in that data, which will have poor 
-             * results.  fuck them.
-             */
-            if (fgets(input, sizeof(input), stdin) == NULL) {
-                errx(1, "Unable to process user input for fd %d: %s", fileno(stdin), strerror(errno));
-            } else if (strlen(input) > 1) {
-                send = strtoul(input, NULL, 0);
-            }
-
-            /* how many packets should we send? */
-            if (send == 0) {
-                dbg(1, "Input was less then 1 or non-numeric, assuming 1");
-
-                /* assume send only one packet */
-                send = 1;
-            }
-            
+            send = get_user_count(sp, counter);
         }
 
@@ -448 +435 @@
     }
 
-
-    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);
-
-        dbgx(4, "I will sleep " TIMEVAL_FORMAT, nap.tv_sec, nap.tv_usec);
-
-        if (timercmp(&didsleep, &delta, >)) {
-            timersub(&didsleep, &delta, &nap);
-
-            sleep.tv_sec = nap.tv_sec;
-            sleep.tv_nsec = nap.tv_usec * 1000; /* convert microsec to ns */
-            dbgx(4, "Sleeping " TIMEVAL_FORMAT, nap.tv_sec, nap.tv_usec);
+    /* 
+     * since we apply the adjuster to the sleep time, we can't modify nap
+     */
+    nap_this_time.tv_sec = nap.tv_sec;
+    nap_this_time.tv_usec = nap.tv_usec;
+
+    /* 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);
+        } else { 
+            dbg(1, "resetting nap_this_time to 0");
+            timerclear(&nap_this_time);
+        }
+    }
+    
+    /* don't sleep if nap = { 0, 0} */
+    if (!timerisset(&nap_this_time))
+        return;
+
+
+    /* 
+     * We have multiple methods of sleeping, pick the right one...
+     */
+    switch (accurate) {
+#ifdef HAVE_SELECT
+    case ACCURATE_SELECT:
+        select_sleep(nap_this_time);
+        break;
+#endif
+
+#ifdef HAVE_IOPERM
+    case ACCURATE_IOPORT:
+        ioport_sleep(nap_this_time);
+        break;
+#endif
+
+#ifdef HAVE_RDTSC        
+    case ACCURATE_RDTSC:
+        rdtsc_sleep(nap_this_time);
+        break;
+#endif
+
+#ifdef HAVE_ABSOLUTE_TIME
+    case ACCURATE_ABS_TIME:
+        absolute_time_sleep(nap_this_time);
+        break;
+#endif
+
+    case ACCURATE_GTOD:
+        gettimeofday_sleep(nap_this_time);
+        break;
+
+    case ACCURATE_NANOSLEEP:
+        nanosleep_sleep(nap_this_time);
+
+        break;
+        /*
+        timeradd(&didsleep, &nap_this_time, &didsleep);
+
+        dbgx(4, "I will sleep " TIMEVAL_FORMAT, nap_this_time.tv_sec, nap_this_time.tv_usec);
+
+        if (timercmp(&didsleep, &sleep_until, >)) {
+            timersub(&didsleep, &sleep_until, &nap_this_time);
+            
+            TIMEVAL_TO_TIMESPEC(&nap_this_time, &sleep);
+            dbgx(4, "Sleeping " TIMEVAL_FORMAT, nap_this_time.tv_sec, nap_this_time.tv_usec);
 #ifdef DEBUG
-            timeradd(&totalsleep, &nap, &totalsleep);
+            timeradd(&totalsleep, &nap_this_time, &totalsleep);
 #endif
             if (nanosleep(&sleep, &ignore) == -1) {
@@ -476 +510 @@
             }
         }
-    }
+        break;
+        */
+    default:
+        errx(1, "Unknown timer mode %d", accurate);
+    }
+
 #ifdef DEBUG
     dbgx(4, "Total sleep time: " TIMEVAL_FORMAT, totalsleep.tv_sec, totalsleep.tv_usec);
@@ -482 +521 @@
 }
 
-/*
- * this function will keep calling gettimeofday() until it returns
- * >= time.  This should be a lot more accurate then using nanosleep(),
- * but at the cost of being more CPU intensive.
+
+/* 
+ * Ask the user how many packets we should send
  */
-static u_int32_t 
-sleep_loop(struct timeval time)
+static u_int32_t
+get_user_count(sendpacket_t *sp, COUNTER counter) 
 {
-   struct timeval now;
-   u_int32_t loop = 0;
-   do {
-        gettimeofday(&now, NULL);
-        loop ++;
-   } while (now.tv_sec < time.tv_sec || now.tv_usec < time.tv_usec);
-   return loop;
+    struct pollfd poller[1];        /* use poll to read from the keyboard */
+    char input[EBUF_SIZE];
+    u_int32_t send = 0;
+    
+    printf("**** Next packet #" COUNTER_SPEC " out %s.  How many packets do you wish to send? ",
+        counter, (sp == options.intf1 ? options.intf1_name : options.intf2_name));
+    fflush(NULL);
+    poller[0].fd = STDIN_FILENO;
+    poller[0].events = POLLIN | POLLPRI | POLLNVAL;
+    poller[0].revents = 0;
+
+    if (fcntl(0, F_SETFL, fcntl(0, F_GETFL) & ~O_NONBLOCK)) 
+           errx(1, "Unable to clear non-blocking flag on stdin: %s", strerror(errno));
+
+    /* wait for the input */
+    if (poll(poller, 1, -1) < 0)
+        errx(1, "Error reading user input from stdin: %s", strerror(errno));
+    
+    /*
+     * read to the end of the line or EBUF_SIZE,
+     * Note, if people are stupid, and type in more text then EBUF_SIZE
+     * then the next fgets() will pull in that data, which will have poor 
+     * results.  fuck them.
+     */
+    if (fgets(input, sizeof(input), stdin) == NULL) {
+        errx(1, "Unable to process user input for fd %d: %s", fileno(stdin), strerror(errno));
+    } else if (strlen(input) > 1) {
+        send = strtoul(input, NULL, 0);
+    }
+
+    /* how many packets should we send? */
+    if (send == 0) {
+        dbg(1, "Input was less then 1 or non-numeric, assuming 1");
+
+        /* assume send only one packet */
+        send = 1;
+    }
+    
+    return send;
 }
 

features/performance/src/tcpreplay.c

@@ -2 +2 @@
 
 /*
- * Copyright (c) 2001-2007 Aaron Turner.
+ * Copyright (c) 2001-2008 Aaron Turner.
  * All rights reserved.
  *
@@ -64 +64 @@
 #endif
 
+#ifdef HAVE_ABSOLUTE_TIME
+#include <CoreServices/CoreServices.h>
+#endif
+
 void replay_file(int file_idx);
 void usage(void);
@@ -272 +276 @@
     char ebuf[SENDPACKET_ERRBUF_SIZE];
     int int1dlt, int2dlt;
+    float gtod = 14.5;
     
 #ifdef ENABLE_PCAP_FINDALLDEVS
@@ -326 +331 @@
         }
 
-    if (HAVE_OPT(ACCURATE))
-        options.accurate = 1;
-    
-    if (HAVE_OPT(ACCURATE2)) {
-        options.accurate = 2;
-        rdtsc_calibrate();
-    }
+    if (HAVE_OPT(TIMER)) {
+        if (strcmp(OPT_ARG(TIMER), "select") == 0) {
+#ifdef HAVE_SELECT
+            options.accurate = ACCURATE_SELECT;
+#else
+            err(1, "tcpreplay not compiled with select support");
+#endif
+        } else if (strcmp(OPT_ARG(TIMER), "rdtsc") == 0) {
+#ifdef HAVE_RDTSC
+            options.accurate = ACCURATE_RDTSC;
+#else
+            err(1, "tcpreplay not compiled with rdtsc support");
+#endif
+        } else if (strcmp(OPT_ARG(TIMER), "ioport") == 0) {
+#if defined HAVE_IOPERM && defined(__i386__)
+            options.accurate = ACCURATE_IOPORT;
+            ioport_sleep_init();
+#else
+            err(1, "tcpreplay not compiled with IO Port 0x80 support");
+#endif
+        } else if (strcmp(OPT_ARG(TIMER), "gtod") == 0) {
+            options.accurate = ACCURATE_GTOD;
+        } else if (strcmp(OPT_ARG(TIMER), "nano") == 0) {
+            options.accurate = ACCURATE_NANOSLEEP;
+        } else if (strcmp(OPT_ARG(TIMER), "abstime") == 0) {
+#ifdef HAVE_ABSOLUTE_TIME
+            options.accurate = ACCURATE_ABS_TIME;
+            if  (!MPLibraryIsLoaded()) {
+                err(1, "The MP library did not load.\n");
+            }            
+#else
+            err(1, "tcpreplay only supports absolute time on Apple OS X");
+#endif
+        } else {
+            errx(1, "Unsupported timer mode: %s", OPT_ARG(TIMER));
+        }
+    }
+
+#ifdef HAVE_RDTSC
+    if (HAVE_OPT(RDTSC_CLICKS)) {
+        rdtsc_calibrate(OPT_VALUE_RDTSC_CLICKS);
+    }
+#endif
 
     if (HAVE_OPT(PKTLEN))

features/performance/src/tcpreplay.h

@@ -2 +2 @@
 
 /*
- * Copyright (c) 2001-2007 Aaron Turner.
+ * Copyright (c) 2001-2008 Aaron Turner.
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <fcntl.h>
 
-struct packet_cache_s
-{
+struct packet_cache_s {
         struct pcap_pkthdr pkthdr;
         u_char *pktdata;
@@ -53 +52 @@
 typedef struct packet_cache_s packet_cache_t;
 
-typedef struct
-{
+typedef struct {
         int index;
         int cached;
@@ -68 +66 @@
     sendpacket_t *intf1;
     sendpacket_t *intf2;
-/* disable data dump mode
-    pcap_t *savepcap1;
-    pcap_t *savepcap2;
-    pcap_dumper_t *savedumper1;
-    pcap_dumper_t *savedumper2;
 
-    int datadump_mode;
-    int datadumpfile1;
-    int datadumpfile2;
-*/
     tcpr_speed_t speed;
     u_int32_t loop;
@@ -90 +79 @@
     int truncate;
     
-    /* use gettimeofday() instead of sleeping between packets */
+    /* accurate mode to use */
     int accurate;
+#define ACCURATE_NANOSLEEP  0
+#define ACCURATE_SELECT     1
+#define ACCURATE_RDTSC      2
+#define ACCURATE_IOPORT     3
+#define ACCURATE_GTOD       4
+#define ACCURATE_ABS_TIME   5
     
     char *files[MAX_FILES];
     COUNTER limit_send;
     
-    
-/* disable bridge mode
-    pcap_t *listen1;
-    pcap_t *listen2;
-    int sniff_snaplen;
-    int sniff_bridge;
-    int promisc;
-    int poll_timeout;
-*/
-
 #ifdef ENABLE_VERBOSE
     /* tcpdump verbose printing */

features/performance/src/tcpreplay_opts.def

@@ -3 +3 @@
 
 copyright = {
-    date        = "2000-2007";
+    date        = "2000-2008";
     owner       = "Aaron Turner";
     type        = "bsd";
     author      = <<- EOText
-Copyright 2000-2007 Aaron Turner
+Copyright 2000-2008 Aaron Turner
 
 For support please use the tcpreplay-users@lists.sourceforge.net mailing list.
@@ -79 +79 @@
 processor, disk and system bus will allow.
 
+Packet timing at high speeds is a black art and very OS/CPU dependent.  
+Your best bet is to use @var{--timing=rdtsc}, do your own testing and tweak the 
+@var{--rdtsc-clicks} option accordingly.  Newer CPU's and Linux kernels
+with HPET enabled may have good results with @var{--timing=gtod}.
+
 Replaying captured traffic may simulate odd or broken conditions on your
 network and cause problems.
@@ -114 +119 @@
 
 flag = {
-        name            = accurate;
-        value           = a;
+        name            = timer;
+        value           = T;
         max                     = 1;
-        flags-cant  = accurate2;
-        descrip         = "Enable more accurate packet timing";
+        arg-type    = string;
+        descrip         = "Select packet timing mode: select, ioport, rdtsc, gtod, nano, abstime";
         doc                     = <<- EOText
-Enables more accurate timing between packets at the cost of higher
-CPU utilization by using the gettimeofday() system call.  This method
-works better on some systems then others and may have rather non-granular
-resolution which makes it problematic for replaying at high rates of speed.
-EOText;
-};
-
-flag = {
-    name        = accurate2;
-    max         = 1;
-    flags-cant  = accurate;
-    descrip     = "Enable even more accurate packet timing";
-    doc         = <<- EOText
-Enables the "even more" accurate timing at the cost of higher CPU
-utilization by using the RDTSC counter available on newer CPU's.
-Only works on more recent x86, x86_64 and PPC
+Allows you to select the packet timing method to use:
+@enumerate
+@item nano
+- Use nanosleep() API [default]
+@item select
+- Use select() API
+@item ioport
+- Write to the i386 IO Port 0x80
+@item rdtsc  
+- Use the x86/x86_64/PPC RDTSC
+@item gtod   
+- Use a gettimeofday() loop
+@end enumerate
+
+EOText;
+};
+
+flag = {
+    name        = sleep-accel;
+    arg-type    = number;
+    arg-default = 5;
+    descrip     = "Reduce the amount of time to sleep by specified usec";
+    doc         = <<- EOText
+Reduce the amount of time we would normally sleep between two packets by the 
+specified number of usec.  This is primarily intended to compensate for the
+overhead in tcpreplay to process & send packets.  Default is 5usec which seems
+to work well on my 2.16Ghz MacBook Pro.
+EOText;
+};
+
+flag = {
+    ifdef       = HAVE_RDTSC;
+    name        = rdtsc-clicks;
+    max         = 1;
+    arg-type    = number;
+    arg-default = 0;
+    descrip     = "Specify the RDTSC clicks/usec";
+    doc         = <<- EOText
+Override the calculated number of RDTSC clicks/usec which is often the speed of the 
+CPU in Mhz.  Only useful if you specified @var{--timer=rdtsc}
 EOText;
 };
@@ -169 +198 @@
 };
 
-/* Cache files to internal memory */
-flag = {
-        name            = enable_file_cache;
-        value           = C;
-        flags-must      = loop;
-        descrip         = "Enable caching of packets to internal memory";
-        doc                     = <<- EOText
+/* Cache files to internal memory */ 
+flag = {
+  name        = enable_file_cache;
+  flags-must  = loop;
+  descrip     = "Enable caching of packets to internal memory";
+  doc         = <<- EOText
 Cache pcap file(s) the first time they are cached in RAM so that subsequent
 loops don't incurr any disk I/O latency in order to increase performance.  Make 
@@ -219 +247 @@
     doc         = "";
 };
-
+/*
 flag = {
         ifdef           = ENABLE_PCAP_FINDALLDEVS;
@@ -236 +264 @@
 EOFlag;
 };
-
+*/
 /*
  * Limits and loops: -l
@@ -254 +282 @@
 flag = {
     name        = pktlen;
-    value       = S;
     max         = 1;
     descrip     = "Override the snaplen and use the actual packet len";
@@ -292 +319 @@
     flags-cant  = oneatatime;
     flags-cant  = topspeed;
-    value       = m;
     arg-type    = string;
     max         = 1;
@@ -382 +408 @@
 #endif
     fprintf(stderr, "\n");
-    fprintf(stderr, "Copyright 2001-2007 by Aaron Turner <aturner at synfin dot net>\n");
+    fprintf(stderr, "Copyright 2001-2008 by Aaron Turner <aturner at synfin dot net>\n");
     fprintf(stderr, "Cache file supported: %s\n", CACHEVERSION);
 #ifdef HAVE_LIBNET