diff options
author | Elliott Hughes <enh@google.com> | 2023-08-11 00:05:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-11 00:05:04 +0000 |
commit | 4e7c6460d73c00031288165da053692764abbeb1 (patch) | |
tree | f98d11d6a158167e19fc9141c79d877280a616a6 /src/processor/minidump_stackwalk.cc | |
parent | 8d0176459cfc11e28e9427a7eadcf7a42f654f62 (diff) | |
parent | c3c25b3748e23f22d7eb5c0cf6ed671259a25aa0 (diff) | |
download | google-breakpad-4e7c6460d73c00031288165da053692764abbeb1.tar.gz |
Upgrade google-breakpad to v2023.01.27 am: 332a4371ed am: c3c25b3748
Original change: https://android-review.googlesource.com/c/platform/external/google-breakpad/+/2704174
Change-Id: Id4cbd71ede58b445f8d99dbad585207ef2b97bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/processor/minidump_stackwalk.cc')
-rw-r--r-- | src/processor/minidump_stackwalk.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc index acf80972..cee9a734 100644 --- a/src/processor/minidump_stackwalk.cc +++ b/src/processor/minidump_stackwalk.cc @@ -1,5 +1,4 @@ -// Copyright (c) 2010 Google Inc. -// All rights reserved. +// Copyright 2010 Google LLC // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -11,7 +10,7 @@ // copyright notice, this list of conditions and the following disclaimer // in the documentation and/or other materials provided with the // distribution. -// * Neither the name of Google Inc. nor the names of its +// * Neither the name of Google LLC nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. // @@ -57,6 +56,7 @@ namespace { struct Options { bool machine_readable; bool output_stack_contents; + bool output_requesting_thread_only; string minidump_file; std::vector<string> symbol_paths; @@ -111,7 +111,8 @@ bool PrintMinidumpProcess(const Options& options) { if (options.machine_readable) { PrintProcessStateMachineReadable(process_state); } else { - PrintProcessState(process_state, options.output_stack_contents, &resolver); + PrintProcessState(process_state, options.output_stack_contents, + options.output_requesting_thread_only, &resolver); } return true; @@ -128,7 +129,8 @@ static void Usage(int argc, const char *argv[], bool error) { "Options:\n" "\n" " -m Output in machine-readable format\n" - " -s Output stack contents\n", + " -s Output stack contents\n" + " -c Output thread that causes crash or dump only\n", google_breakpad::BaseName(argv[0]).c_str()); } @@ -137,14 +139,18 @@ static void SetupOptions(int argc, const char *argv[], Options* options) { options->machine_readable = false; options->output_stack_contents = false; + options->output_requesting_thread_only = false; - while ((ch = getopt(argc, (char * const *)argv, "hms")) != -1) { + while ((ch = getopt(argc, (char * const*)argv, "chms")) != -1) { switch (ch) { case 'h': Usage(argc, argv, false); exit(0); break; + case 'c': + options->output_requesting_thread_only = true; + break; case 'm': options->machine_readable = true; break; |