mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 05:20:06 +00:00
4a8f6d3155
In afe4de7d28, I added forwarding functions
from libc to libpthread for __pthread_cond_clockwait and
pthread_cond_clockwait to mirror those for pthread_cond_timedwait. These
are unnecessary[1], since these functions aren't (yet) being called from
within libc itself. Let's remove them.
* nptl/forward.c: Remove unnecessary __pthread_cond_clockwait and
pthread_cond_clockwait forwarding functions. There are no internal
users, so it is unnecessary to expose these functions in libc.so.
* sysdeps/nptl/pthread-functions.h (pthread_functions): Remove
unnecessary ptr___pthread_cond_clockwait member.
* nptl/nptl-init.c (pthread_functions): Remove assignment of
removed member.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
[1] https://sourceware.org/ml/libc-alpha/2017-10/msg00082.html
207 lines
7.5 KiB
C
207 lines
7.5 KiB
C
/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <pthreadP.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <shlib-compat.h>
|
|
#include <atomic.h>
|
|
#include <safe-fatal.h>
|
|
|
|
|
|
/* Pointers to the libc functions. */
|
|
struct pthread_functions __libc_pthread_functions attribute_hidden;
|
|
int __libc_pthread_functions_init attribute_hidden;
|
|
|
|
|
|
#define FORWARD2(name, rettype, decl, params, defaction) \
|
|
rettype \
|
|
name decl \
|
|
{ \
|
|
if (!__libc_pthread_functions_init) \
|
|
defaction; \
|
|
\
|
|
return PTHFCT_CALL (ptr_##name, params); \
|
|
}
|
|
|
|
/* Same as FORWARD2, only without return. */
|
|
#define FORWARD_NORETURN(name, rettype, decl, params, defaction) \
|
|
rettype \
|
|
name decl \
|
|
{ \
|
|
if (!__libc_pthread_functions_init) \
|
|
defaction; \
|
|
\
|
|
PTHFCT_CALL (ptr_##name, params); \
|
|
}
|
|
|
|
#define FORWARD(name, decl, params, defretval) \
|
|
FORWARD2 (name, int, decl, params, return defretval)
|
|
|
|
|
|
FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0)
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
|
|
FORWARD (__pthread_attr_init_2_0, (pthread_attr_t *attr), (attr), 0)
|
|
compat_symbol (libc, __pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0);
|
|
#endif
|
|
|
|
FORWARD (__pthread_attr_init_2_1, (pthread_attr_t *attr), (attr), 0)
|
|
versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
|
|
|
|
FORWARD (pthread_attr_getdetachstate,
|
|
(const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
|
|
0)
|
|
FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate),
|
|
(attr, detachstate), 0)
|
|
|
|
FORWARD (pthread_attr_getinheritsched,
|
|
(const pthread_attr_t *attr, int *inherit), (attr, inherit), 0)
|
|
FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit),
|
|
(attr, inherit), 0)
|
|
|
|
FORWARD (pthread_attr_getschedparam,
|
|
(const pthread_attr_t *attr, struct sched_param *param),
|
|
(attr, param), 0)
|
|
FORWARD (pthread_attr_setschedparam,
|
|
(pthread_attr_t *attr, const struct sched_param *param),
|
|
(attr, param), 0)
|
|
|
|
FORWARD (pthread_attr_getschedpolicy,
|
|
(const pthread_attr_t *attr, int *policy), (attr, policy), 0)
|
|
FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy),
|
|
(attr, policy), 0)
|
|
|
|
FORWARD (pthread_attr_getscope,
|
|
(const pthread_attr_t *attr, int *scope), (attr, scope), 0)
|
|
FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope),
|
|
(attr, scope), 0)
|
|
|
|
|
|
FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
|
|
FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond), (cond), return 0)
|
|
compat_symbol (libc, __pthread_cond_broadcast_2_0, pthread_cond_broadcast,
|
|
GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
|
|
versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
|
|
GLIBC_2_3_2);
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_destroy_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond), (cond), return 0)
|
|
compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
|
|
GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
|
|
versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy,
|
|
GLIBC_2_3_2);
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr),
|
|
(cond, cond_attr), return 0)
|
|
compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init, GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_init,
|
|
(pthread_cond_t *cond, const pthread_condattr_t *cond_attr),
|
|
(cond, cond_attr), 0)
|
|
versioned_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_3_2);
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_signal_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond), (cond), return 0)
|
|
compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
|
|
GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
|
|
versioned_symbol (libc, __pthread_cond_signal, pthread_cond_signal,
|
|
GLIBC_2_3_2);
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_wait_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex),
|
|
return 0)
|
|
compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
|
|
GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
|
|
(cond, mutex), 0)
|
|
versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait,
|
|
GLIBC_2_3_2);
|
|
|
|
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
|
|
FORWARD2 (__pthread_cond_timedwait_2_0, int attribute_compat_text_section,
|
|
(pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
|
|
const struct timespec *abstime), (cond, mutex, abstime),
|
|
return 0)
|
|
compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait,
|
|
GLIBC_2_0);
|
|
#endif
|
|
FORWARD (__pthread_cond_timedwait,
|
|
(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
const struct timespec *abstime), (cond, mutex, abstime), 0)
|
|
versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
|
|
GLIBC_2_3_2);
|
|
|
|
|
|
FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
|
|
(thread1, thread2), 1)
|
|
|
|
|
|
FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
|
|
exit (EXIT_SUCCESS))
|
|
strong_alias (__pthread_exit, pthread_exit);
|
|
|
|
|
|
FORWARD (pthread_getschedparam,
|
|
(pthread_t target_thread, int *policy, struct sched_param *param),
|
|
(target_thread, policy, param), 0)
|
|
FORWARD (pthread_setschedparam,
|
|
(pthread_t target_thread, int policy,
|
|
const struct sched_param *param), (target_thread, policy, param), 0)
|
|
|
|
|
|
FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
|
|
|
|
FORWARD (pthread_mutex_init,
|
|
(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr),
|
|
(mutex, mutexattr), 0)
|
|
|
|
FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0)
|
|
|
|
FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
|
|
|
|
FORWARD (__pthread_setcancelstate, (int state, int *oldstate),
|
|
(state, oldstate), 0)
|
|
strong_alias (__pthread_setcancelstate, pthread_setcancelstate)
|
|
|
|
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
|
|
|
|
FORWARD_NORETURN (__pthread_unwind,
|
|
void attribute_hidden __attribute ((noreturn))
|
|
__cleanup_fct_attribute attribute_compat_text_section,
|
|
(__pthread_unwind_buf_t *buf), (buf),
|
|
__safe_fatal ())
|