qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove <libc-tsd.h> 

Use __thread variables directly instead.  The macros do not save any
typing.  It seems unlikely that a future port will lack __thread
variable support.

Some of the __libc_tsd_* variables are referenced from assembler
files, so keep their names.  Previously, <libc-tls.h> included
<tls.h>, which in turn included <errno.h>, so a few direct includes
of <errno.h> are now required.

Reviewed-by: Frédéric Bérat <fberat@redhat.com>
This commit is contained in:
Florian Weimer 2025-05-16 19:53:09 +02:00
parent 579f866881
commit 10a66a8e42
11 changed files with 28 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ctype/ctype-info.c
View File

@ -19,20 +19,20 @@
#include <ctype.h>
#include <locale/localeinfo.h>
__libc_tsd_define (, const uint16_t *, CTYPE_B)
__libc_tsd_define (, const int32_t *, CTYPE_TOLOWER)
__libc_tsd_define (, const int32_t *, CTYPE_TOUPPER)
__thread const uint16_t * __libc_tsd_CTYPE_B;
__thread const int32_t * __libc_tsd_CTYPE_TOLOWER;
__thread const int32_t * __libc_tsd_CTYPE_TOUPPER;
void
__ctype_init (void)
{
const uint16_t **bp = __libc_tsd_address (const uint16_t *, CTYPE_B);
*bp = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
const int32_t **up = __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
*up = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
const int32_t **lp = __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
*lp = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
__libc_tsd_CTYPE_B
= ((const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS)) + 128;
__libc_tsd_CTYPE_TOUPPER
= ((const int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER)) + 128;
__libc_tsd_CTYPE_TOLOWER =
((const int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER)) + 128;
}
libc_hidden_def (__ctype_init)

13
include/ctype.h
View File

@ -24,33 +24,32 @@ libc_hidden_proto (toupper)
NL_CURRENT_INDIRECT. */
# include "../locale/localeinfo.h"
# include <libc-tsd.h>
# ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */
# define CTYPE_EXTERN_INLINE extern inline
# endif
__libc_tsd_define (extern, const uint16_t *, CTYPE_B)
__libc_tsd_define (extern, const int32_t *, CTYPE_TOUPPER)
__libc_tsd_define (extern, const int32_t *, CTYPE_TOLOWER)
extern __thread const uint16_t * __libc_tsd_CTYPE_B;
extern __thread const int32_t * __libc_tsd_CTYPE_TOUPPER;
extern __thread const int32_t * __libc_tsd_CTYPE_TOLOWER;
CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const))
__ctype_b_loc (void)
{
return __libc_tsd_address (const uint16_t *, CTYPE_B);
return &__libc_tsd_CTYPE_B;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_toupper_loc (void)
{
return __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
return &__libc_tsd_CTYPE_TOUPPER;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_tolower_loc (void)
{
return __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
return &__libc_tsd_CTYPE_TOLOWER;
}
# ifndef __NO_CTYPE

4
include/rpc/rpc.h
View File

@ -3,8 +3,6 @@
# ifndef _ISOMAC
#include <libc-tsd.h>
/* Now define the internal interfaces. */
extern unsigned long _create_xid (void);
@ -47,7 +45,7 @@ extern void __rpc_thread_key_cleanup (void) attribute_hidden;
extern void __rpc_thread_destroy (void) attribute_hidden;
__libc_tsd_define (extern, struct rpc_thread_variables *, RPC_VARS)
extern __thread struct rpc_thread_variables *__libc_tsd_RPC_VARS;
#define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)

9
locale/lc-ctype.c
View File

@ -64,12 +64,9 @@ _nl_postload_ctype (void)
in fact using the global locale. */
if (_NL_CURRENT_LOCALE == &_nl_global_locale)
{
__libc_tsd_set (const uint16_t *, CTYPE_B,
(void *) _nl_global_locale.__ctype_b);
__libc_tsd_set (const int32_t *, CTYPE_TOUPPER,
(void *) _nl_global_locale.__ctype_toupper);
__libc_tsd_set (const int32_t *, CTYPE_TOLOWER,
(void *) _nl_global_locale.__ctype_tolower);
__libc_tsd_CTYPE_B = _nl_global_locale.__ctype_b;
__libc_tsd_CTYPE_TOUPPER = _nl_global_locale.__ctype_toupper;
__libc_tsd_CTYPE_TOLOWER = _nl_global_locale.__ctype_tolower;
}
#include <shlib-compat.h>

6
locale/localeinfo.h
View File

@ -236,10 +236,8 @@ extern struct __locale_struct _nl_global_locale attribute_hidden;
/* This fetches the thread-local locale_t pointer, either one set with
uselocale or &_nl_global_locale. */
#define _NL_CURRENT_LOCALE (__libc_tsd_get (locale_t, LOCALE))
#include <libc-tsd.h>
__libc_tsd_define (extern, locale_t, LOCALE)
#define _NL_CURRENT_LOCALE __libc_tsd_LOCALE
extern __thread locale_t __libc_tsd_LOCALE;
/* For static linking it is desireable to avoid always linking in the code
and data for every category when we can tell at link time that they are

10
locale/uselocale.c
View File

@ -34,7 +34,7 @@ __uselocale (locale_t newloc)
{
const locale_t locobj
= newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc;
__libc_tsd_set (locale_t, LOCALE, locobj);
__libc_tsd_LOCALE = locobj;
#ifdef NL_CURRENT_INDIRECT
/* Now we must update all the per-category thread-local variables to
@ -62,11 +62,9 @@ __uselocale (locale_t newloc)
#endif
/* Update the special tsd cache of some locale data. */
__libc_tsd_set (const uint16_t *, CTYPE_B, (void *) locobj->__ctype_b);
__libc_tsd_set (const int32_t *, CTYPE_TOLOWER,
(void *) locobj->__ctype_tolower);
__libc_tsd_set (const int32_t *, CTYPE_TOUPPER,
(void *) locobj->__ctype_toupper);
__libc_tsd_CTYPE_B = locobj->__ctype_b;
__libc_tsd_CTYPE_TOLOWER = locobj->__ctype_tolower;
__libc_tsd_CTYPE_TOUPPER = locobj->__ctype_toupper;
}
return oldloc == &_nl_global_locale ? LC_GLOBAL_LOCALE : oldloc;

1
stdio-common/printf-parsemb.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>

2
string/strerror.c
View File

@ -21,5 +21,5 @@
char *
strerror (int errnum)
{
return __strerror_l (errnum, __libc_tsd_get (locale_t, LOCALE));
return __strerror_l (errnum, __libc_tsd_LOCALE);
}

1
sunrpc/rpc_thread.c
View File

@ -3,7 +3,6 @@
#include <assert.h>
#include <libc-lock.h>
#include <libc-tsd.h>
#include <shlib-compat.h>
#include <libc-symbols.h>

60
sysdeps/generic/libc-tsd.h
View File

@ -1,60 +0,0 @@
/* libc-internal interface for thread-specific data. Stub or TLS version.
Copyright (C) 1998-2025 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 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#ifndef _GENERIC_LIBC_TSD_H
#define _GENERIC_LIBC_TSD_H 1
/* This file defines the following macros for accessing a small fixed
set of thread-specific `void *' data used only internally by libc.
__libc_tsd_define(CLASS, TYPE, KEY) -- Define or declare a datum with TYPE
for KEY. CLASS can be `static' for
keys used in only one source file,
empty for global definitions, or
`extern' for global declarations.
__libc_tsd_address(TYPE, KEY) -- Return the `TYPE *' pointing to
the current thread's datum for KEY.
__libc_tsd_get(TYPE, KEY) -- Return the `TYPE' datum for KEY.
__libc_tsd_set(TYPE, KEY, VALUE) -- Set the datum for KEY to VALUE.
The set of available KEY's will usually be provided as an enum,
and contains (at least):
_LIBC_TSD_KEY_MALLOC
_LIBC_TSD_KEY_DL_ERROR
_LIBC_TSD_KEY_RPC_VARS
All uses must be the literal _LIBC_TSD_* name in the __libc_tsd_* macros.
Some implementations may not provide any enum at all and instead
using string pasting in the macros. */
#include <tls.h>
/* When full support for __thread variables is available, this interface is
just a trivial wrapper for it. Without TLS, this is the generic/stub
implementation for wholly single-threaded systems.
We don't define an enum for the possible key values, because the KEYs
translate directly into variables by macro magic. */
#define __libc_tsd_define(CLASS, TYPE, KEY) \
CLASS __thread TYPE __libc_tsd_##KEY attribute_tls_model_ie;
#define __libc_tsd_address(TYPE, KEY) (&__libc_tsd_##KEY)
#define __libc_tsd_get(TYPE, KEY) (__libc_tsd_##KEY)
#define __libc_tsd_set(TYPE, KEY, VALUE) (__libc_tsd_##KEY = (VALUE))
#endif /* libc-tsd.h */

1
time/strftime_l.c
View File

@ -40,6 +40,7 @@
#endif
#include <ctype.h>
#include <errno.h>
#include <sys/types.h> /* Some systems define `time_t' here. */
#ifdef TIME_WITH_SYS_TIME