From 8dc97a5e7ca62b98aba02883724fd58a91f9a32e Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 1 Mar 2015 20:23:52 +0100 Subject: Forward lockfile calls from libc to dynamically loaded libpthread * forward.c: (__libc_pthread_functions_init): Add variable (FORWARD2): Use __libc_pthread_functions_init instead of testing __libc_pthread_functions.ptr_##name value. (FORWARD_NORETURN): Add macro. (pthread_exit): Use FORWARD_NORETURN instead of FORWARD2. * libc_pthread_init.c (__libc_pthread_init): Set __libc_pthread_functions_init to 1. * pthread/pthread-functions.h (__pthread_once, __pthread_rwlock_rdlock, __pthread_rwlock_wrlock, __pthread_rwlock_unlock, __pthread_key_create, __pthread_getspecific, __pthread_setspecific, _cthreads_flockfile, _cthreads_funlockfile, _cthreads_ftrylockfile): Add prototypes. (pthread_functions): Add ptr_pthread_once, ptr_pthread_rwlock_rdlock, ptr_pthread_rwlock_wrlock, ptr_pthread_rwlock_unlock, ptr_pthread_key_create, ptr_pthread_getspecific, ptr_pthread_setspecific, ptr__IO_flockfile, ptr__IO_funlockfile, ptr__IO_ftrylockfile. (__libc_pthread_functions_init): Add variable declaration. (PTHFCT_CALL): Add macro. * pthread/pt-initialize.c (pthread_functions): Initialize ptr_pthread_once, ptr_pthread_rwlock_rdlock, ptr_pthread_rwlock_wrlock, pthread_rwlock_unlock, ptr_ptr_pthread_key_create, pthread_getspecific, ptr_pthread_setspecific, ptr_ptr__IO_flockfile, _IO_funlockfile, ptr__IO_ftrylockfile. * sysdeps/generic/pt-once.c (pthread_once): Rename to __pthread_once (pthread_once): Add strong alias. * sysdeps/generic/pt-rwlock-rdlock.c (pthread_rwlock_rdlock): Rename to __pthread_rwlock_rdlock (pthread_rwlock_rdlock): Add strong alias. * sysdeps/generic/pt-rwlock-wrlock.c (pthread_rwlock_wrlock): Rename to __pthread_rwlock_wrlock (pthread_rwlock_wrlock): Add strong alias. * sysdeps/generic/pt-rwlock-unlock.c (pthread_rwlock_unlock): Rename to __pthread_rwlock_unlock (pthread_rwlock_unlock): Add strong alias. * sysdeps/generic/pt-getspecific.c (pthread_getspecific): Rename to __pthread_getspecific (pthread_getspecific): Add strong alias. * sysdeps/generic/pt-setspecific.c (pthread_setspecific): Rename to __pthread_setspecific (pthread_setspecific): Add strong alias. * sysdeps/pthread/flockfile.c: Add file. * sysdeps/pthread/ftrylockfile.c: Add file. * sysdeps/pthread/funlockfile.c: Add file. --- sysdeps/generic/pt-once.c | 3 ++- sysdeps/generic/pt-rwlock-rdlock.c | 3 ++- sysdeps/generic/pt-rwlock-unlock.c | 3 ++- sysdeps/generic/pt-rwlock-wrlock.c | 3 ++- sysdeps/hurd/pt-getspecific.c | 3 ++- sysdeps/hurd/pt-setspecific.c | 3 ++- sysdeps/pthread/flockfile.c | 33 +++++++++++++++++++++++++++++++++ sysdeps/pthread/ftrylockfile.c | 36 ++++++++++++++++++++++++++++++++++++ sysdeps/pthread/funlockfile.c | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 sysdeps/pthread/flockfile.c create mode 100644 sysdeps/pthread/ftrylockfile.c create mode 100644 sysdeps/pthread/funlockfile.c (limited to 'sysdeps') diff --git a/sysdeps/generic/pt-once.c b/sysdeps/generic/pt-once.c index 5be5e48..d9f4733 100644 --- a/sysdeps/generic/pt-once.c +++ b/sysdeps/generic/pt-once.c @@ -23,7 +23,7 @@ #include int -pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) +__pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) { if (once_control->run == 0) { @@ -41,3 +41,4 @@ pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) return 0; } +strong_alias (__pthread_once, pthread_once); diff --git a/sysdeps/generic/pt-rwlock-rdlock.c b/sysdeps/generic/pt-rwlock-rdlock.c index 480cf48..6eca601 100644 --- a/sysdeps/generic/pt-rwlock-rdlock.c +++ b/sysdeps/generic/pt-rwlock-rdlock.c @@ -26,7 +26,8 @@ extern int __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwloc /* Acquire RWLOCK for reading, block if we can't get it. */ int -pthread_rwlock_rdlock (struct __pthread_rwlock *rwlock) +__pthread_rwlock_rdlock (struct __pthread_rwlock *rwlock) { return __pthread_rwlock_timedrdlock_internal (rwlock, 0); } +strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock); diff --git a/sysdeps/generic/pt-rwlock-unlock.c b/sysdeps/generic/pt-rwlock-unlock.c index dcf1d3e..b45ad23 100644 --- a/sysdeps/generic/pt-rwlock-unlock.c +++ b/sysdeps/generic/pt-rwlock-unlock.c @@ -25,7 +25,7 @@ are no threads waiting for a write lock, rescheduling the reader threads. */ int -pthread_rwlock_unlock (pthread_rwlock_t *rwlock) +__pthread_rwlock_unlock (pthread_rwlock_t *rwlock) { struct __pthread *wakeup; @@ -96,3 +96,4 @@ pthread_rwlock_unlock (pthread_rwlock_t *rwlock) __pthread_spin_unlock (&rwlock->__lock); return 0; } +strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock); diff --git a/sysdeps/generic/pt-rwlock-wrlock.c b/sysdeps/generic/pt-rwlock-wrlock.c index be85b90..68254d1 100644 --- a/sysdeps/generic/pt-rwlock-wrlock.c +++ b/sysdeps/generic/pt-rwlock-wrlock.c @@ -28,7 +28,8 @@ extern int __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwloc /* Acquire RWLOCK for writing. */ int -pthread_rwlock_wrlock (struct __pthread_rwlock *rwlock) +__pthread_rwlock_wrlock (struct __pthread_rwlock *rwlock) { return __pthread_rwlock_timedwrlock_internal (rwlock, 0); } +strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock); diff --git a/sysdeps/hurd/pt-getspecific.c b/sysdeps/hurd/pt-getspecific.c index 71ec63c..8a01470 100644 --- a/sysdeps/hurd/pt-getspecific.c +++ b/sysdeps/hurd/pt-getspecific.c @@ -23,7 +23,7 @@ #include void * -pthread_getspecific (pthread_key_t key) +__pthread_getspecific (pthread_key_t key) { struct __pthread *self; @@ -37,3 +37,4 @@ pthread_getspecific (pthread_key_t key) return hurd_ihash_find (self->thread_specifics, key); } +strong_alias (__pthread_getspecific, pthread_getspecific); diff --git a/sysdeps/hurd/pt-setspecific.c b/sysdeps/hurd/pt-setspecific.c index d0b7302..b3976cc 100644 --- a/sysdeps/hurd/pt-setspecific.c +++ b/sysdeps/hurd/pt-setspecific.c @@ -23,7 +23,7 @@ #include int -pthread_setspecific (pthread_key_t key, const void *value) +__pthread_setspecific (pthread_key_t key, const void *value) { error_t err; struct __pthread *self = _pthread_self (); @@ -45,3 +45,4 @@ pthread_setspecific (pthread_key_t key, const void *value) return 0; } +strong_alias (__pthread_setspecific, pthread_setspecific); diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c new file mode 100644 index 0000000..bddd46c --- /dev/null +++ b/sysdeps/pthread/flockfile.c @@ -0,0 +1,33 @@ +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + . */ + +#include +#include +#include + + +void +__flockfile (stream) + FILE *stream; +{ +#ifdef SHARED + __libc_ptf_call (_IO_flockfile, (stream), 0); +#endif +} +strong_alias (__flockfile, _IO_flockfile) +weak_alias (__flockfile, flockfile) diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c new file mode 100644 index 0000000..7aafbe9 --- /dev/null +++ b/sysdeps/pthread/ftrylockfile.c @@ -0,0 +1,36 @@ +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + . */ + +#include +#include +#include +#include + + +int +__ftrylockfile (stream) + FILE *stream; +{ +#ifdef SHARED + return __libc_ptf_call (_IO_ftrylockfile, (stream), 0); +#else + return 0; +#endif +} +strong_alias (__ftrylockfile, _IO_ftrylockfile) +weak_alias (__ftrylockfile, ftrylockfile) diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c new file mode 100644 index 0000000..59fa40e --- /dev/null +++ b/sysdeps/pthread/funlockfile.c @@ -0,0 +1,34 @@ +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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 + . */ + +#include +#include +#include +#include + + +void +__funlockfile (stream) + FILE *stream; +{ +#ifdef SHARED + __libc_ptf_call (_IO_funlockfile, (stream), 0); +#endif +} +strong_alias (__funlockfile, _IO_funlockfile) +weak_alias (__funlockfile, funlockfile) -- cgit v1.2.3