From: P2P-Next User <p2p@p2p-next-04-201.grid.pub.ro>
Date: Fri, 26 Nov 2010 07:55:29 +0000 (+0200)
Subject: swift integration update
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=3db2a63aa8fc196371cc8ee9553c7d211ec329f9;p=p2p-testing-infrastructure.git

swift integration update
---

diff --git a/ControlScripts/hook_monitor_pid.sh b/ControlScripts/hook_monitor_pid.sh
index b336789..7bff3c6 100755
--- a/ControlScripts/hook_monitor_pid.sh
+++ b/ControlScripts/hook_monitor_pid.sh
@@ -18,7 +18,6 @@ pid=$1
 kill -0 $pid > /dev/null 2>&1
 if test $? -ne 0; then
 	echo -e "PID $pid does not exists.\nUsage: $0 <pid>" 1>&2
-	ps -ef
 	exit 1
 fi
 
diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index b4b095e..24f9355 100755
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -270,6 +270,16 @@ scenario_parse() {
 			exit 1
 		fi
 	fi
+	if ls -lR $SCENARIO_RESULTS_FOLDER | grep "\.mon" &> /dev/null; then
+	 	# There are .mon log files
+		echo " *** Parsing peer resource monitoring files"
+		rm -rf ${SCENARIO_RESULTS_FOLDER}/mon
+		mkdir ${SCENARIO_RESULTS_FOLDER}/mon
+		if ! ./parse_mon_log.sh $SCENARIO_RESULTS_FOLDER; then
+			echo "Error parsing mon files in $SCENARIO_RESULTS_FOLDER"
+			exit 1
+		fi
+	fi
 	echo "---------------------- _scenario_parse" >> $ERR_LOG
 }
 
diff --git a/Utils/get_time_dl_speed_avg_for_swarm b/Utils/get_time_dl_speed_avg_for_swarm
index 20f6beb..8bee893 100755
--- a/Utils/get_time_dl_speed_avg_for_swarm
+++ b/Utils/get_time_dl_speed_avg_for_swarm
@@ -13,7 +13,7 @@ fi
 rm -f temp1987
 touch temp1987
 
-for i in $(find $path -mindepth 1 -mindepth 1 -name '*.log.data'); do
+for i in $(find $path -mindepth 1 -maxdepth 1 -name '*.log.data'); do
 	(./get_time_dl_speed_avg < "$i") >> temp1987
 done