third_party/tcmalloc/chromium/src/base/spinlock_linux-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/base/spinlock_linux-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/base/spinlock_internal.cc ('k') | third_party/tcmalloc/chromium/src/base/spinlock_posix-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/base/spinlock_linux-inl.h

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

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

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

@@ -31,7 +31,6 @@

* This file is a Linux-specific part of spinlock_internal.cc

-#include <errno.h>

#include <sched.h>

#include <time.h>

#include <limits.h>

@@ -87,12 +86,12 @@

struct timespec tm;

tm.tv_sec = 0;

if (have_futex) {

- tm.tv_nsec = base::internal::SuggestedDelayNS(loop);

+ tm.tv_nsec = 1000000; // 1ms; really we're trying to sleep for one

+ // kernel clock tick

} else {

tm.tv_nsec = 2000001; // above 2ms so linux 2.4 doesn't spin

}

if (have_futex) {

- tm.tv_nsec *= 16; // increase the delay; we expect explicit wakeups

syscall(__NR_futex, reinterpret_cast<int *>(const_cast<Atomic32 *>(w)),

FUTEX_WAIT | futex_private_flag,

value, reinterpret_cast<struct kernel_timespec *>(&tm));