X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fhang_processes.sh;h=f0d2ccf7cac09bd2c129bc5cf1ee5c39f54fa832;hb=d865502a4136e05d6f89c7f53206239085591539;hp=7639adb51983b6fcb1e335d7419437f6a91b97f9;hpb=2c79bc5e0a658206c081ca87419447de56b3ef7d;p=lttng-ci.git

diff --git a/scripts/lttng-tools/hang_processes.sh b/scripts/lttng-tools/hang_processes.sh
index 7639adb..f0d2ccf 100755
--- a/scripts/lttng-tools/hang_processes.sh
+++ b/scripts/lttng-tools/hang_processes.sh
@@ -17,12 +17,15 @@
 
 PGREP=pgrep
 pids=""
-dependencies=""
 file_list=$(mktemp)
 ret=0
 
+# WORKSPACE is normally set by Jenkins.  Use the current directory otherwise,
+# like when testing this script manually.
+WORKSPACE=${WORKSPACE:-$PWD}
+
 lttng_processes="$("$PGREP" -l 'lttng|gen-ust-.+')" || true
-if [ ! -z "$lttng_processes" ]; then
+if [ -n "$lttng_processes" ]; then
 
     pids="$(cut -d ' ' -f 1 <<< "$lttng_processes" | tr '\n' ' ')"
     echo "The following LTTng processes were detected running on the system and will be aborted:"
@@ -30,38 +33,50 @@ if [ ! -z "$lttng_processes" ]; then
 
     # Stop the processes to make sure everything is frozen
     kill -SIGSTOP $pids
-
-    # Get dependencies for coredump analysis
-    # Use /proc/$PID/exe and ldd to get all shared libs necessary
-    array=(${pids})
-    # Add the /proc/ prefix using parameter expansion
-    array=("${array[@]/#/\/proc\/}")
-    # Add the /exe suffix using parameter expansion
-    array=("${array[@]/%/\/exe}")
-    dependencies=$(ldd "${array[@]}" | grep -v "not found")
-    dependencies=$(awk '/=>/{print$(NF-1)}' <<< "$dependencies" | sort | uniq)
-
     kill -SIGABRT $pids
     kill -SIGCONT $pids
     ret=1
 fi
 
-core_files=$(find "/tmp" -name "core\.[0-9]*" -type f 2>/dev/null) || true
-if [ ! -z "$core_files" ]; then
-    echo "$core_files" >> "$file_list"
-    echo "$dependencies" >> "$file_list"
+# Add the file passed as $1 to the list of files to collect.
+#
+# If that file is a symlink, follow it and collect the target, recursively.
+
+function collect_recursive
+{
+    file_to_collect=$1
 
-    # Make sure the coredump is finished using fuser
-    for core in $core_files; do
-        while fuser "$core"; do
-            sleep 1
-        done
+    if [ -f "$file_to_collect" ]; then
+        echo "$file_to_collect" >> "$file_list"
+
+        if [ -L "$file_to_collect" ]; then
+            collect_recursive "$(readlink "$file_to_collect")"
+        fi
+    fi
+}
+
+# For each core file...
+while read -r core_file; do
+    # Make sure the coredump is finished using fuser.
+    while fuser "$core_file"; do
+        sleep 1
     done
 
-    tar cfzh "${WORKSPACE}/build/core.tar.gz" -T "$file_list"
-    rm -rf $core_files
+    # Collect everything in the core file that looks like a reference to a
+    # shared lib.
+    strings "$core_file" | grep '^/.*\.so.*' | while read -r str; do
+        collect_recursive "$str"
+    done
+
+    rm -f "$core_file"
     ret=1
+done < <(find "/tmp" -maxdepth 1 -name "core\.[0-9]*" -type f 2>/dev/null)
+
+# If we recorded some files to collect, pack them up.
+if [ -s "$file_list" ]; then
+    mkdir -p "${WORKSPACE}/build"
+    tar cfzh "${WORKSPACE}/build/core.tar.gz" -T <(sort "$file_list" | uniq)
 fi
 
-rm -rf "$file_list"
+rm -f "$file_list"
 exit $ret