re PR target/18444 (Multithreading broken on Unix95-class platforms)
PR target/18444 * configure.ac (threading): Accept 'posix95'. * configure: Regenerate. * config.gcc (i[34567]86-*-solaris2*): On Solaris up to 2.6, include sol26.h and default to posix95 threads if have_pthread_h. (sparc-*-solaris2*): Likewise. * gthr.h: Include gthr-posix95.h if _PTHREADS95 is defined. * gthr-posix95.h: New file. * config/sol26.h: New file. * doc/install.texi (--enable-threads): Document 'posix95'. From-SVN: r91041
This commit is contained in:
parent
515a179197
commit
181674429b
|
@ -1,3 +1,16 @@
|
|||
2004-11-22 Eric Botcazou <ebotcazou@libertysurf.fr>
|
||||
|
||||
PR target/18444
|
||||
* configure.ac (threading): Accept 'posix95'.
|
||||
* configure: Regenerate.
|
||||
* config.gcc (i[34567]86-*-solaris2*): On Solaris up to 2.6,
|
||||
include sol26.h and default to posix95 threads if have_pthread_h.
|
||||
(sparc-*-solaris2*): Likewise.
|
||||
* gthr.h: Include gthr-posix95.h if _PTHREADS95 is defined.
|
||||
* gthr-posix95.h: New file.
|
||||
* config/sol26.h: New file.
|
||||
* doc/install.texi (--enable-threads): Document 'posix95'.
|
||||
|
||||
2004-11-23 Ben Elliston <bje@au.ibm.com>
|
||||
|
||||
* pointer-set.h (pointer_set_contains): Remove.
|
||||
|
|
|
@ -1012,7 +1012,12 @@ i[34567]86-*-sco3.2v5*) # 80386 running SCO Open Server 5
|
|||
;;
|
||||
i[34567]86-*-solaris2*)
|
||||
xm_defines="SMALL_ARG_MAX"
|
||||
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h i386/sol2.h"
|
||||
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
|
||||
case ${target} in
|
||||
*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
|
||||
tm_file="${tm_file} sol26.h"
|
||||
esac
|
||||
tm_file="${tm_file} i386/sol2.h"
|
||||
tmake_file="t-sol2 i386/t-sol2 t-svr4"
|
||||
c_target_objs="sol2-c.o"
|
||||
cxx_target_objs="sol2-c.o"
|
||||
|
@ -1044,8 +1049,19 @@ i[34567]86-*-solaris2*)
|
|||
;;
|
||||
esac
|
||||
case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
|
||||
"":yes:* | yes:yes:* ) thread_file=posix ;;
|
||||
"":*:yes | yes:*:yes ) thread_file=solaris ;;
|
||||
"":yes:* | yes:yes:* )
|
||||
case ${target} in
|
||||
*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
|
||||
thread_file=posix95
|
||||
;;
|
||||
*)
|
||||
thread_file=posix
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"":*:yes | yes:*:yes )
|
||||
thread_file=solaris
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
i[34567]86-*-sysv5*) # Intel x86 on System V Release 5
|
||||
|
@ -1902,7 +1918,12 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
|
|||
need_64bit_hwint=yes
|
||||
;;
|
||||
sparc-*-solaris2*)
|
||||
tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h"
|
||||
tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
|
||||
case ${target} in
|
||||
*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
|
||||
tm_file="${tm_file} sol26.h"
|
||||
esac
|
||||
tm_file="${tm_file} sparc/sol2.h"
|
||||
if test x$gnu_ld = xyes; then
|
||||
tm_file="${tm_file} sparc/sol2-gld.h"
|
||||
fi
|
||||
|
@ -1939,8 +1960,19 @@ sparc-*-solaris2*)
|
|||
tm_p_file="${tm_p_file} sol2-protos.h"
|
||||
extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
|
||||
case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
|
||||
"":yes:* | yes:yes:* ) thread_file=posix ;;
|
||||
"":*:yes | yes:*:yes ) thread_file=solaris ;;
|
||||
"":yes:* | yes:yes:* )
|
||||
case ${target} in
|
||||
*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
|
||||
thread_file=posix95
|
||||
;;
|
||||
*)
|
||||
thread_file=posix
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
"":*:yes | yes:*:yes )
|
||||
thread_file=solaris
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
sparc-*-sysv4*)
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
/* Operating system specific defines to be used when targeting GCC for any
|
||||
Solaris 2 system up to Solaris 2.6.
|
||||
Copyright 2004 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GCC.
|
||||
|
||||
GCC is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
GCC 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#undef CPP_SUBTARGET_SPEC
|
||||
#define CPP_SUBTARGET_SPEC "\
|
||||
%{pthreads:-D_REENTRANT -D_PTHREADS95} \
|
||||
%{!pthreads:%{threads:-D_REENTRANT -D_SOLARIS_THREADS}} \
|
||||
%{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude} \
|
||||
"
|
|
@ -11976,7 +11976,7 @@ case ${enable_threads} in
|
|||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
aix | dce | gnat | irix | posix | rtems | \
|
||||
aix | dce | gnat | irix | posix | posix95 | rtems | \
|
||||
single | solaris | vxworks | win32 )
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
|
|
|
@ -1266,7 +1266,7 @@ case ${enable_threads} in
|
|||
# default
|
||||
target_thread_file='single'
|
||||
;;
|
||||
aix | dce | gnat | irix | posix | rtems | \
|
||||
aix | dce | gnat | irix | posix | posix95 | rtems | \
|
||||
single | solaris | vxworks | win32 )
|
||||
target_thread_file=${enable_threads}
|
||||
;;
|
||||
|
|
|
@ -926,7 +926,9 @@ missing and thus this setting will cause a known bootstrap failure.)
|
|||
@item no
|
||||
This is an alias for @samp{single}.
|
||||
@item posix
|
||||
Generic POSIX thread support.
|
||||
Generic POSIX/Unix98 thread support.
|
||||
@item posix95
|
||||
Generic POSIX/Unix95 thread support.
|
||||
@item rtems
|
||||
RTEMS thread support.
|
||||
@item single
|
||||
|
|
|
@ -0,0 +1,592 @@
|
|||
/* Threads compatibility routines for libgcc2 and libobjc. */
|
||||
/* Compile this one with gcc. */
|
||||
/* Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GCC.
|
||||
|
||||
GCC is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free
|
||||
Software Foundation; either version 2, or (at your option) any later
|
||||
version.
|
||||
|
||||
GCC 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 General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA. */
|
||||
|
||||
/* As a special exception, if you link this library with other files,
|
||||
some of which are compiled with GCC, to produce an executable,
|
||||
this library does not by itself cause the resulting executable
|
||||
to be covered by the GNU General Public License.
|
||||
This exception does not however invalidate any other reasons why
|
||||
the executable file might be covered by the GNU General Public License. */
|
||||
|
||||
#ifndef GCC_GTHR_POSIX_H
|
||||
#define GCC_GTHR_POSIX_H
|
||||
|
||||
/* POSIX threads specific definitions.
|
||||
Easy, since the interface is just one-to-one mapping. */
|
||||
|
||||
#define __GTHREADS 1
|
||||
|
||||
/* Some implementations of <pthread.h> require this to be defined. */
|
||||
#ifndef _REENTRANT
|
||||
#define _REENTRANT 1
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
|
||||
typedef pthread_key_t __gthread_key_t;
|
||||
typedef pthread_once_t __gthread_once_t;
|
||||
typedef pthread_mutex_t __gthread_mutex_t;
|
||||
|
||||
typedef struct {
|
||||
long depth;
|
||||
pthread_t owner;
|
||||
pthread_mutex_t actual;
|
||||
} __gthread_recursive_mutex_t;
|
||||
|
||||
#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
|
||||
#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
|
||||
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
|
||||
|
||||
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
|
||||
|
||||
#pragma weak pthread_once
|
||||
#pragma weak pthread_key_create
|
||||
#pragma weak pthread_key_delete
|
||||
#pragma weak pthread_getspecific
|
||||
#pragma weak pthread_setspecific
|
||||
#pragma weak pthread_create
|
||||
#pragma weak pthread_self
|
||||
|
||||
#pragma weak pthread_mutex_lock
|
||||
#pragma weak pthread_mutex_trylock
|
||||
#pragma weak pthread_mutex_unlock
|
||||
#pragma weak pthread_mutexattr_init
|
||||
#pragma weak pthread_mutexattr_settype
|
||||
#pragma weak pthread_mutexattr_destroy
|
||||
|
||||
#pragma weak pthread_mutex_init
|
||||
|
||||
#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
|
||||
/* Objective-C. */
|
||||
#pragma weak pthread_cond_broadcast
|
||||
#pragma weak pthread_cond_destroy
|
||||
#pragma weak pthread_cond_init
|
||||
#pragma weak pthread_cond_signal
|
||||
#pragma weak pthread_cond_wait
|
||||
#pragma weak pthread_exit
|
||||
#pragma weak pthread_mutex_destroy
|
||||
#pragma weak pthread_self
|
||||
#ifdef _POSIX_PRIORITY_SCHEDULING
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
#pragma weak sched_get_priority_max
|
||||
#pragma weak sched_get_priority_min
|
||||
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
|
||||
#endif /* _POSIX_PRIORITY_SCHEDULING */
|
||||
#pragma weak sched_yield
|
||||
#pragma weak pthread_attr_destroy
|
||||
#pragma weak pthread_attr_init
|
||||
#pragma weak pthread_attr_setdetachstate
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
#pragma weak pthread_getschedparam
|
||||
#pragma weak pthread_setschedparam
|
||||
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
|
||||
#endif /* _LIBOBJC || _LIBOBJC_WEAK */
|
||||
|
||||
static inline int
|
||||
__gthread_active_p (void)
|
||||
{
|
||||
static void *const __gthread_active_ptr
|
||||
= __extension__ (void *) &pthread_create;
|
||||
return __gthread_active_ptr != 0;
|
||||
}
|
||||
|
||||
#else /* not SUPPORTS_WEAK */
|
||||
|
||||
static inline int
|
||||
__gthread_active_p (void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif /* SUPPORTS_WEAK */
|
||||
|
||||
#ifdef _LIBOBJC
|
||||
|
||||
/* This is the config.h file in libobjc/ */
|
||||
#include <config.h>
|
||||
|
||||
#ifdef HAVE_SCHED_H
|
||||
# include <sched.h>
|
||||
#endif
|
||||
|
||||
/* Key structure for maintaining thread specific storage */
|
||||
static pthread_key_t _objc_thread_storage;
|
||||
static pthread_attr_t _objc_thread_attribs;
|
||||
|
||||
/* Thread local storage for a single thread */
|
||||
static void *thread_local_storage = NULL;
|
||||
|
||||
/* Backend initialization functions */
|
||||
|
||||
/* Initialize the threads subsystem. */
|
||||
static inline int
|
||||
__gthread_objc_init_thread_system (void)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
/* Initialize the thread storage key. */
|
||||
if (pthread_key_create (&_objc_thread_storage, NULL) == 0)
|
||||
{
|
||||
/* The normal default detach state for threads is
|
||||
* PTHREAD_CREATE_JOINABLE which causes threads to not die
|
||||
* when you think they should. */
|
||||
if (pthread_attr_init (&_objc_thread_attribs) == 0
|
||||
&& pthread_attr_setdetachstate (&_objc_thread_attribs,
|
||||
PTHREAD_CREATE_DETACHED) == 0)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Close the threads subsystem. */
|
||||
static inline int
|
||||
__gthread_objc_close_thread_system (void)
|
||||
{
|
||||
if (__gthread_active_p ()
|
||||
&& pthread_key_delete (_objc_thread_storage) == 0
|
||||
&& pthread_attr_destroy (&_objc_thread_attribs) == 0)
|
||||
return 0;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Backend thread functions */
|
||||
|
||||
/* Create a new thread of execution. */
|
||||
static inline objc_thread_t
|
||||
__gthread_objc_thread_detach (void (*func)(void *), void *arg)
|
||||
{
|
||||
objc_thread_t thread_id;
|
||||
pthread_t new_thread_handle;
|
||||
|
||||
if (!__gthread_active_p ())
|
||||
return NULL;
|
||||
|
||||
if (!(pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
|
||||
thread_id = (objc_thread_t) new_thread_handle;
|
||||
else
|
||||
thread_id = NULL;
|
||||
|
||||
return thread_id;
|
||||
}
|
||||
|
||||
/* Set the current thread's priority. */
|
||||
static inline int
|
||||
__gthread_objc_thread_set_priority (int priority)
|
||||
{
|
||||
if (!__gthread_active_p ())
|
||||
return -1;
|
||||
else
|
||||
{
|
||||
#ifdef _POSIX_PRIORITY_SCHEDULING
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
pthread_t thread_id = pthread_self ();
|
||||
int policy;
|
||||
struct sched_param params;
|
||||
int priority_min, priority_max;
|
||||
|
||||
if (pthread_getschedparam (thread_id, &policy, ¶ms) == 0)
|
||||
{
|
||||
if ((priority_max = sched_get_priority_max (policy)) == -1)
|
||||
return -1;
|
||||
|
||||
if ((priority_min = sched_get_priority_min (policy)) == -1)
|
||||
return -1;
|
||||
|
||||
if (priority > priority_max)
|
||||
priority = priority_max;
|
||||
else if (priority < priority_min)
|
||||
priority = priority_min;
|
||||
params.sched_priority = priority;
|
||||
|
||||
/*
|
||||
* The solaris 7 and several other man pages incorrectly state that
|
||||
* this should be a pointer to policy but pthread.h is universally
|
||||
* at odds with this.
|
||||
*/
|
||||
if (pthread_setschedparam (thread_id, policy, ¶ms) == 0)
|
||||
return 0;
|
||||
}
|
||||
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
|
||||
#endif /* _POSIX_PRIORITY_SCHEDULING */
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Return the current thread's priority. */
|
||||
static inline int
|
||||
__gthread_objc_thread_get_priority (void)
|
||||
{
|
||||
#ifdef _POSIX_PRIORITY_SCHEDULING
|
||||
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
int policy;
|
||||
struct sched_param params;
|
||||
|
||||
if (pthread_getschedparam (pthread_self (), &policy, ¶ms) == 0)
|
||||
return params.sched_priority;
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
else
|
||||
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
|
||||
#endif /* _POSIX_PRIORITY_SCHEDULING */
|
||||
return OBJC_THREAD_INTERACTIVE_PRIORITY;
|
||||
}
|
||||
|
||||
/* Yield our process time to another thread. */
|
||||
static inline void
|
||||
__gthread_objc_thread_yield (void)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
sched_yield ();
|
||||
}
|
||||
|
||||
/* Terminate the current thread. */
|
||||
static inline int
|
||||
__gthread_objc_thread_exit (void)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
/* exit the thread */
|
||||
pthread_exit (&__objc_thread_exit_status);
|
||||
|
||||
/* Failed if we reached here */
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Returns an integer value which uniquely describes a thread. */
|
||||
static inline objc_thread_t
|
||||
__gthread_objc_thread_id (void)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return (objc_thread_t) pthread_self ();
|
||||
else
|
||||
return (objc_thread_t) 1;
|
||||
}
|
||||
|
||||
/* Sets the thread's local storage pointer. */
|
||||
static inline int
|
||||
__gthread_objc_thread_set_data (void *value)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_setspecific (_objc_thread_storage, value);
|
||||
else
|
||||
{
|
||||
thread_local_storage = value;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Returns the thread's local storage pointer. */
|
||||
static inline void *
|
||||
__gthread_objc_thread_get_data (void)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_getspecific (_objc_thread_storage);
|
||||
else
|
||||
return thread_local_storage;
|
||||
}
|
||||
|
||||
/* Backend mutex functions */
|
||||
|
||||
/* Allocate a mutex. */
|
||||
static inline int
|
||||
__gthread_objc_mutex_allocate (objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
|
||||
|
||||
if (pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
|
||||
{
|
||||
objc_free (mutex->backend);
|
||||
mutex->backend = NULL;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Deallocate a mutex. */
|
||||
static inline int
|
||||
__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
int count;
|
||||
|
||||
/*
|
||||
* Posix Threads specifically require that the thread be unlocked
|
||||
* for pthread_mutex_destroy to work.
|
||||
*/
|
||||
|
||||
do
|
||||
{
|
||||
count = pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
|
||||
if (count < 0)
|
||||
return -1;
|
||||
}
|
||||
while (count);
|
||||
|
||||
if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
|
||||
return -1;
|
||||
|
||||
objc_free (mutex->backend);
|
||||
mutex->backend = NULL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Grab a lock on a mutex. */
|
||||
static inline int
|
||||
__gthread_objc_mutex_lock (objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ()
|
||||
&& pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Try to grab a lock on a mutex. */
|
||||
static inline int
|
||||
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ()
|
||||
&& pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Unlock the mutex */
|
||||
static inline int
|
||||
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ()
|
||||
&& pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Backend condition mutex functions */
|
||||
|
||||
/* Allocate a condition. */
|
||||
static inline int
|
||||
__gthread_objc_condition_allocate (objc_condition_t condition)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
condition->backend = objc_malloc (sizeof (pthread_cond_t));
|
||||
|
||||
if (pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
|
||||
{
|
||||
objc_free (condition->backend);
|
||||
condition->backend = NULL;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Deallocate a condition. */
|
||||
static inline int
|
||||
__gthread_objc_condition_deallocate (objc_condition_t condition)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
if (pthread_cond_destroy ((pthread_cond_t *) condition->backend))
|
||||
return -1;
|
||||
|
||||
objc_free (condition->backend);
|
||||
condition->backend = NULL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Wait on the condition */
|
||||
static inline int
|
||||
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_cond_wait ((pthread_cond_t *) condition->backend,
|
||||
(pthread_mutex_t *) mutex->backend);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Wake up all threads waiting on this condition. */
|
||||
static inline int
|
||||
__gthread_objc_condition_broadcast (objc_condition_t condition)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Wake up one thread waiting on this condition. */
|
||||
static inline int
|
||||
__gthread_objc_condition_signal (objc_condition_t condition)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_cond_signal ((pthread_cond_t *) condition->backend);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
#else /* _LIBOBJC */
|
||||
|
||||
static inline int
|
||||
__gthread_once (__gthread_once_t *once, void (*func) (void))
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_once (once, func);
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
|
||||
{
|
||||
return pthread_key_create (key, dtor);
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_key_delete (__gthread_key_t key)
|
||||
{
|
||||
return pthread_key_delete (key);
|
||||
}
|
||||
|
||||
static inline void *
|
||||
__gthread_getspecific (__gthread_key_t key)
|
||||
{
|
||||
return pthread_getspecific (key);
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_setspecific (__gthread_key_t key, const void *ptr)
|
||||
{
|
||||
return pthread_setspecific (key, ptr);
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_mutex_lock (__gthread_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_mutex_lock (mutex);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_mutex_trylock (mutex);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
return pthread_mutex_unlock (mutex);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
|
||||
{
|
||||
mutex->depth = 0;
|
||||
mutex->owner = (pthread_t) 0;
|
||||
return pthread_mutex_init (&mutex->actual, NULL);
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
pthread_t me = pthread_self ();
|
||||
|
||||
if (mutex->owner != me)
|
||||
{
|
||||
pthread_mutex_lock (&mutex->actual);
|
||||
mutex->owner = me;
|
||||
}
|
||||
|
||||
mutex->depth++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
pthread_t me = pthread_self ();
|
||||
|
||||
if (mutex->owner != me)
|
||||
{
|
||||
if (pthread_mutex_trylock (&mutex->actual))
|
||||
return 1;
|
||||
mutex->owner = me;
|
||||
}
|
||||
|
||||
mutex->depth++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
|
||||
{
|
||||
if (__gthread_active_p ())
|
||||
{
|
||||
if (--mutex->depth == 0)
|
||||
{
|
||||
mutex->owner = (pthread_t) 0;
|
||||
pthread_mutex_unlock (&mutex->actual);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* _LIBOBJC */
|
||||
|
||||
#endif /* ! GCC_GTHR_POSIX_H */
|
|
@ -83,7 +83,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|||
number. If the operation is not supported, -1 is returned.
|
||||
|
||||
Currently supported threads packages are
|
||||
POSIX threads with -D_PTHREADS
|
||||
TPF threads with -D__tpf__
|
||||
POSIX/Unix98 threads with -D_PTHREADS
|
||||
POSIX/Unix95 threads with -D_PTHREADS95
|
||||
DCE threads with -D_DCE_THREADS
|
||||
Solaris/UI threads with -D_SOLARIS_THREADS
|
||||
*/
|
||||
|
@ -93,6 +95,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|||
#include "gthr-tpf.h"
|
||||
#elif _PTHREADS
|
||||
#include "gthr-posix.h"
|
||||
#elif _PTHREADS95
|
||||
#include "gthr-posix95.h"
|
||||
#elif _DCE_THREADS
|
||||
#include "gthr-dce.h"
|
||||
#elif _SOLARIS_THREADS
|
||||
|
|
Loading…
Reference in New Issue