X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Ftls.h;h=5f3d0e17ca784c274a9d41a0cc6e94c0126e1ef3;hp=def2becfd51ce352c5aa1449a652c225973b3281;hb=a1d0b3ca99552878b1becf561d8f3291992aaa67;hpb=4a7804bd08c790fc3c4233312e4b485c3302fe02 diff --git a/include/tls.h b/include/tls.h index def2bec..5f3d0e1 100644 --- a/include/tls.h +++ b/include/tls.h @@ -9,10 +9,10 @@ #define TLS_H #ifdef __ELF__ // use gcc thread-local storage (i.e. __thread variables) -#define DECLARE_THREAD_LOCAL (name, type) type name -#define INIT_THREAD_LOCAL (name, value) name = value -#define SET_THREAD_LOCAL (name, value) name = value -#define LOCALIZE_THREAD_LOCAL(name, type) extern __thread type name +#define DECLARE_THREAD_LOCAL(name, type) __thread type name +#define INIT_THREAD_LOCAL(name) +#define SET_THREAD_LOCAL(name, value) name = value +#define LOCALIZE_THREAD_LOCAL(name, type) #else//!__ELF__ @@ -20,15 +20,14 @@ #define DECLARE_THREAD_LOCAL(name, type) pthread_key_t name##_KEY -#define INIT_THREAD_LOCAL(name, value) \ +#define INIT_THREAD_LOCAL(name) \ do { \ - if (pthread_key_create(&name##_KEY, (void *)(size_t)value) != 0) { assert(FALSE); } \ + if (pthread_key_create(&name##_KEY, NULL) != 0) { assert(FALSE); } \ } while (0) #define SET_THREAD_LOCAL(name, value) pthread_setspecific(name##_KEY, (void *)(size_t)value); -#define LOCALIZE_THREAD_LOCAL(name, type) \ - extern pthread_key_t name##_KEY; type name = (type)(size_t)pthread_getspecific(name##_KEY) +#define LOCALIZE_THREAD_LOCAL(name, type) type name = (type)(size_t)pthread_getspecific(name##_KEY) #endif//__ELF__ #endif//TLS_H