[svn] commit: r2871 - in /experiments/stephen-receptionist: Makefile.am client/logger.cc scripts/client-contractor.sh scripts/client-server.sh scripts/client-worker.sh scripts/common.sh scripts/run_memory_test.sh scripts/run_test.sh

[BIND 10 source code commits]

Author: stephen
Date: Wed Sep  8 18:28:10 2010
New Revision: 2871

Log:
Correct bug in interval calculation

Added:
    experiments/stephen-receptionist/scripts/run_memory_test.sh
      - copied, changed from r2858, experiments/stephen-receptionist/scripts/run_test.sh
Removed:
    experiments/stephen-receptionist/scripts/run_test.sh
Modified:
    experiments/stephen-receptionist/Makefile.am
    experiments/stephen-receptionist/client/logger.cc
    experiments/stephen-receptionist/scripts/client-contractor.sh
    experiments/stephen-receptionist/scripts/client-server.sh
    experiments/stephen-receptionist/scripts/client-worker.sh
    experiments/stephen-receptionist/scripts/common.sh

Modified: experiments/stephen-receptionist/Makefile.am
==============================================================================
--- experiments/stephen-receptionist/Makefile.am (original)
+++ experiments/stephen-receptionist/Makefile.am Wed Sep  8 18:28:10 2010
@@ -9,4 +9,4 @@
 dist_bin_SCRIPTS += scripts/client-worker.sh
 dist_bin_SCRIPTS += scripts/common.sh
 dist_bin_SCRIPTS += scripts/run_all.sh
-dist_bin_SCRIPTS += scripts/run_test.sh
+dist_bin_SCRIPTS += scripts/run_memory_test.sh

Modified: experiments/stephen-receptionist/client/logger.cc
==============================================================================
--- experiments/stephen-receptionist/client/logger.cc (original)
+++ experiments/stephen-receptionist/client/logger.cc Wed Sep  8 18:28:10 2010
@@ -62,8 +62,7 @@
     // if "lost" is greater than zero, more that count_ packets will have been
     // sent to get to this figure.)
     boost::posix_time::time_duration interval = tend_ - tstart_;
-    double dinterval = interval.total_seconds() +
-        (interval.total_microseconds() / 1.0e6);
+    double dinterval = interval.total_microseconds() / 1.0e6;
 
     output << "," << dinterval << "," << (dinterval / count_) << "\n";
 

Modified: experiments/stephen-receptionist/scripts/client-contractor.sh
==============================================================================
--- experiments/stephen-receptionist/scripts/client-contractor.sh (original)
+++ experiments/stephen-receptionist/scripts/client-contractor.sh Wed Sep  8 18:28:10 2010
@@ -31,4 +31,8 @@
     exit 1;
 fi
 
-$progdir/common.sh $* intermediary contractor
+if [ "$1" = "-a" ]; then
+    $progdir/common.sh -a 0 $2 intermediary contractor
+else
+    $progdir/common.sh 0 $1 intermediary contractor
+fi

Modified: experiments/stephen-receptionist/scripts/client-server.sh
==============================================================================
--- experiments/stephen-receptionist/scripts/client-server.sh (original)
+++ experiments/stephen-receptionist/scripts/client-server.sh Wed Sep  8 18:28:10 2010
@@ -30,4 +30,8 @@
     exit 1;
 fi
 
-$progdir/common.sh $* server
+if [ "$1" = "-a" ]; then
+    $progdir/common.sh -a 0 $2 server
+else
+    $progdir/common.sh 0 $1 server
+fi

Modified: experiments/stephen-receptionist/scripts/client-worker.sh
==============================================================================
--- experiments/stephen-receptionist/scripts/client-worker.sh (original)
+++ experiments/stephen-receptionist/scripts/client-worker.sh Wed Sep  8 18:28:10 2010
@@ -30,4 +30,8 @@
     exit 1;
 fi
 
-$progdir/common.sh $* receptionist worker
+if [ "$1" = "-a" ]; then
+    $progdir/common.sh -a 0 $2 receptionist worker
+else
+    $progdir/common.sh 0 $1 receptionist worker
+fi

Modified: experiments/stephen-receptionist/scripts/common.sh
==============================================================================
--- experiments/stephen-receptionist/scripts/common.sh (original)
+++ experiments/stephen-receptionist/scripts/common.sh Wed Sep  8 18:28:10 2010
@@ -28,7 +28,7 @@
 
 progdir=`dirname $0`
 
-if [ $# -lt 2 -o $# -gt 4 ]; then
+if [ $# -lt 2 -o $# -gt 5 ]; then
     echo "Usage: common [-a] memsize logfile first-program [second-program]"
     exit 1;
 fi
@@ -51,13 +51,20 @@
     second=$4
 fi
 
+echo "Running common.sh"
+echo "Memsize = $memsize"
+echo "Logfile = $logfile"
+echo "First   = $first"
+echo "Second  = $second"
+echo ""
+
 for burst in 1 2 4 8 16 32 64 128 256
 do
     echo "Setting burst to $burst"
 
     # Start the server programs.  First make sure that the message
     # queues has been deleted before any run starts.
-    $progdir/queue_clear
+    $progdir/queue_clear 32
 
     # Start the first of the server program(s) (the client or intermediary
     # if two programs are specified, or the server if just one is being used)
@@ -73,7 +80,7 @@
     # Allow server programs to start.
     sleep 3
 
-    for rpt in {1..64}
+    for rpt in {1..32}
     do
         cmd="$progdir/client --count 4096 --burst $burst --size 256 --logfile $logfile $async_flags"
         echo "$rpt) $cmd"