mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8772 Remove type distinction for recursive mutexes

Browse Source
This commit is contained in:
Ondřej Kuzník 2018-06-22 14:01:19 +01:00
parent e2d01fe984
commit 7fa5eb4242
7 changed files with 8 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/ldap_int_thread.h
View File

@ -44,9 +44,7 @@ LDAP_END_DECL
LDAP_BEGIN_DECL
#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
typedef pthread_t ldap_int_thread_t;
typedef pthread_mutex_t ldap_int_thread_mutex_recursive_t;
typedef pthread_mutex_t ldap_int_thread_mutex_t;
typedef pthread_cond_t ldap_int_thread_cond_t;
typedef pthread_key_t ldap_int_thread_key_t;
@ -93,9 +91,7 @@ LDAP_END_DECL
LDAP_BEGIN_DECL
#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
typedef pth_t ldap_int_thread_t;
typedef pth_mutex_t ldap_int_thread_mutex_recursive_t;
typedef pth_mutex_t ldap_int_thread_mutex_t;
typedef pth_cond_t ldap_int_thread_cond_t;
typedef pth_key_t ldap_int_thread_key_t;
@ -124,9 +120,7 @@ LDAP_END_DECL
LDAP_BEGIN_DECL
#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
typedef thread_t ldap_int_thread_t;
typedef mutex_t ldap_int_thread_mutex_recursive_t;
typedef mutex_t ldap_int_thread_mutex_t;
typedef cond_t ldap_int_thread_cond_t;
typedef thread_key_t ldap_int_thread_key_t;
@ -157,9 +151,7 @@ typedef thread_key_t ldap_int_thread_key_t;
LDAP_BEGIN_DECL
#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
typedef unsigned long ldap_int_thread_t;
typedef HANDLE ldap_int_thread_mutex_recursive_t;
typedef HANDLE ldap_int_thread_mutex_t;
typedef HANDLE ldap_int_thread_cond_t;
typedef DWORD ldap_int_thread_key_t;
@ -186,9 +178,7 @@ LDAP_END_DECL
LDAP_BEGIN_DECL
#define LDAP_THREAD_HAVE_NATIVE_RECURSIVE_MUTEX
typedef int ldap_int_thread_t;
typedef int ldap_int_thread_mutex_recursive_t;
typedef int ldap_int_thread_mutex_t;
typedef int ldap_int_thread_cond_t;
typedef int ldap_int_thread_key_t;

13
include/ldap_pvt_thread.h
View File

@ -37,7 +37,6 @@ typedef ldap_int_thread_rdwr_t ldap_pvt_thread_rdwr_t;
#define LDAP_PVT_MUTEX_FIRSTCREATE LDAP_INT_MUTEX_FIRSTCREATE
#define LDAP_PVT_MUTEX_NULL LDAP_INT_MUTEX_NULL
#endif
typedef ldap_int_thread_mutex_recursive_t ldap_pvt_thread_mutex_recursive_t;
typedef ldap_int_thread_rmutex_t ldap_pvt_thread_rmutex_t;
typedef ldap_int_thread_key_t ldap_pvt_thread_key_t;
#endif /* !LDAP_PVT_THREAD_H_DONE */
@ -118,9 +117,6 @@ ldap_pvt_thread_mutex_recursive_init LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_destroy LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_recursive_destroy LDAP_P(( ldap_pvt_thread_mutex_recursive_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_lock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
@ -130,15 +126,6 @@ ldap_pvt_thread_mutex_trylock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_unlock LDAP_P(( ldap_pvt_thread_mutex_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_recursive_lock LDAP_P(( ldap_pvt_thread_mutex_recursive_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_recursive_trylock LDAP_P(( ldap_pvt_thread_mutex_recursive_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_mutex_recursive_unlock LDAP_P(( ldap_pvt_thread_mutex_recursive_t *mutex ));
LDAP_F( int )
ldap_pvt_thread_rmutex_init LDAP_P(( ldap_pvt_thread_rmutex_t *rmutex ));

18
libraries/libldap_r/thr_nt.c
View File

@ -161,6 +161,13 @@ ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
return ( 0 );
}
int
ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex )
{
/* All NT mutexes are recursive */
return ldap_pvt_thread_mutex_init( mutex );
}
int
ldap_pvt_thread_mutex_destroy( ldap_pvt_thread_mutex_t *mutex )
{
@ -192,17 +199,6 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
? -1 : 0;
}
int ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_init")));
int ldap_pvt_thread_mutex_recursive_destroy( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_destroy")));
int ldap_pvt_thread_mutex_recursive_lock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_lock")));
int ldap_pvt_thread_mutex_recursive_trylock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_trylock")));
int ldap_pvt_thread_mutex_recursive_unlock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_unlock")));
ldap_pvt_thread_t
ldap_pvt_thread_self( void )
{

9
libraries/libldap_r/thr_posix.c
View File

@ -325,15 +325,6 @@ ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex )
return ERRVAL( pthread_mutex_init( mutex, &mutex_attr_recursive ) );
}
int ldap_pvt_thread_mutex_recursive_destroy( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_destroy")));
int ldap_pvt_thread_mutex_recursive_lock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_lock")));
int ldap_pvt_thread_mutex_recursive_trylock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_trylock")));
int ldap_pvt_thread_mutex_recursive_unlock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_unlock")));
ldap_pvt_thread_t ldap_pvt_thread_self( void )
{
return pthread_self();

11
libraries/libldap_r/thr_pth.c
View File

@ -160,17 +160,6 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mutex )
return( pth_mutex_acquire( mutex, 1, NULL ) ? 0 : errno );
}
int ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_init")));
int ldap_pvt_thread_mutex_recursive_destroy( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_destroy")));
int ldap_pvt_thread_mutex_recursive_lock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_lock")));
int ldap_pvt_thread_mutex_recursive_trylock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_trylock")));
int ldap_pvt_thread_mutex_recursive_unlock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_unlock")));
ldap_pvt_thread_t
ldap_pvt_thread_self( void )
{

11
libraries/libldap_r/thr_stub.c
View File

@ -150,17 +150,6 @@ ldap_pvt_thread_mutex_unlock( ldap_pvt_thread_mutex_t *mutex )
return 0;
}
int ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_init")));
int ldap_pvt_thread_mutex_recursive_destroy( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_destroy")));
int ldap_pvt_thread_mutex_recursive_lock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_lock")));
int ldap_pvt_thread_mutex_recursive_trylock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_trylock")));
int ldap_pvt_thread_mutex_recursive_unlock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_unlock")));
/*
* NO_THREADS requires a separate tpool implementation since
* generic ldap_pvt_thread_pool_wrapper loops forever.

11
libraries/libldap_r/thr_thr.c
View File

@ -154,20 +154,11 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
}
int
ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_recursive_t *mutex )
ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex )
{
return( mutex_init( mutex, USYNC_THREAD | LOCK_RECURSIVE, NULL ) );
}
int ldap_pvt_thread_mutex_recursive_destroy( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_destroy")));
int ldap_pvt_thread_mutex_recursive_lock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_lock")));
int ldap_pvt_thread_mutex_recursive_trylock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_trylock")));
int ldap_pvt_thread_mutex_recursive_unlock( ldap_pvt_thread_mutex_recursive_t *mutex )
LDAP_GCCATTR((alias("ldap_pvt_thread_mutex_unlock")));
ldap_pvt_thread_t
ldap_pvt_thread_self( void )
{