f6fb29d22e
* htl/cthreads-compat.c (__cthread_detach): Call __pthread_detach instead of pthread_detach. (__cthread_fork): Call __pthread_create instead of pthread_create. (__cthread_keycreate): Call __pthread_key_create instead of pthread_key_create. (__cthread_getspecific): Call __pthread_getspecific instead of pthread_getspecific. (__cthread_setspecific): Call __pthread_setspecific instead of pthread_setspecific. * htl/pt-alloc.c (__pthread_alloc): Call __pthread_mutex_lock and __pthread_mutex_unlock instead of pthread_mutex_lock and pthread_mutex_unlock. * htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to ___pthread_get_cleanup_stack. (__pthread_get_cleanup_stack): New strong alias. * htl/pt-create.c: Include <pthreadP.h>. (entry_point): Call __pthread_exit instead of pthread_exit. (pthread_create): Rename to __pthread_create. (pthread_create): New strong alias. * htl/pt-detach.c (pthread_detach): Rename to __pthread_detach. (pthread_detach): New strong alias. (__pthread_detach): Call __pthread_cond_broadcast instead of pthread_cond_broadcast. * htl/pt-exit.c (__pthread_exit): Call __pthread_setcancelstate instead of pthread_setcancelstate. * htl/pt-testcancel.c: Include <pthreadP.h>. (pthread_testcancel): Call __pthread_exit instead of pthread_exit. * sysdeps/htl/pt-attr-getstack.c: Include <pthreadP.h> (__pthread_attr_getstack): Call __pthread_attr_getstackaddr and __pthread_attr_getstacksize instead of pthread_attr_getstackaddr and pthread_attr_getstacksize. * sysdeps/htl/pt-attr-getstackaddr.c (pthread_attr_getstackaddr): Rename to __pthread_attr_getstackaddr. (pthread_attr_getstackaddr): New strong alias. * sysdeps/htl/pt-attr-getstacksize.c (pthread_attr_getstacksize): Rename to __pthread_attr_getstacksize. (pthread_attr_getstacksize): New strong alias. * sysdeps/htl/pt-attr-setstack.c: Include <pthreadP.h>. (pthread_attr_setstack): Rename to __pthread_attr_setstack. (pthread_attr_setstack): New strong alias. (__pthread_attr_setstack): Call __pthread_attr_getstacksize, __pthread_attr_setstacksize and __pthread_attr_setstackaddr instead of pthread_attr_getstacksize, pthread_attr_setstacksize and pthread_attr_setstackaddr. * sysdeps/htl/pt-attr-setstackaddr.c (pthread_attr_setstackaddr): Rename to __pthread_attr_setstackaddr. (pthread_attr_setstackaddr): New strong alias. * sysdeps/htl/pt-attr-setstacksize.c (pthread_attr_setstacksize): Rename to __pthread_attr_setstacksize. (pthread_attr_setstacksize): New strong alias. * sysdeps/htl/pt-cond-timedwait.c: Include <pthreadP.h>. (__pthread_cond_timedwait_internal): Use __pthread_exit instead of pthread_exit. * sysdeps/htl/pt-key-create.c: Include <pthreadP.h>. (__pthread_key_create): New hidden def. * sysdeps/htl/pt-key.h: Include <pthreadP.h>. * sysdeps/htl/pthreadP.h (_pthread_mutex_init, __pthread_cond_broadcast, __pthread_create, __pthread_detach, __pthread_exit, __pthread_key_create, __pthread_getspecific, __pthread_setspecific, __pthread_setcancelstate, __pthread_attr_getstackaddr, __pthread_attr_setstackaddr, __pthread_attr_getstacksize, __pthread_attr_setstacksize, __pthread_attr_setstack, ___pthread_get_cleanup_stack): New declarations. (__pthread_key_create, _pthread_mutex_init): New hidden declarations. * sysdeps/mach/hurd/htl/pt-attr-setstackaddr.c (pthread_attr_setstackaddr): Rename to __pthread_attr_setstackaddr. (pthread_attr_setstackaddr): New strong alias. * sysdeps/mach/hurd/htl/pt-attr-setstacksize.c (pthread_attr_setstacksize): Rename to __pthread_attr_setstacksize. (pthread_attr_setstacksize): New strong alias. * sysdeps/mach/hurd/htl/pt-docancel.c: Include <pthreadP.h>. (call_exit): Call __pthread_exit instead of pthread_exit. * sysdeps/mach/hurd/htl/pt-mutex-init.c: Include <pthreadP.h>. (_pthread_mutex_init): New hidden definition. * sysdeps/mach/hurd/htl/pt-sysdep.c: Include <pthreadP.h>. (_init_routine): Call __pthread_attr_init and __pthread_attr_setstack instead of pthread_attr_init and pthread_attr_setstack.
215 lines
5.9 KiB
C
215 lines
5.9 KiB
C
/* Allocate a new thread structure.
|
|
Copyright (C) 2000-2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <pt-internal.h>
|
|
|
|
/* This braindamage is necessary because the standard says that some
|
|
of the threads functions "shall fail" if "No thread could be found
|
|
corresponding to that specified by the given thread ID." */
|
|
|
|
/* Thread ID lookup table. */
|
|
struct __pthread **__pthread_threads;
|
|
|
|
/* The size of the thread ID lookup table. */
|
|
int __pthread_max_threads;
|
|
|
|
/* The total number of thread IDs currently in use, or on the list of
|
|
available thread IDs. */
|
|
int __pthread_num_threads;
|
|
|
|
/* A lock for the table, and the other variables above. */
|
|
pthread_rwlock_t __pthread_threads_lock;
|
|
|
|
/* List of thread structures corresponding to free thread IDs. */
|
|
struct __pthread *__pthread_free_threads;
|
|
pthread_mutex_t __pthread_free_threads_lock;
|
|
|
|
static inline error_t
|
|
initialize_pthread (struct __pthread *new)
|
|
{
|
|
error_t err;
|
|
|
|
err = __pthread_init_specific (new);
|
|
if (err)
|
|
return err;
|
|
|
|
new->nr_refs = 1;
|
|
new->cancel_lock = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
|
|
new->cancel_hook = NULL;
|
|
new->cancel_hook_arg = NULL;
|
|
new->cancel_state = PTHREAD_CANCEL_ENABLE;
|
|
new->cancel_type = PTHREAD_CANCEL_DEFERRED;
|
|
new->cancel_pending = 0;
|
|
|
|
new->state_lock = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
|
|
new->state_cond = (pthread_cond_t) PTHREAD_COND_INITIALIZER;
|
|
|
|
new->cancelation_handlers = 0;
|
|
|
|
memset (&new->res_state, '\0', sizeof (new->res_state));
|
|
|
|
new->tcb = NULL;
|
|
|
|
new->next = 0;
|
|
new->prevp = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Allocate a new thread structure and its pthread thread ID (but not
|
|
a kernel thread). */
|
|
int
|
|
__pthread_alloc (struct __pthread **pthread)
|
|
{
|
|
error_t err;
|
|
|
|
struct __pthread *new;
|
|
struct __pthread **threads;
|
|
struct __pthread **old_threads;
|
|
int max_threads;
|
|
int new_max_threads;
|
|
|
|
__pthread_mutex_lock (&__pthread_free_threads_lock);
|
|
for (new = __pthread_free_threads; new; new = new->next)
|
|
{
|
|
/* There is no need to take NEW->STATE_LOCK: if NEW is on this
|
|
list, then it is protected by __PTHREAD_FREE_THREADS_LOCK
|
|
except in __pthread_dealloc where after it is added to the
|
|
list (with the lock held), it drops the lock and then sets
|
|
NEW->STATE and immediately stops using NEW. */
|
|
if (new->state == PTHREAD_TERMINATED)
|
|
{
|
|
__pthread_dequeue (new);
|
|
break;
|
|
}
|
|
}
|
|
__pthread_mutex_unlock (&__pthread_free_threads_lock);
|
|
|
|
if (new)
|
|
{
|
|
if (new->tcb)
|
|
{
|
|
/* Drop old values */
|
|
_dl_deallocate_tls (new->tcb, 1);
|
|
}
|
|
|
|
err = initialize_pthread (new);
|
|
if (!err)
|
|
*pthread = new;
|
|
return err;
|
|
}
|
|
|
|
/* Allocate a new thread structure. */
|
|
new = malloc (sizeof (struct __pthread));
|
|
if (new == NULL)
|
|
return ENOMEM;
|
|
|
|
err = initialize_pthread (new);
|
|
if (err)
|
|
{
|
|
free (new);
|
|
return err;
|
|
}
|
|
|
|
retry:
|
|
__pthread_rwlock_wrlock (&__pthread_threads_lock);
|
|
|
|
if (__pthread_num_threads < __pthread_max_threads)
|
|
{
|
|
/* We have a free slot. Use the slot number plus one as the
|
|
thread ID for the new thread. */
|
|
new->thread = 1 + __pthread_num_threads++;
|
|
__pthread_threads[new->thread - 1] = NULL;
|
|
|
|
__pthread_rwlock_unlock (&__pthread_threads_lock);
|
|
|
|
*pthread = new;
|
|
return 0;
|
|
}
|
|
#ifdef PTHREAD_THREADS_MAX
|
|
else if (__pthread_num_threads >= PTHREAD_THREADS_MAX)
|
|
{
|
|
/* We have reached the limit on the number of threads per process. */
|
|
__pthread_rwlock_unlock (&__pthread_threads_lock);
|
|
|
|
free (new);
|
|
return EAGAIN;
|
|
}
|
|
#endif
|
|
|
|
/* We are going to enlarge the threads table. Save its current
|
|
size. We're going to release the lock before doing the necessary
|
|
memory allocation, since that's a potentially blocking operation. */
|
|
max_threads = __pthread_max_threads;
|
|
|
|
__pthread_rwlock_unlock (&__pthread_threads_lock);
|
|
|
|
/* Allocate a new lookup table that's twice as large. */
|
|
new_max_threads
|
|
= max_threads > 0 ? max_threads * 2 : _POSIX_THREAD_THREADS_MAX;
|
|
threads = malloc (new_max_threads * sizeof (struct __pthread *));
|
|
if (threads == NULL)
|
|
{
|
|
free (new);
|
|
return ENOMEM;
|
|
}
|
|
|
|
__pthread_rwlock_wrlock (&__pthread_threads_lock);
|
|
|
|
/* Check if nobody else has already enlarged the table. */
|
|
if (max_threads != __pthread_max_threads)
|
|
{
|
|
/* Yep, they did. */
|
|
__pthread_rwlock_unlock (&__pthread_threads_lock);
|
|
|
|
/* Free the newly allocated table and try again to allocate a slot. */
|
|
free (threads);
|
|
goto retry;
|
|
}
|
|
|
|
/* Copy over the contents of the old table. */
|
|
memcpy (threads, __pthread_threads,
|
|
__pthread_max_threads * sizeof (struct __pthread *));
|
|
|
|
/* Save the location of the old table. We want to deallocate its
|
|
storage after we released the lock. */
|
|
old_threads = __pthread_threads;
|
|
|
|
/* Replace the table with the new one. */
|
|
__pthread_max_threads = new_max_threads;
|
|
__pthread_threads = threads;
|
|
|
|
/* And allocate ourselves one of the newly created slots. */
|
|
new->thread = 1 + __pthread_num_threads++;
|
|
__pthread_threads[new->thread - 1] = NULL;
|
|
|
|
__pthread_rwlock_unlock (&__pthread_threads_lock);
|
|
|
|
free (old_threads);
|
|
|
|
*pthread = new;
|
|
return 0;
|
|
}
|