From cbb31c386ed24ee46ee79441380ecce76c100d94 Mon Sep 17 00:00:00 2001
From: ddehaas <ddehaas@git.zephyr-software.com>
Date: Fri, 17 Oct 2014 17:23:42 +0000
Subject: [PATCH] push deadlock update.
Former-commit-id: 05636d88dafb0e0d2fdc1d36171ee3b284183d82
---
tools/ps_analyze.sh | 15 +++++++++++++++
tools/ps_run.sh | 10 ++++++++++
2 files changed, 25 insertions(+)
diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh
index ca171a076..65a684e6b 100755
--- a/tools/ps_analyze.sh
+++ b/tools/ps_analyze.sh
@@ -904,10 +904,25 @@ perform_step zipr clone,fill_in_indtargs,fill_in_cfg,meds2pdb $ZIPR_HOME/bin/zip
is_step_on toctou
if [[ $? -eq 1 && -e $GRACE_HOME/ps_concurrency/toctou_tool/libtoctou_tool.so ]];
then
+ echo Performing step toctou ...
cp $GRACE_HOME/ps_concurrency/toctou_tool/libtoctou_tool.so libtoctou_tool.so
$PEASOUP_HOME/tools/update_env_var.sh DO_TOCTOU 1
+else
+ echo Skipping step toctou.
+fi
+
+# copy deadlock tool here if it exists
+is_step_on deadlock
+if [[ $? -eq 1 && -e $GRACE_HOME/ps_concurrency/deadlock/libdeadlock_tool.so ]];
+then
+ echo Performing step deadlock ...
+ cp $GRACE_HOME/ps_concurrency/deadlock/libdeadlock_tool.so libdeadlock_tool.so
+ $PEASOUP_HOME/tools/update_env_var.sh DO_DEADLOCK 1
+else
+ echo Skipping step deadlock
fi
+
#
# create a report for all of ps_analyze.
#
diff --git a/tools/ps_run.sh b/tools/ps_run.sh
index 2c396112e..614046ac4 100755
--- a/tools/ps_run.sh
+++ b/tools/ps_run.sh
@@ -57,6 +57,16 @@ if [ "$DO_TOCTOU" = "1" ]; then
APP_LD_PRELOAD="$datapath/libtoctou_tool.so:$APP_LD_PRELOAD"
fi
+DO_DEADLOCK=0
+if [ "$DO_DEADLOCK" = "1" ]; then
+ if [ -z $DEADLOCK_LOG ]; then
+ DEADLOCK_LOG=$datapath/deadlock.log
+ fi
+ command="$command DEADLOCK_LOG=$DEADLOCK_LOG
+ "
+ APP_LD_PRELOAD="$datapath/libdeadlock_tool.so:$APP_LD_PRELOAD"
+fi
+
# these are now defaulted nicely by strata for x86-32 and x86-64.
#STRATA_IBTC=1
--
GitLab