Index: third_party/tcmalloc/chromium/src/base/spinlock_linux-inl.h |
=================================================================== |
--- third_party/tcmalloc/chromium/src/base/spinlock_linux-inl.h (revision 124832) |
+++ 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)); |