Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/glog
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 47451c1c0289
Choose a base ref
...
head repository: mockingbirdnest/glog
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b266887e5ef0
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on May 26, 2019

  1. Merge.

    pleroy committed May 26, 2019
    Copy the full SHA
    b266887 View commit details
Showing with 3 additions and 9 deletions.
  1. +1 −1 src/logging.cc
  2. +1 −1 src/raw_logging.cc
  3. +0 −6 src/stacktrace_win-inl.h
  4. +1 −1 src/utilities.cc
2 changes: 1 addition & 1 deletion src/logging.cc
Original file line number Diff line number Diff line change
@@ -1495,7 +1495,7 @@ void LogMessage::RecordCrashReason(
fatal_msg_data_exclusive.num_prefix_chars_;
#ifdef HAVE_STACKTRACE
// Retrieve the stack trace, omitting the logging frames that got us here.
reason->depth = GetStackTrace(reason->stack, ARRAYSIZE(reason->stack), 4);
reason->depth = GetStackTrace(reason->stack, ARRAYSIZE(reason->stack), 0);
#else
reason->depth = 0;
#endif
2 changes: 1 addition & 1 deletion src/raw_logging.cc
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ void RawLog__(LogSeverity severity, const char* file, int line,
crash_reason.message = crash_buf;
#ifdef HAVE_STACKTRACE
crash_reason.depth =
GetStackTrace(crash_reason.stack, ARRAYSIZE(crash_reason.stack), 1);
GetStackTrace(crash_reason.stack, ARRAYSIZE(crash_reason.stack), 0);
#else
crash_reason.depth = 0;
#endif
6 changes: 0 additions & 6 deletions src/stacktrace_win-inl.h
Original file line number Diff line number Diff line change
@@ -6,12 +6,6 @@ _START_GOOGLE_NAMESPACE_

// If you change this function, also change GetStackFrames below.
int GetStackTrace(void** result, int max_depth, int skip_count) {
// NOTE(phl): This was tuned for the static library with VS2013.
#ifdef _DEBUG
skip_count += 3;
#else
skip_count += 0;
#endif
::base::debug::StackTrace stacktrace(skip_count);

size_t size;
2 changes: 1 addition & 1 deletion src/utilities.cc
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ static void DumpPC(DebugWriter *writerfn, void *arg, void *pc,
static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) {
// Print stack trace
void* stack[32];
int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count);
int depth = GetStackTrace(stack, ARRAYSIZE(stack), 0);
for (int i = 0; i < depth; i++) {
#if defined(HAVE_SYMBOLIZE)
if (FLAGS_symbolize_stacktrace) {