* rename small->avg

diff --git a/org.glite.lb.logger/src/perftest_il.sh b/org.glite.lb.logger/src/perftest_il.sh
index 9879951..4c3de48 100644 (file)
--- a/org.glite.lb.logger/src/perftest_il.sh
+++ b/org.glite.lb.logger/src/perftest_il.sh
@@ -24,7 +24,7 @@ echo "-------------------------------------------"
 echo "a) events sent only by IPC"
 echo "b) events stored to files and sent by IPC"
 echo ""
-echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf-empty
@@ -52,7 +52,7 @@ rm -f /tmp/perftest.log.*
 # echo "d) lazy bkserver connection close"
 # echo "e) normal operation"
 # echo ""
-# echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+# echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 # PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf
 # LOGJOBS_ARGS="--nofile $COMM_ARGS"
@@ -91,7 +91,7 @@ echo "x) disabled sync and recovery"
 echo "d) lazy bkserver connection close"
 echo "e) normal operation"
 echo ""
-echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf
 LOGJOBS_ARGS=" $COMM_ARGS"
@@ -140,7 +140,7 @@ rm -f /tmp/perftest.log.*
 # echo "d) lazy bkserver connection close"
 # echo "e) normal operation"
 # echo ""
-# echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+# echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 # PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd
 # CONSUMER_ARGS="-d --perf-sink=1"
@@ -187,7 +187,7 @@ echo "x) disabled sync and recovery"
 echo "d) lazy bkserver connection close"
 echo "e) normal operation"
 echo ""
-echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-bkserverd
 CONSUMER_ARGS="-d --perf-sink=1"

diff --git a/org.glite.lb.logger/src/perftest_ll.sh b/org.glite.lb.logger/src/perftest_ll.sh
index 35bbca8..c9ef32b 100644 (file)
--- a/org.glite.lb.logger/src/perftest_ll.sh
+++ b/org.glite.lb.logger/src/perftest_ll.sh
@@ -29,7 +29,7 @@ d) glite-lb-logd-perf
 
 Number of jobs: $numjobs
 "
-echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 # a)
 echo -n "a)"
@@ -52,20 +52,23 @@ print_result
 # c)
 echo -n "c)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-logd-perf
-CONSUMER_ARGS="-d -v --noIPC"
+CONSUMER_ARGS="-d -v --noIPC --file-prefix=/tmp/perftest.log"
 init_result
 run_test ll $numjobs
 print_result_ev
 print_result
 
+rm -f /tmp/perftest.log.*
+
 # d)
 echo -n "d)"
 PERFTEST_CONSUMER=$STAGEDIR/bin/glite-lb-interlogd-perf-empty
-CONSUMER_ARGS="-d -v"
+CONSUMER_ARGS="-d -v  -s /tmp/perftest.sock --file-prefix=/tmp/perftest.log"
 PERFTEST_COMPONENT=$STAGEDIR/bin/glite-lb-logd-perf
-COMPONENT_ARGS="-d"
+COMPONENT_ARGS="-d -s /tmp/perftest.sock"
 init_result
 run_test ll $numjobs
 print_result_ev
 print_result
 
+rm -f /tmp/perftest.log.*

diff --git a/org.glite.lb.proxy/src/perftest_proxy.sh b/org.glite.lb.proxy/src/perftest_proxy.sh
index e514dea..dbe0664 100755 (executable)
--- a/org.glite.lb.proxy/src/perftest_proxy.sh
+++ b/org.glite.lb.proxy/src/perftest_proxy.sh
@@ -39,7 +39,7 @@ echo "3) after storing into db, before computing state"
 echo "4) after computing state, before sending to IL"
 echo "5) by IL"
 echo ""
-echo -e "\tsmall_job \t big_job \t small_dag \t big_dag"
+echo -e "\tavg_job \t big_job \t avg_dag \t big_dag"
 
 
 LOGJOBS_ARGS="-s /tmp/proxy.perf"
@@ -76,4 +76,4 @@ PID=$!
 purge_proxy `$LOGJOBS -n $numjobs`
 sleep 2
 shutdown $PID
-rm -f /tmp/perftest.log.*
\ No newline at end of file
+rm -f /tmp/perftest.log.*