From 9c31bb44a1b1fcdd4a469a116041ae9bff654722 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 20 Nov 2008 10:32:42 -0800
Subject: [PATCH] vstart: launch valgrind with --valgrind

just for cosd atm
---
 src/crun      | 21 ++++++++++++++++-----
 src/vstart.sh | 25 +++++++++++++++----------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/crun b/src/crun
index 7b3c38a86b5fd..5dae1cf296f45 100755
--- a/src/crun
+++ b/src/crun
@@ -1,13 +1,24 @@
 #!/bin/sh
 
 daemon=0
+valgrind=""
 
 # explicit -n/--norestart?
-case $1 in
+while [ $# -ge 1 ]; do
+    case $1 in
 	-n | --norestart )
-	daemon=1
-	shift
-esac
+	    daemon=1
+	    shift
+	    ;;
+	--valgrind )
+	    valgrind="valgrind"
+	    daemon=1
+	    shift
+	    ;;
+	* )
+	    break
+    esac
+done
 
 orig_args=$*
 
@@ -21,6 +32,6 @@ while [ $# -ge 1 ]; do
 done
 
 while [ true ]; do
-	$orig_args
+	$valgrind $orig_args
 	[ $daemon -eq 1 ] && exit
 done
diff --git a/src/vstart.sh b/src/vstart.sh
index 67f508d45a74d..732726216d160 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -7,17 +7,22 @@
 let new=0
 let debug=0
 norestart=""
+valgrind=""
 
 while [ $# -ge 1 ]; do
-        case $1 in
-                -d | --debug )
-                debug=1
-		;;
-                --new | -n )
-                new=1
-		;;
-		--norestart )
-		norestart="--norestart"
+    case $1 in
+        -d | --debug )
+            debug=1
+	    ;;
+        --new | -n )
+            new=1
+	    ;;
+	--norestart )
+	    norestart="--norestart"
+	    ;;
+	--valgrind )
+	    valgrind="--valgrind"
+	    ;;
         esac
         shift
 done
@@ -106,7 +111,7 @@ do
 	$SUDO $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
     fi
     echo start osd$osd
-    $CEPH_BIN/crun $norestart $SUDO $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
+    $CEPH_BIN/crun $norestart $valgrind $SUDO $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
 # echo valgrind --leak-check=full --show-reachable=yes $CEPH_BIN/cosd dev/osd$osd --debug_ms 1 --debug_osd 20 --debug_filestore 10 --debug_ebofs 20 #1>out/o$osd #& #--debug_osd 40
 done
 
-- 
2.39.5