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#9201 additional fixes

Browse Source
This commit is contained in:
Howard Chu 2020-09-03 21:00:39 +01:00
parent b24ca75993
commit ccfbb74c62
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libldap/ldap_thr_debug.h
View File

@ -119,8 +119,6 @@
#define ldap_pvt_thread_pool_pause ldap_int_thread_pool_pause #define ldap_pvt_thread_pool_pause ldap_int_thread_pool_pause
#define ldap_pvt_thread_pool_resume ldap_int_thread_pool_resume #define ldap_pvt_thread_pool_resume ldap_int_thread_pool_resume
#define ldap_pvt_thread_pool_destroy ldap_int_thread_pool_destroy #define ldap_pvt_thread_pool_destroy ldap_int_thread_pool_destroy
#define ldap_pvt_thread_pool_close ldap_int_thread_pool_close
#define ldap_pvt_thread_pool_free ldap_int_thread_pool_free
#define ldap_pvt_thread_pool_getkey ldap_int_thread_pool_getkey #define ldap_pvt_thread_pool_getkey ldap_int_thread_pool_getkey
#define ldap_pvt_thread_pool_setkey ldap_int_thread_pool_setkey #define ldap_pvt_thread_pool_setkey ldap_int_thread_pool_setkey
#define ldap_pvt_thread_pool_purgekey ldap_int_thread_pool_purgekey #define ldap_pvt_thread_pool_purgekey ldap_int_thread_pool_purgekey
@ -138,11 +136,9 @@
*/ */
#undef ldap_pvt_thread_pool_destroy #undef ldap_pvt_thread_pool_destroy
#define ldap_pvt_thread_pool_destroy(p,r) ldap_int_thread_pool_destroy(p,r) #define ldap_pvt_thread_pool_destroy(p,r) ldap_int_thread_pool_destroy(p,r)
#if 0
#define ldap_pvt_thread_pool_close(p,r) ldap_int_thread_pool_close(p,r) #define ldap_pvt_thread_pool_close(p,r) ldap_int_thread_pool_close(p,r)
#define ldap_pvt_thread_pool_free(p) ldap_int_thread_pool_free(p) #define ldap_pvt_thread_pool_free(p) ldap_int_thread_pool_free(p)
#endif #endif
#endif
#ifdef LDAP_THREAD_DEBUG_IMPLEMENTATION /* thr_debug.c */ #ifdef LDAP_THREAD_DEBUG_IMPLEMENTATION /* thr_debug.c */
#undef ldap_pvt_thread_mutex_t #undef ldap_pvt_thread_mutex_t

16
libraries/libldap/thr_debug.c
View File

@ -959,6 +959,22 @@ ldap_pvt_thread_cond_wait(
return rc; return rc;
} }
int
ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex )
{
int rc;
init_usage( &mutex->usage, "ldap_pvt_thread_mutex_recursive_init" );
rc = ldap_int_thread_mutex_recursive_init( WRAPPED( mutex ) );
if( rc ) {
ERROR( rc, "ldap_pvt_thread_mutex_recursive_init" );
destroy_usage( &mutex->usage );
} else {
RESET_OWNER( mutex );
adjust_count( Idx_mutex, +1 );
}
return rc;
}
int int
ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex ) ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex )
{ {