Chromium Code Reviews| Index: third_party/tcmalloc/chromium/src/debugallocation.cc |
| =================================================================== |
| --- third_party/tcmalloc/chromium/src/debugallocation.cc (revision 199525) |
| +++ third_party/tcmalloc/chromium/src/debugallocation.cc (working copy) |
| @@ -70,6 +70,7 @@ |
| #include "addressmap-inl.h" |
| #include "base/abort.h" |
| #include "base/commandlineflags.h" |
| +#include "base/compiler_specific.h" |
|
jar (doing other things)
2013/05/15 00:56:14
per discussion: kill this line, and then use an if
Paweł Hajdan Jr.
2013/05/15 17:59:46
Done.
|
| #include "base/googleinit.h" |
| #include "base/logging.h" |
| #include "base/spinlock.h" |
| @@ -127,19 +128,11 @@ |
| EnvToBool("TCMALLOC_SYMBOLIZE_STACKTRACE", true), |
| "Symbolize the stack trace when provided (on some error exits)"); |
| -// If we are LD_PRELOAD-ed against a non-pthreads app, then |
| -// pthread_once won't be defined. We declare it here, for that |
| -// case (with weak linkage) which will cause the non-definition to |
| -// resolve to NULL. We can then check for NULL or not in Instance. |
| -extern "C" int pthread_once(pthread_once_t *, void (*)(void)) |
| - ATTRIBUTE_WEAK; |
| - |
| // ========================================================================= // |
| // A safe version of printf() that does not do any allocation and |
| // uses very little stack space. |
| -static void TracePrintf(int fd, const char *fmt, ...) |
| - __attribute__ ((__format__ (__printf__, 2, 3))); |
| +static void TracePrintf(int fd, const char *fmt, ...) PRINTF_FORMAT(2, 3); |
| // The do_* functions are defined in tcmalloc/tcmalloc.cc, |
| // which is included before this file |
| @@ -624,9 +617,7 @@ |
| } |
| static void CheckForDanglingWrites(const MallocBlockQueueEntry& queue_entry) { |
| - // Initialize the buffer if necessary. |
| - if (pthread_once) |
| - pthread_once(&deleted_buffer_initialized_, &InitDeletedBuffer); |
| + perftools_pthread_once(&deleted_buffer_initialized_, &InitDeletedBuffer); |
| if (!deleted_buffer_initialized_no_pthreads_) { |
| // This will be the case on systems that don't link in pthreads, |
| // including on FreeBSD where pthread_once has a non-zero address |