X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fhang_processes.sh;h=3e52a607a3ddb6a3396ff17d680abff3be9d8fba;hb=ee4b760abf60e1d139cab33d5d5f0f4403723b8e;hp=09672182b06f7012fff598c180a9b13b7103d205;hpb=d4069651b64d3446f6d3e8c11b8583204a7508f4;p=lttng-ci.git

diff --git a/scripts/lttng-tools/hang_processes.sh b/scripts/lttng-tools/hang_processes.sh
index 0967218..3e52a60 100755
--- a/scripts/lttng-tools/hang_processes.sh
+++ b/scripts/lttng-tools/hang_processes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
 # Copyright (C) 2018 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
@@ -15,9 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 PGREP=pgrep
 pids=""
-dependencies=""
 file_list=$(mktemp)
 ret=0
 
@@ -34,39 +35,55 @@ if [ -n "$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 [ -n "$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
+
+    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
+}
 
-    # Make sure the coredump is finished using fuser
-    for core in $core_files; do
-        while fuser "$core"; do
-            sleep 1
-        done
+# 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
 
-    mkdir -p "${WORKSPACE}/build"
-    tar cfzh "${WORKSPACE}/build/core.tar.gz" -T "$file_list"
-    rm -f "$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
+
+    echo "$core_file" >> $file_list
     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"
+# Remove core file
+while read -r core_file; do
+	rm -rf "$core_file"
+done < <(find "/tmp" -maxdepth 1 -name "core\.[0-9]*" -type f 2>/dev/null)
+
+rm -f "$file_list"
 exit $ret