diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-16 15:54:46 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-10-16 17:58:17 -0700 |
| commit | 5419b9474753d25dff947c7740532f86d130c0be (patch) | |
| tree | 4d746cfc20a1d3b5886f691ed1a49ddf34e2df78 /libc/bionic/ThreadLocalBuffer.h | |
| parent | a9944cfe9e152ca46afb0a77300ec5a2a1a24e64 (diff) | |
| download | bionic-5419b9474753d25dff947c7740532f86d130c0be.zip bionic-5419b9474753d25dff947c7740532f86d130c0be.tar.gz bionic-5419b9474753d25dff947c7740532f86d130c0be.tar.bz2 | |
Make dlerror(3) thread-safe.
I gave up trying to use the usual thread-local buffer idiom; calls to
calloc(3) and free(3) from any of the "dl" functions -- which live in
the dynamic linker -- end up resolving to the dynamic linker's stubs.
I tried to work around that, but was just making things more complicated.
This alternative costs us a well-known TLS slot (instead of the
dynamically-allocated TLS slot we'd have used otherwise, so no difference
there), plus an extra buffer inside every pthread_internal_t.
Bug: 5404023
Change-Id: Ie9614edd05b6d1eeaf7bf9172792d616c6361767
Diffstat (limited to 'libc/bionic/ThreadLocalBuffer.h')
| -rw-r--r-- | libc/bionic/ThreadLocalBuffer.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/libc/bionic/ThreadLocalBuffer.h b/libc/bionic/ThreadLocalBuffer.h deleted file mode 100644 index 99acdba..0000000 --- a/libc/bionic/ThreadLocalBuffer.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _BIONIC_THREAD_LOCAL_BUFFER_H_included -#define _BIONIC_THREAD_LOCAL_BUFFER_H_included - -#include <malloc.h> -#include <pthread.h> - -// libstdc++ currently contains __cxa_guard_acquire and __cxa_guard_release, -// so we make do with macros instead of a C++ class. -// TODO: move __cxa_guard_acquire and __cxa_guard_release into libc. - -#define GLOBAL_INIT_THREAD_LOCAL_BUFFER(name) \ - static pthread_once_t name ## _once; \ - static pthread_key_t name ## _key; \ - static void name ## _key_destroy(void* buffer) { \ - free(buffer); \ - } \ - static void name ## _key_init() { \ - pthread_key_create(&name ## _key, name ## _key_destroy); \ - } - -// Leaves "name_buffer" and "name_byte_count" defined and initialized. -#define LOCAL_INIT_THREAD_LOCAL_BUFFER(type, name, byte_count) \ - pthread_once(&name ## _once, name ## _key_init); \ - type name ## _buffer = reinterpret_cast<type>(pthread_getspecific(name ## _key)); \ - if (name ## _buffer == NULL) { \ - name ## _buffer = reinterpret_cast<type>(malloc(byte_count)); \ - pthread_setspecific(name ## _key, name ## _buffer); \ - } \ - const size_t name ## _buffer_size = byte_count - -#endif // _BIONIC_THREAD_LOCAL_BUFFER_H_included |
