niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

htl: move pthread_condattr_init into libc.

Browse source 
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-6-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-11-26 22:53:27 +02:00 • committed by Samuel Thibault
parent 25699c4c3a
commit ebd85cdc4a
10 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htl/Makefile
View file

@ -92,7 +92,6 @@ libpthread-routines := \
pt-rwlock-timedrdlock \ pt-rwlock-timedrdlock \
pt-rwlock-timedwrlock \ pt-rwlock-timedwrlock \
pt-rwlock-unlock \ pt-rwlock-unlock \
pt-condattr-init \
pt-condattr-setclock \ pt-condattr-setclock \
pt-condattr-setpshared \ pt-condattr-setpshared \
pt-cond-destroy \ pt-cond-destroy \
@ -206,6 +205,7 @@ routines := \
pt-condattr-destroy \ pt-condattr-destroy \
pt-condattr-getclock \ pt-condattr-getclock \
pt-condattr-getpshared \ pt-condattr-getpshared \
pt-condattr-init \
pt-getschedparam \ pt-getschedparam \
pt-nthreads \ pt-nthreads \
pt-pthread_self \ pt-pthread_self \

3
htl/Versions
View file

@ -27,6 +27,7 @@ libc {
pthread_attr_setschedparam; pthread_attr_setschedparam;
pthread_attr_init; pthread_attr_init;
pthread_condattr_getclock; pthread_condattr_getclock;
pthread_condattr_init;
pthread_condattr_destroy; pthread_condattr_destroy;
pthread_condattr_getpshared; pthread_condattr_getpshared;
} }
@ -87,6 +88,7 @@ libc {
__pthread_attr_setstacksize; __pthread_attr_setstacksize;
__pthread_attr_setstackaddr; __pthread_attr_setstackaddr;
__pthread_attr_setstack; __pthread_attr_setstack;
__pthread_condattr_init;
__pthread_default_condattr; __pthread_default_condattr;
} }
} }
@ -125,7 +127,6 @@ libpthread {
pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
pthread_condattr_init;
pthread_condattr_setclock; pthread_condattr_setpshared; pthread_condattr_setclock; pthread_condattr_setpshared;
pthread_create; pthread_detach; pthread_exit; pthread_create; pthread_detach; pthread_exit;

3
htl/forward.c
View file

@ -53,9 +53,6 @@ name decl \
#define FORWARD(name, decl, params, defretval) \ #define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval) FORWARD2 (name, int, decl, params, return defretval)
FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0) FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0) FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_init, FORWARD (pthread_cond_init,

1
htl/pt-initialize.c
View file

@ -27,7 +27,6 @@
#if IS_IN (libpthread) #if IS_IN (libpthread)
static const struct pthread_functions pthread_functions = { static const struct pthread_functions pthread_functions = {
.ptr_pthread_condattr_init = __pthread_condattr_init,
.ptr_pthread_cond_broadcast = __pthread_cond_broadcast, .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
.ptr_pthread_cond_destroy = __pthread_cond_destroy, .ptr_pthread_cond_destroy = __pthread_cond_destroy,
.ptr_pthread_cond_init = __pthread_cond_init, .ptr_pthread_cond_init = __pthread_cond_init,

7
sysdeps/htl/pt-condattr-init.c
View file

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h> #include <pt-internal.h>
int int
@ -27,5 +28,9 @@ __pthread_condattr_init (pthread_condattr_t *attr)
*attr = __pthread_default_condattr; *attr = __pthread_default_condattr;
return 0; return 0;
} }
libc_hidden_def (__pthread_condattr_init)
versioned_symbol (libc, __pthread_condattr_init, pthread_condattr_init, GLIBC_2_21);
weak_alias (__pthread_condattr_init, pthread_condattr_init); #if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_condattr_init, pthread_condattr_init, GLIBC_2_12);
#endif

2
sysdeps/htl/pthread-functions.h
View file

@ -21,7 +21,6 @@
#include <pthread.h> #include <pthread.h>
int __pthread_condattr_init (pthread_condattr_t *);
int __pthread_cond_broadcast (pthread_cond_t *); int __pthread_cond_broadcast (pthread_cond_t *);
int __pthread_cond_destroy (pthread_cond_t *); int __pthread_cond_destroy (pthread_cond_t *);
int __pthread_cond_init (pthread_cond_t *, int __pthread_cond_init (pthread_cond_t *,
@ -57,7 +56,6 @@ int _cthreads_ftrylockfile (FILE *);
so if possible avoid breaking it and append new hooks to the end. */ so if possible avoid breaking it and append new hooks to the end. */
struct pthread_functions struct pthread_functions
{ {
int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
int (*ptr_pthread_cond_broadcast) (pthread_cond_t *); int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
int (*ptr_pthread_cond_destroy) (pthread_cond_t *); int (*ptr_pthread_cond_destroy) (pthread_cond_t *);
int (*ptr_pthread_cond_init) (pthread_cond_t *, int (*ptr_pthread_cond_init) (pthread_cond_t *,

2
sysdeps/htl/pthreadP.h
View file

@ -98,11 +98,13 @@ int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
libc_hidden_proto (__pthread_attr_getstack) libc_hidden_proto (__pthread_attr_getstack)
void __pthread_testcancel (void); void __pthread_testcancel (void);
int __pthread_attr_init (pthread_attr_t *attr); int __pthread_attr_init (pthread_attr_t *attr);
int __pthread_condattr_init (pthread_condattr_t *attr);
#define __pthread_raise_internal(__sig) raise (__sig) #define __pthread_raise_internal(__sig) raise (__sig)
libc_hidden_proto (__pthread_self) libc_hidden_proto (__pthread_self)
libc_hidden_proto (__pthread_attr_init) libc_hidden_proto (__pthread_attr_init)
libc_hidden_proto (__pthread_condattr_init)
#if IS_IN (libpthread) #if IS_IN (libpthread)
hidden_proto (__pthread_create) hidden_proto (__pthread_create)

1
sysdeps/mach/hurd/i386/libc.abilist
View file

@ -52,6 +52,7 @@ GLIBC_2.12 pthread_attr_setstacksize F
GLIBC_2.12 pthread_condattr_destroy F GLIBC_2.12 pthread_condattr_destroy F
GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_condattr_getclock F
GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_getpshared F
GLIBC_2.12 pthread_condattr_init F
GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_self F

1
sysdeps/mach/hurd/i386/libpthread.abilist
View file

@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F
GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_signal F
GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait F GLIBC_2.12 pthread_cond_wait F
GLIBC_2.12 pthread_condattr_init F
GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_condattr_setpshared F
GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_create F

1
sysdeps/mach/hurd/x86_64/libpthread.abilist
View file

@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F
GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_signal F
GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_timedwait F
GLIBC_2.38 pthread_cond_wait F GLIBC_2.38 pthread_cond_wait F
GLIBC_2.38 pthread_condattr_init F
GLIBC_2.38 pthread_condattr_setclock F GLIBC_2.38 pthread_condattr_setclock F
GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_condattr_setpshared F
GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_create F