X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-posix95.h;h=2b26f2da59dc44492ee0add652c3f31e49451a0a;hb=3b0273a198fcdb889f70f2a3c15896dba429e852;hp=625f799e8fc04665e20026ecadda38f0945c2aa3;hpb=7123966132d502ba070fe21d914a418482a75ce9;p=pf3gnuchains%2Fgcc-fork.git
diff --git a/gcc/gthr-posix95.h b/gcc/gthr-posix95.h
index 625f799e8fc..2b26f2da59d 100644
--- a/gcc/gthr-posix95.h
+++ b/gcc/gthr-posix95.h
@@ -1,12 +1,12 @@
/* Threads compatibility routines for libgcc2 and libobjc. */
/* Compile this one with gcc. */
-/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007, 2008, 2009 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
+Software Foundation; either version 3, or (at your option) any later
version.
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14,17 +14,14 @@ 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, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
-/* 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. */
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+. */
#ifndef GCC_GTHR_POSIX_H
#define GCC_GTHR_POSIX_H
@@ -121,9 +118,12 @@ __gthrw(pthread_setschedparam)
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
we need to play the usual game with weak symbols. On Solaris 10 and up, a
- working interface is always exposed. */
+ working interface is always exposed. On FreeBSD 6 and later, libc also
+ exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
+ to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
+ which means the alternate __gthread_active_p below cannot be used there. */
-#if defined(__sun) && defined(__svr4__)
+#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
static volatile int __gthread_active = -1;
@@ -166,17 +166,17 @@ __gthread_active_p (void)
return __gthread_active_latest_value != 0;
}
-#else /* not Solaris */
+#else /* neither FreeBSD nor Solaris */
static inline int
__gthread_active_p (void)
{
- static void *const __gthread_active_ptr
+ static void *const __gthread_active_ptr
= __extension__ (void *) &__gthrw_(pthread_cancel);
return __gthread_active_ptr != 0;
}
-#endif /* Solaris */
+#endif /* FreeBSD or Solaris */
#else /* not SUPPORTS_WEAK */
@@ -184,61 +184,34 @@ __gthread_active_p (void)
calls in shared flavors of the HP-UX C library. Most of the stubs
have no functionality. The details are described in the "libc cumulative
patch" for each subversion of HP-UX 11. There are two special interfaces
- provided for checking whether an application is linked to a pthread
+ provided for checking whether an application is linked to a shared pthread
library or not. However, these interfaces aren't available in early
- libc versions. We also can't use pthread_once as some libc versions
- call the init function. So, we use pthread_create to check whether it
- is possible to create a thread or not. The stub implementation returns
- the error number ENOSYS. */
+ pthread libraries. We also need a test that works for archive
+ libraries. We can't use pthread_once as some libc versions call the
+ init function. We also can't use pthread_create or pthread_attr_init
+ as these create a thread and thereby prevent changing the default stack
+ size. The function pthread_default_stacksize_np is available in both
+ the archive and shared versions of libpthread. It can be used to
+ determine the default pthread stack size. There is a stub in some
+ shared libc versions which returns a zero size if pthreads are not
+ active. We provide an equivalent stub to handle cases where libc
+ doesn't provide one. */
#if defined(__hppa__) && defined(__hpux__)
-#include
-
static volatile int __gthread_active = -1;
-static void *
-__gthread_start (void *arg __attribute__((unused)))
-{
- return NULL;
-}
-
-static void __gthread_active_init (void) __attribute__((noinline));
-static void
-__gthread_active_init (void)
-{
- static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_t t;
- pthread_attr_t a;
- int result;
-
- __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
- if (__gthread_active < 0)
- {
- __gthrw_(pthread_attr_init) (&a);
- __gthrw_(pthread_attr_setdetachstate) (&a, PTHREAD_CREATE_DETACHED);
- result = __gthrw_(pthread_create) (&t, &a, __gthread_start, NULL);
- if (result != ENOSYS)
- __gthread_active = 1;
- else
- __gthread_active = 0;
- __gthrw_(pthread_attr_destroy) (&a);
- }
- __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
-}
-
static inline int
__gthread_active_p (void)
{
/* Avoid reading __gthread_active twice on the main code path. */
int __gthread_active_latest_value = __gthread_active;
+ size_t __s;
- /* This test is not protected to avoid taking a lock on the main code
- path so every update of __gthread_active in a threaded program must
- be atomic with regard to the result of the test. */
if (__builtin_expect (__gthread_active_latest_value < 0, 0))
{
- __gthread_active_init ();
+ pthread_default_stacksize_np (0, &__s);
+ __gthread_active = __s ? 1 : 0;
__gthread_active_latest_value = __gthread_active;
}
@@ -607,150 +580,150 @@ __gthread_objc_condition_signal (objc_condition_t condition)
#else /* _LIBOBJC */
static inline int
-__gthread_once (__gthread_once_t *once, void (*func) (void))
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))
{
if (__gthread_active_p ())
- return __gthrw_(pthread_once) (once, func);
+ return __gthrw_(pthread_once) (__once, __func);
else
return -1;
}
static inline int
-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
{
- return __gthrw_(pthread_key_create) (key, dtor);
+ return __gthrw_(pthread_key_create) (__key, __dtor);
}
static inline int
-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (__gthread_key_t __key)
{
- return __gthrw_(pthread_key_delete) (key);
+ return __gthrw_(pthread_key_delete) (__key);
}
static inline void *
-__gthread_getspecific (__gthread_key_t key)
+__gthread_getspecific (__gthread_key_t __key)
{
- return __gthrw_(pthread_getspecific) (key);
+ return __gthrw_(pthread_getspecific) (__key);
}
static inline int
-__gthread_setspecific (__gthread_key_t key, const void *ptr)
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
{
- return __gthrw_(pthread_setspecific) (key, ptr);
+ return __gthrw_(pthread_setspecific) (__key, __ptr);
}
static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *mutex)
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
{
if (__gthread_active_p ())
- return __gthrw_(pthread_mutex_destroy) (mutex);
+ return __gthrw_(pthread_mutex_destroy) (__mutex);
else
return 0;
}
static inline int
-__gthread_mutex_lock (__gthread_mutex_t *mutex)
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)
{
if (__gthread_active_p ())
- return __gthrw_(pthread_mutex_lock) (mutex);
+ return __gthrw_(pthread_mutex_lock) (__mutex);
else
return 0;
}
static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
{
if (__gthread_active_p ())
- return __gthrw_(pthread_mutex_trylock) (mutex);
+ return __gthrw_(pthread_mutex_trylock) (__mutex);
else
return 0;
}
static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
{
if (__gthread_active_p ())
- return __gthrw_(pthread_mutex_unlock) (mutex);
+ return __gthrw_(pthread_mutex_unlock) (__mutex);
else
return 0;
}
static inline int
-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
{
- mutex->depth = 0;
- mutex->owner = (pthread_t) 0;
- return __gthrw_(pthread_mutex_init) (&mutex->actual, NULL);
+ __mutex->depth = 0;
+ __mutex->owner = (pthread_t) 0;
+ return __gthrw_(pthread_mutex_init) (&__mutex->actual, NULL);
}
static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
{
if (__gthread_active_p ())
{
- pthread_t me = __gthrw_(pthread_self) ();
+ pthread_t __me = __gthrw_(pthread_self) ();
- if (mutex->owner != me)
+ if (__mutex->owner != __me)
{
- __gthrw_(pthread_mutex_lock) (&mutex->actual);
- mutex->owner = me;
+ __gthrw_(pthread_mutex_lock) (&__mutex->actual);
+ __mutex->owner = __me;
}
- mutex->depth++;
+ __mutex->depth++;
}
return 0;
}
static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
{
if (__gthread_active_p ())
{
- pthread_t me = __gthrw_(pthread_self) ();
+ pthread_t __me = __gthrw_(pthread_self) ();
- if (mutex->owner != me)
+ if (__mutex->owner != __me)
{
- if (__gthrw_(pthread_mutex_trylock) (&mutex->actual))
+ if (__gthrw_(pthread_mutex_trylock) (&__mutex->actual))
return 1;
- mutex->owner = me;
+ __mutex->owner = __me;
}
- mutex->depth++;
+ __mutex->depth++;
}
return 0;
}
static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
{
if (__gthread_active_p ())
{
- if (--mutex->depth == 0)
+ if (--__mutex->depth == 0)
{
- mutex->owner = (pthread_t) 0;
- __gthrw_(pthread_mutex_unlock) (&mutex->actual);
+ __mutex->owner = (pthread_t) 0;
+ __gthrw_(pthread_mutex_unlock) (&__mutex->actual);
}
}
return 0;
}
static inline int
-__gthread_cond_broadcast (__gthread_cond_t *cond)
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
{
- return __gthrw_(pthread_cond_broadcast) (cond);
+ return __gthrw_(pthread_cond_broadcast) (__cond);
}
static inline int
-__gthread_cond_wait (__gthread_cond_t *cond, __gthread_mutex_t *mutex)
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
{
- return __gthrw_(pthread_cond_wait) (cond, mutex);
+ return __gthrw_(pthread_cond_wait) (__cond, __mutex);
}
static inline int
-__gthread_cond_wait_recursive (__gthread_cond_t *cond,
- __gthread_recursive_mutex_t *mutex)
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
+ __gthread_recursive_mutex_t *__mutex)
{
- return __gthrw_(pthread_cond_wait) (cond, mutex->actual);
+ return __gthrw_(pthread_cond_wait) (__cond, &__mutex->actual);
}
#endif /* _LIBOBJC */