[uClibc-cvs] uClibc/libpthread/linuxthreads/sysdeps/pthread/bits libc-lock.h,1.2,1.3 libc-tsd.h,1.2,1.3
Erik Andersen
andersen at codepoet.org
Thu Feb 27 18:13:30 UTC 2003
Update of /var/cvs/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits
In directory winder:/tmp/cvs-serv18985/libpthread/linuxthreads/sysdeps/pthread/bits
Modified Files:
libc-tsd.h
Added Files:
libc-lock.h
Log Message:
Major update for pthreads, based in large part on improvements
from glibc 2.3. This should make threads much more efficient.
-Erik
Index: libc-tsd.h
===================================================================
RCS file: /var/cvs/uClibc/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libc-tsd.h 6 Aug 2002 14:49:13 -0000 1.2
+++ libc-tsd.h 27 Feb 2003 18:12:54 -0000 1.3
@@ -1,18 +1,18 @@
/* libc-internal interface for thread-specific data. LinuxThreads version.
- Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1997,98,99,2001,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library 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 of the
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C Library 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.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
+ You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
@@ -20,17 +20,36 @@
#ifndef _BITS_LIBC_TSD_H
#define _BITS_LIBC_TSD_H 1
-#include <features.h>
-
/* Fast thread-specific data internal to libc. */
enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0,
_LIBC_TSD_KEY_DL_ERROR,
_LIBC_TSD_KEY_RPC_VARS,
+ _LIBC_TSD_KEY_LOCALE,
+ _LIBC_TSD_KEY_CTYPE_B,
+ _LIBC_TSD_KEY_CTYPE_TOLOWER,
+ _LIBC_TSD_KEY_CTYPE_TOUPPER,
_LIBC_TSD_KEY_N };
+#include <sys/cdefs.h>
+#include <tls.h>
+
+#if USE_TLS && HAVE___THREAD
+
+/* When __thread works, the generic definition is what we want. */
+# include <sysdeps/generic/bits/libc-tsd.h>
+
+#else
+
extern void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t) __THROW;
extern int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t,
__const void *) __THROW;
+extern void **(*const __libc_internal_tsd_address) (enum __libc_tsd_key_t)
+ __THROW __attribute__ ((__const__));
+
+#define __libc_tsd_address(KEY) \
+ (__libc_internal_tsd_address != NULL \
+ ? __libc_internal_tsd_address (_LIBC_TSD_KEY_##KEY) \
+ : &__libc_tsd_##KEY##_data)
#define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY##_data;
#define __libc_tsd_get(KEY) \
@@ -41,5 +60,7 @@
(__libc_internal_tsd_set != NULL \
? __libc_internal_tsd_set (_LIBC_TSD_KEY_##KEY, (VALUE)) \
: ((__libc_tsd_##KEY##_data = (VALUE)), 0))
+
+#endif
#endif /* bits/libc-tsd.h */
More information about the uClibc-cvs
mailing list