crash-reporter: Add diagnostics to help diagnose failures in the wild

crash_reporter.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "crash-reporter/kernel_collector.h"
 #include "crash-reporter/system_logging.h"
 #include "crash-reporter/unclean_shutdown_collector.h"
 #include "crash-reporter/user_collector.h"
 #include "gflags/gflags.h"
 #include "metrics/metrics_library.h"
 
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 DEFINE_bool(init, false, "Initialize crash logging");
 DEFINE_bool(clean_shutdown, false, "Signal clean shutdown");
 DEFINE_string(generate_kernel_signature, "",
               "Generate signature from given kcrash file");
 DEFINE_bool(crash_test, false, "Crash test");
-DEFINE_int32(pid, -1, "Crashing PID");
-DEFINE_int32(signal, -1, "Signal causing crash");
+DEFINE_string(user, "", "User crash info (pid:signal:exec_name)");
 DEFINE_bool(unclean_check, true, "Check for unclean shutdown");
 #pragma GCC diagnostic error "-Wstrict-aliasing"
 
 static const char kCrashCounterHistogram[] = "Logging.CrashCounter";
 static const char kUserCrashSignal[] =
     "org.chromium.CrashReporter.UserCrash";
 static const char kUncleanShutdownFile[] =
     "/var/lib/crash_reporter/pending_clean_shutdown";
 
 
@@ skipping 88 matching lines @@
 
   // Must enable the unclean shutdown collector *after* collecting.
   unclean_shutdown_collector->Enable();
   user_collector->Enable();
 
   return 0;
 }
 
 static int HandleUserCrash(UserCollector *user_collector) {
   // Handle a specific user space crash.
-  CHECK(FLAGS_signal != -1) << "Signal must be set";
-  CHECK(FLAGS_pid != -1) << "PID must be set";
+  CHECK(!FLAGS_user.empty()) << "--user= must be set";
 
   // Make it possible to test what happens when we crash while
   // handling a crash.
   if (FLAGS_crash_test) {
     *(char *)0 = 0;
     return 0;
   }
 
   // Handle the crash, get the name of the process from procfs.
-  if (!user_collector->HandleCrash(FLAGS_signal, FLAGS_pid, NULL)) {
+  if (!user_collector->HandleCrash(FLAGS_user, NULL)) {
     return 1;
   }
   return 0;
 }
 
 // Interactive/diagnostics mode for generating kernel crash signatures.
 static int GenerateKernelSignature(KernelCollector *kernel_collector) {
   std::string kcrash_contents;
   std::string signature;
   if (!file_util::ReadFileToString(FilePath(FLAGS_generate_kernel_signature),
@@ skipping 49 matching lines @@
     user_collector.Disable();
     return 0;
   }
 
   if (!FLAGS_generate_kernel_signature.empty()) {
     return GenerateKernelSignature(&kernel_collector);
   }
 
   return HandleUserCrash(&user_collector);
 }