third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h - Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h

Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/tcmalloc/chromium/src/stacktrace_with_context.cc ('k') | third_party/tcmalloc/chromium/src/stacktrace_x86_64-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h

===================================================================

--- third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h (revision 126022)

+++ third_party/tcmalloc/chromium/src/stacktrace_x86-inl.h (working copy)

@@ -64,7 +64,7 @@

#include "base/vdso_support.h"

#endif

-#include "gperftools/stacktrace.h"

+#include "google/stacktrace.h"

#if defined(KEEP_SHADOW_STACKS)

#include "linux_shadow_stacks.h"

#endif // KEEP_SHADOW_STACKS

@@ -241,14 +241,9 @@

// In the non-strict mode, allow discontiguous stack frames.

// (alternate-signal-stacks for example).

if (new_sp == old_sp) return NULL;

- if (new_sp > old_sp) {

- // And allow frames upto about 1MB.

- const uintptr_t delta = (uintptr_t)new_sp - (uintptr_t)old_sp;

- const uintptr_t acceptable_delta = 1000000;

- if (delta > acceptable_delta) {

- return NULL;

- }

+ // And allow frames upto about 1MB.

+ if ((new_sp > old_sp)

+ && ((uintptr_t)new_sp - (uintptr_t)old_sp > 1000000)) return NULL;

}

if ((uintptr_t)new_sp & (sizeof(void *) - 1)) return NULL;

#ifdef __i386__