X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftls.h;h=09faadeecf31a9ff0377cabd6e3fa960e763ef7f;hb=35dda7458879acb367f2cba0aaf7856cd98f5b63;hp=ff36155c2ea5741659130b8bc10b4479ff69cb3d;hpb=37b09d7dc2c5956fbd70c211ed164a9ee1f7e349;p=gnulib.git diff --git a/lib/tls.h b/lib/tls.h index ff36155c2..09faadeec 100644 --- a/lib/tls.h +++ b/lib/tls.h @@ -1,20 +1,18 @@ /* Thread-local storage in multithreaded situations. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2007 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Written by Bruno Haible , 2005. */ @@ -38,6 +36,9 @@ */ +#ifndef _TLS_H +#define _TLS_H + /* ========================================================================= */ #if USE_POSIX_THREADS @@ -90,28 +91,40 @@ typedef union } gl_tls_key_t; # define gl_tls_key_init(NAME, DESTRUCTOR) \ - if (pthread_in_use ()) \ - { \ - if (pthread_key_create (&(NAME).key, DESTRUCTOR) != 0) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = NULL + do \ + { \ + if (pthread_in_use ()) \ + { \ + if (pthread_key_create (&(NAME).key, DESTRUCTOR) != 0) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = NULL; \ + } \ + while (0) # define gl_tls_get(NAME) \ (pthread_in_use () \ ? pthread_getspecific ((NAME).key) \ : (NAME).singlethread_value) # define gl_tls_set(NAME, POINTER) \ - if (pthread_in_use ()) \ - { \ - if (pthread_setspecific ((NAME).key, (POINTER)) != 0) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = (POINTER) + do \ + { \ + if (pthread_in_use ()) \ + { \ + if (pthread_setspecific ((NAME).key, (POINTER)) != 0) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = (POINTER); \ + } \ + while (0) # define gl_tls_key_destroy(NAME) \ - if (pthread_in_use () && pthread_key_delete ((NAME).key) != 0) \ - abort () + do \ + { \ + if (pthread_in_use () && pthread_key_delete ((NAME).key) != 0) \ + abort (); \ + } \ + while (0) #endif @@ -151,28 +164,40 @@ typedef union } gl_tls_key_t; # define gl_tls_key_init(NAME, DESTRUCTOR) \ - if (pth_in_use ()) \ - { \ - if (!pth_key_create (&(NAME).key, DESTRUCTOR)) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = NULL + do \ + { \ + if (pth_in_use ()) \ + { \ + if (!pth_key_create (&(NAME).key, DESTRUCTOR)) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = NULL; \ + } \ + while (0) # define gl_tls_get(NAME) \ (pth_in_use () \ ? pth_key_getdata ((NAME).key) \ : (NAME).singlethread_value) # define gl_tls_set(NAME, POINTER) \ - if (pth_in_use ()) \ - { \ - if (!pth_key_setdata ((NAME).key, (POINTER))) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = (POINTER) + do \ + { \ + if (pth_in_use ()) \ + { \ + if (!pth_key_setdata ((NAME).key, (POINTER))) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = (POINTER); \ + } \ + while (0) # define gl_tls_key_destroy(NAME) \ - if (pth_in_use () && !pth_key_delete ((NAME).key)) \ - abort () + do \ + { \ + if (pth_in_use () && !pth_key_delete ((NAME).key)) \ + abort (); \ + } \ + while (0) #endif @@ -211,26 +236,34 @@ typedef union } gl_tls_key_t; # define gl_tls_key_init(NAME, DESTRUCTOR) \ - if (thread_in_use ()) \ - { \ - if (thr_keycreate (&(NAME).key, DESTRUCTOR) != 0) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = NULL + do \ + { \ + if (thread_in_use ()) \ + { \ + if (thr_keycreate (&(NAME).key, DESTRUCTOR) != 0) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = NULL; \ + } \ + while (0) # define gl_tls_get(NAME) \ (thread_in_use () \ ? glthread_tls_get ((NAME).key) \ : (NAME).singlethread_value) extern void *glthread_tls_get (thread_key_t key); # define gl_tls_set(NAME, POINTER) \ - if (thread_in_use ()) \ - { \ - if (thr_setspecific ((NAME).key, (POINTER)) != 0) \ - abort (); \ - } \ - else \ - (NAME).singlethread_value = (POINTER) + do \ + { \ + if (thread_in_use ()) \ + { \ + if (thr_setspecific ((NAME).key, (POINTER)) != 0) \ + abort (); \ + } \ + else \ + (NAME).singlethread_value = (POINTER); \ + } \ + while (0) # define gl_tls_key_destroy(NAME) \ /* Unsupported. */ \ (void)0 @@ -248,16 +281,28 @@ extern void *glthread_tls_get (thread_key_t key); typedef DWORD gl_tls_key_t; # define gl_tls_key_init(NAME, DESTRUCTOR) \ /* The destructor is unsupported. */ \ - if (((NAME) = TlsAlloc ()) == (DWORD)-1) \ - abort () + do \ + { \ + if (((NAME) = TlsAlloc ()) == (DWORD)-1) \ + abort (); \ + } \ + while (0) # define gl_tls_get(NAME) \ TlsGetValue (NAME) # define gl_tls_set(NAME, POINTER) \ - if (!TlsSetValue (NAME, POINTER)) \ - abort () + do \ + { \ + if (!TlsSetValue (NAME, POINTER)) \ + abort (); \ + } \ + while (0) # define gl_tls_key_destroy(NAME) \ - if (!TlsFree (NAME)) \ - abort () + do \ + { \ + if (!TlsFree (NAME)) \ + abort (); \ + } \ + while (0) #endif @@ -284,3 +329,7 @@ typedef struct (void)0 #endif + +/* ========================================================================= */ + +#endif /* _TLS_H */