commit 3923703e7587c652dd65dc25b851df4343de331d
author Narayan Kamath <narayan@google.com> Wed Apr 26 11:31:09 2017 +0100
committer Narayan Kamath <narayan@google.com> Thu Apr 27 14:15:27 2017 +0100
tree 317b026362e4ab4a7c59940b1587689ea2f8df5a
parent 4dc06e2ef900132d8395539842c35533da8b912a

SignalCatcher: Minor tweaks to log message.

We were logging the wrong field. Also fix the exemplar path name
in the documentation.

Test: make, manual
Bug: 32064548
Change-Id: Ic4670087dc1cfbe874349f064634682d93537ceb

runtime/signal_catcher.cc

diff --git a/runtime/signal_catcher.cc b/runtime/signal_catcher.cc
index 3826433..faea7b3 100644
--- a/runtime/signal_catcher.cc
+++ b/runtime/signal_catcher.cc
@@ -115,7 +115,7 @@
 
     for (uint32_t i = 0; i < kMaxRetries; ++i) {
         std::srand(NanoTime());
-        // Sample output for PID 1234 : /data/anr-pid1234-cafeffee.txt
+        // Sample output for PID 1234 : /data/anr/anr-pid1234-cafeffee.txt
         const std::string file_name = android::base::StringPrintf(
             "%s/anr-pid%" PRId32 "-%08" PRIx32 ".txt",
             stack_trace_dir_.c_str(),
@@ -135,19 +135,19 @@
 }
 
 void SignalCatcher::Output(const std::string& s) {
-  const std::string stack_trace_file = GetStackTraceFileName();
-  if (stack_trace_file.empty()) {
+  const std::string output_file = GetStackTraceFileName();
+  if (output_file.empty()) {
     LOG(INFO) << s;
     return;
   }
 
   ScopedThreadStateChange tsc(Thread::Current(), kWaitingForSignalCatcherOutput);
-  int fd = open(stack_trace_file.c_str(), O_APPEND | O_CREAT | O_WRONLY, 0666);
+  int fd = open(output_file.c_str(), O_APPEND | O_CREAT | O_WRONLY, 0666);
   if (fd == -1) {
-    PLOG(ERROR) << "Unable to open stack trace file '" << stack_trace_file_ << "'";
+    PLOG(ERROR) << "Unable to open stack trace file '" << output_file << "'";
     return;
   }
-  std::unique_ptr<File> file(new File(fd, stack_trace_file, true));
+  std::unique_ptr<File> file(new File(fd, output_file, true));
   bool success = file->WriteFully(s.data(), s.size());
   if (success) {
     success = file->FlushCloseOrErase() == 0;
@@ -155,9 +155,9 @@
     file->Erase();
   }
   if (success) {
-    LOG(INFO) << "Wrote stack traces to '" << stack_trace_file << "'";
+    LOG(INFO) << "Wrote stack traces to '" << output_file << "'";
   } else {
-    PLOG(ERROR) << "Failed to write stack traces to '" << stack_trace_file << "'";
+    PLOG(ERROR) << "Failed to write stack traces to '" << output_file << "'";
   }
 }