OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libfortran/35063 (Clean up use of destroy_unit_mutex()) 

gcc:

2008-03-01  Janne Blomqvist  <jb@gcc.gnu.org>

	PR gcc/35063
	* gthr.h: Add __gthread_mutex_destroy as a function that must be
	implemented.
	* gthr-vxworks.h (__gthread_mutex_destroy): Null implementation.
	* gthr-single.h (__gthread_mutex_destroy): Likewise.
	* gthr-rtems.h (__gthread_mutex_destroy): Likewise.
	* gthr-mipssde.h (__gthread_mutex_destroy): Likewise.
	* gthr-nks.h (__gthread_mutex_destroy): Likewise.
	* gthr-solaris.h (__gthread_mutex_destroy): Call mutex_destroy.
	* gthr-win32.h (__GTHREAD_MUTEX_DESTROY_FUNCTION): Remove.
	(__gthread_mutex_destroy_function): Rename to
	__gthread_mutex_destroy.
	* gthr-dce.h (__gthread_mutex_destroy): Call
	pthread_mutex_destroy.
	* gthr-tpf.h (__gthread_mutex_destroy): Likewise.
	* gthr-posix.h (__gthread_mutex_destroy): Likewise.
	* gthr-posix95.h (__gthread_mutex_destroy): Likewise.


libgfortran:

2008-03-01  Janne Blomqvist  <jb@gcc.gnu.org>

	PR libfortran/35063
	* io/unit.c (destroy_unit_mutex): Call __gthread_mutex_destroy
	instead of macro kludge.

From-SVN: r132800
This commit is contained in:
Janne Blomqvist 2008-03-01 12:46:31 +02:00
parent 63642d5a8d
commit 4dabf73695
15 changed files with 111 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc/ChangeLog
View File

@ -1,3 +1,23 @@
2008-03-01 Janne Blomqvist <jb@gcc.gnu.org>
PR gcc/35063
* gthr.h: Add __gthread_mutex_destroy as a function that must be
implemented.
* gthr-vxworks.h (__gthread_mutex_destroy): Null implementation.
* gthr-single.h (__gthread_mutex_destroy): Likewise.
* gthr-rtems.h (__gthread_mutex_destroy): Likewise.
* gthr-mipssde.h (__gthread_mutex_destroy): Likewise.
* gthr-nks.h (__gthread_mutex_destroy): Likewise.
* gthr-solaris.h (__gthread_mutex_destroy): Call mutex_destroy.
* gthr-win32.h (__GTHREAD_MUTEX_DESTROY_FUNCTION): Remove.
(__gthread_mutex_destroy_function): Rename to
__gthread_mutex_destroy.
* gthr-dce.h (__gthread_mutex_destroy): Call
pthread_mutex_destroy.
* gthr-tpf.h (__gthread_mutex_destroy): Likewise.
* gthr-posix.h (__gthread_mutex_destroy): Likewise.
* gthr-posix95.h (__gthread_mutex_destroy): Likewise.
2008-03-01 Alexandre Oliva <aoliva@redhat.com>
* df-scan.c (df_ref_chain_change_bb): Simplify.

10
gcc/gthr-dce.h
View File

@ -71,6 +71,7 @@ __gthrw(pthread_getspecific)
__gthrw(pthread_setspecific)
__gthrw(pthread_create)
__gthrw(pthread_mutex_init)
__gthrw(pthread_mutex_destroy)
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
@ -474,6 +475,15 @@ __gthread_mutex_init_function (__gthread_mutex_t *mutex)
__gthrw_(pthread_mutex_init) (mutex, pthread_mutexattr_default);
}
static inline int
__gthread_mutx_destroy (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_(pthread_mutex_destroy) (mutex);
else
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

6
gcc/gthr-mipssde.h
View File

@ -134,6 +134,12 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return __gthrw_(__sdethread_setspecific) (key, ptr);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

6
gcc/gthr-nks.h
View File

@ -341,6 +341,12 @@ __gthread_mutex_init_function (__gthread_mutex_t *mutex)
*mutex = NXMutexAlloc (0, 0, &info);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

11
gcc/gthr-posix.h
View File

@ -94,6 +94,7 @@ __gthrw3(pthread_mutex_lock)
__gthrw3(pthread_mutex_trylock)
__gthrw3(pthread_mutex_unlock)
__gthrw3(pthread_mutex_init)
__gthrw3(pthread_mutex_destroy)
__gthrw3(pthread_cond_broadcast)
__gthrw3(pthread_cond_wait)
#else
@ -106,6 +107,7 @@ __gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
__gthrw(pthread_mutex_init)
__gthrw(pthread_mutex_destroy)
__gthrw(pthread_cond_broadcast)
__gthrw(pthread_cond_wait)
#endif
@ -676,6 +678,15 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return __gthrw_(pthread_setspecific) (key, ptr);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_(pthread_mutex_destroy) (mutex);
else
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

12
gcc/gthr-posix95.h
View File

@ -80,13 +80,14 @@ __gthrw(pthread_create)
__gthrw(pthread_cancel)
__gthrw(pthread_self)
__gthrw(pthread_mutex_init)
__gthrw(pthread_mutex_destroy)
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
__gthrw(pthread_mutexattr_init)
__gthrw(pthread_mutexattr_destroy)
__gthrw(pthread_mutex_init)
__gthrw(pthread_cond_broadcast)
__gthrw(pthread_cond_wait)
@ -639,6 +640,15 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return __gthrw_(pthread_setspecific) (key, ptr);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_(pthread_mutex_destroy) (mutex);
else
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

6
gcc/gthr-rtems.h
View File

@ -110,6 +110,12 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return rtems_gxx_setspecific (key, ptr);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

6
gcc/gthr-single.h
View File

@ -215,6 +215,12 @@ __gthread_active_p (void)
return 0;
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t * UNUSED(mutex))
{

9
gcc/gthr-solaris.h
View File

@ -461,6 +461,15 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return __gthrw_(thr_setspecific) (key, (void *) ptr);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
if (__gthread_active_p ())
return __gthrw_(mutex_destroy) (mutex);
else
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

10
gcc/gthr-tpf.h
View File

@ -92,6 +92,7 @@ __gthrw(pthread_mutexattr_init)
__gthrw(pthread_mutexattr_settype)
__gthrw(pthread_mutexattr_destroy)
__gthrw(pthread_mutex_init)
__gthrw(pthread_mutex_destroy)
static inline int
__gthread_active_p (void)
@ -144,6 +145,15 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
return -1;
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
return __gthrw_(pthread_mutex_destroy) (mutex);
else
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

6
gcc/gthr-vxworks.h
View File

@ -60,6 +60,12 @@ __gthread_mutex_init_function (__gthread_mutex_t *mutex)
*mutex = semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
}
static inline int
__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(mutex))
{
return 0;
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{

5
gcc/gthr-win32.h
View File

@ -359,9 +359,6 @@ typedef struct {
__gthread_recursive_mutex_init_function
#define __GTHREAD_RECURSIVE_MUTEX_INIT_DEFAULT {-1, 0, 0, 0}
#define __GTHREAD_MUTEX_DESTROY_FUNCTION \
__gthread_mutex_destroy_function
#if __MINGW32_MAJOR_VERSION >= 1 || \
(__MINGW32_MAJOR_VERSION == 0 && __MINGW32_MINOR_VERSION > 2)
#define MINGW32_SUPPORTS_MT_EH 1
@ -619,7 +616,7 @@ __gthread_mutex_init_function (__gthread_mutex_t *mutex)
}
static inline void
__gthread_mutex_destroy_function (__gthread_mutex_t *mutex)
__gthread_mutex_destroy (__gthread_mutex_t *mutex)
{
CloseHandle ((HANDLE) mutex->sema);
}

2
gcc/gthr.h
View File

@ -73,6 +73,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
void *__gthread_getspecific (__gthread_key_t key)
int __gthread_setspecific (__gthread_key_t key, const void *ptr)
int __gthread_mutex_destroy (__gthread_mutex_t *mutex);
int __gthread_mutex_lock (__gthread_mutex_t *mutex);
int __gthread_mutex_trylock (__gthread_mutex_t *mutex);
int __gthread_mutex_unlock (__gthread_mutex_t *mutex);

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-01 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/35063
* io/unit.c (destroy_unit_mutex): Call __gthread_mutex_destroy
instead of macro kludge.
2008-02-25 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/29549

8
libgfortran/io/unit.c
View File

@ -209,13 +209,7 @@ insert_unit (int n)
static void
destroy_unit_mutex (gfc_unit * u)
{
#ifdef __GTHREAD_MUTEX_DESTROY_FUNCTION
__GTHREAD_MUTEX_DESTROY_FUNCTION (&u->lock);
#else
#ifdef __CYGWIN__
pthread_mutex_destroy (&u->lock);
#endif
#endif
__gthread_mutex_destroy (&u->lock);
free_mem (u);
}