Print the signal catcher tid when we fail to kill it.
Bug: 70426310
Test: test.py
Change-Id: I5b7ffe9f7b93c8d0d4af3b51e1492007714be9a0
diff --git a/runtime/signal_catcher.cc b/runtime/signal_catcher.cc
index ba1b4ef..7973cc9 100644
--- a/runtime/signal_catcher.cc
+++ b/runtime/signal_catcher.cc
@@ -90,8 +90,12 @@
// Since we know the thread is just sitting around waiting for signals
// to arrive, send it one.
SetHaltFlag(true);
- CHECK_PTHREAD_CALL(pthread_kill, (pthread_, SIGQUIT), "signal catcher shutdown");
- CHECK_PTHREAD_CALL(pthread_join, (pthread_, nullptr), "signal catcher shutdown");
+ CHECK_PTHREAD_CALL(pthread_kill,
+ (pthread_, SIGQUIT),
+ android::base::StringPrintf("signal catcher shutdown: %lu", pthread_));
+ CHECK_PTHREAD_CALL(pthread_join,
+ (pthread_, nullptr),
+ android::base::StringPrintf("signal catcher shutdown: %lu", pthread_));
}
void SignalCatcher::SetHaltFlag(bool new_value) {