ART: Rename timeout_dumper to signal_dumper
To reflect the more broad applicability.
Bug: 134837513
Test: m test-art-host
Test: manual (change timeout)
Change-Id: I1206bd7b2be351ca2efae3564b677c28ea484766
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index ff9738d..a158a4b 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -557,7 +557,7 @@
$$(gtest_exe) \
$$(ART_GTEST_$(1)_HOST_DEPS) \
$(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_HOST_GTEST_$(file)_DEX)) \
- $(HOST_OUT_EXECUTABLES)/timeout_dumper
+ $(HOST_OUT_EXECUTABLES)/signal_dumper
ART_TEST_HOST_GTEST_DEPENDENCIES += $$(gtest_deps)
@@ -571,7 +571,7 @@
ifeq (,$(SANITIZE_HOST))
$$(gtest_output): $$(gtest_exe) $$(gtest_deps)
$(hide) ($$(call ART_TEST_SKIP,$$(NAME)) && \
- timeout --foreground -k 120s -s SIGRTMIN+2 2400s $(HOST_OUT_EXECUTABLES)/timeout_dumper \
+ timeout --foreground -k 120s -s SIGRTMIN+2 2400s $(HOST_OUT_EXECUTABLES)/signal_dumper \
$$< --gtest_output=xml:$$@ && \
$$(call ART_TEST_PASSED,$$(NAME))) || $$(call ART_TEST_FAILED,$$(NAME))
else
@@ -585,7 +585,7 @@
$$(gtest_output): $$(gtest_exe) $$(gtest_deps)
$(hide) ($$(call ART_TEST_SKIP,$$(NAME)) && set -o pipefail && \
ASAN_OPTIONS=detect_leaks=1 timeout --foreground -k 120s -s SIGRTMIN+2 3600s \
- $(HOST_OUT_EXECUTABLES)/timeout_dumper \
+ $(HOST_OUT_EXECUTABLES)/signal_dumper \
$$< --gtest_output=xml:$$@ 2>&1 | tee $$<.tmp.out >&2 && \
{ $$(call ART_TEST_PASSED,$$(NAME)) ; rm $$<.tmp.out ; }) || \
( grep -q AddressSanitizer $$<.tmp.out && export ANDROID_BUILD_TOP=`pwd` && \
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index ca06b11..0792a85 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -1013,7 +1013,7 @@
}
TEST_F(Dex2oatWatchdogTest, TestWatchdogTrigger) {
- // This test is frequently interrupted by timeout_dumper on host (x86);
+ // This test is frequently interrupted by signal_dumper on host (x86);
// disable it while we investigate (b/121352534).
TEST_DISABLED_FOR_X86();
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 1ab2205..fbbab20 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -55,7 +55,7 @@
ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \
$(ART_HOST_EXECUTABLES) \
$(HOST_OUT_EXECUTABLES)/hprof-conv \
- $(HOST_OUT_EXECUTABLES)/timeout_dumper \
+ $(HOST_OUT_EXECUTABLES)/signal_dumper \
$(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagent) \
$(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtiagentd) \
$(OUT_DIR)/$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_libtistress) \
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 6804091..ab7621a 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -56,7 +56,7 @@
STRIP_DEX="n"
SECONDARY_DEX=""
TIME_OUT="gdb" # "n" (disabled), "timeout" (use timeout), "gdb" (use gdb)
-TIMEOUT_DUMPER=timeout_dumper
+TIMEOUT_DUMPER=signal_dumper
# Value in seconds
if [ "$ART_USE_READ_BARRIER" != "false" ]; then
TIME_OUT_VALUE=2400 # 40 minutes.
@@ -755,8 +755,8 @@
echo "linux_bionic-x86 target doesn't seem to have been built!" >&2
exit 1
fi
- # Set timeout_dumper manually so it works even with apex's
- TIMEOUT_DUMPER=$OUT_DIR/soong/host/linux_bionic-x86/bin/timeout_dumper
+ # Set TIMEOUT_DUMPER manually so it works even with apex's
+ TIMEOUT_DUMPER=$OUT_DIR/soong/host/linux_bionic-x86/bin/signal_dumper
fi
# Prevent test from silently falling back to interpreter in no-prebuild mode. This happens
diff --git a/tools/build_linux_bionic_tests.sh b/tools/build_linux_bionic_tests.sh
index c532c90..36e3bb8 100755
--- a/tools/build_linux_bionic_tests.sh
+++ b/tools/build_linux_bionic_tests.sh
@@ -80,7 +80,7 @@
$soong_out/bin/profmand
$soong_out/bin/hiddenapi
$soong_out/bin/hprof-conv
- $soong_out/bin/timeout_dumper
+ $soong_out/bin/signal_dumper
$(find $host_out/apex -type f | sed "s:$host_out:$soong_out:g")
$(find $host_out/lib64 -type f | sed "s:$host_out:$soong_out:g")
$(find $host_out/nativetest64 -type f | sed "s:$host_out:$soong_out:g"))
diff --git a/tools/timeout_dumper/Android.bp b/tools/signal_dumper/Android.bp
similarity index 94%
rename from tools/timeout_dumper/Android.bp
rename to tools/signal_dumper/Android.bp
index bb813d4..f9d0310 100644
--- a/tools/timeout_dumper/Android.bp
+++ b/tools/signal_dumper/Android.bp
@@ -15,7 +15,7 @@
//
art_cc_binary {
- name: "timeout_dumper",
+ name: "signal_dumper",
host_supported: true,
target: {
@@ -32,7 +32,7 @@
defaults: ["art_defaults"],
- srcs: ["timeout_dumper.cc"],
+ srcs: ["signal_dumper.cc"],
shared_libs: [
"libbacktrace",
diff --git a/tools/timeout_dumper/timeout_dumper.cc b/tools/signal_dumper/signal_dumper.cc
similarity index 100%
rename from tools/timeout_dumper/timeout_dumper.cc
rename to tools/signal_dumper/signal_dumper.cc