maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 36
revision-id: hakan@xxxxxxxxxxxx-20100412232832-2ylrw3ldo1cvdc5p
parent: hakan@xxxxxxxxxxxx-20100412135900-1v7jsdxf3ahxvwrd
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Tue 2010-04-13 01:28:32 +0200
message:
  Re-arranged killing of monitoring processes.

=== modified file 'sysbench/run-sysbench-myisam.sh'
--- a/sysbench/run-sysbench-myisam.sh	2010-04-09 19:13:59 +0000
+++ b/sysbench/run-sysbench-myisam.sh	2010-04-12 23:28:32 +0000
@@ -380,7 +380,7 @@
             SERVER_STATUS_PID=$!
 
             if [ $PROFILE_IT -eq 1 ]; then
-                $SUDO opcontrol --setup --separate=lib,kernel,thread --no-vmlinux
+                $SUDO opcontrol --setup --no-vmlinux --separate=lib,kernel,thread
                 $SUDO opcontrol --start-daemon
                 if [ $? != 0 ]; then
                     echo "[WARNING]: Could not start oprofile daemonl."
@@ -410,15 +410,15 @@
             
             sync; sync; sync
             sleep 1
-            
-            kill -9 $SERVER_STATUS_PID
-            kill -9 $MPSTAT_PID
-            kill -9 $IOSTAT_PID
-            
+
             grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt
 
             echo 'SELECT * FROM INFORMATION_SCHEMA.KEY_CACHES' | $MYSQL $MYSQL_OPTIONS > ${THIS_RESULT_DIR}/key_cache_stats${k}.txt
 
+            kill -9 $IOSTAT_PID
+            kill -9 $MPSTAT_PID
+            kill -9 $SERVER_STATUS_PID
+
             k=$(($k + 1))
         done
         

=== modified file 'sysbench/run-sysbench.sh'
--- a/sysbench/run-sysbench.sh	2010-04-12 13:59:00 +0000
+++ b/sysbench/run-sysbench.sh	2010-04-12 23:28:32 +0000
@@ -371,7 +371,7 @@
             SERVER_STATUS_PID=$!
             
             if [ $PROFILE_IT -eq 1 ]; then
-                $SUDO opcontrol --setup --separate=lib,kernel,thread --no-vmlinux
+                $SUDO opcontrol --setup --no-vmlinux --separate=lib,kernel,thread
                 $SUDO opcontrol --start-daemon
                 if [ $? != 0 ]; then
                     echo "[WARNING]: Could not start oprofile daemonl."
@@ -402,11 +402,11 @@
             sync; sync; sync
             sleep 1
 
+            grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt
+
+            kill -9 $IOSTAT_PID
+            kill -9 $MPSTAT_PID
             kill -9 $SERVER_STATUS_PID
-            kill -9 $MPSTAT_PID
-            kill -9 $IOSTAT_PID
-
-            grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt
 
             k=$(($k + 1))
         done