ITS#6625,ITS#5421

[openldap] / include / ldap_int_thread.h

diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index 4648c3211efc4773ff2eefc34966ec38757c19e8..dd7d4db908bd7565d021aeb77f1ee028a2ee5560 100644 (file)
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -69,6 +69,11 @@ typedef pthread_key_t                ldap_int_thread_key_t;
 typedef pthread_rwlock_t ldap_int_thread_rdwr_t;
 #endif
 
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL    PTHREAD_MUTEX_INITIALIZER
+#define LDAP_INT_MUTEX_FIRSTCREATE(m)  ((void) 0)
+#endif
+
 LDAP_END_DECL
 
 #elif defined ( HAVE_MACH_CTHREADS )
@@ -91,6 +96,11 @@ typedef struct mutex         ldap_int_thread_mutex_t;
 typedef struct condition       ldap_int_thread_cond_t;
 typedef cthread_key_t          ldap_int_thread_key_t;
 
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL    MUTEX_INITIALIZER
+#define LDAP_INT_MUTEX_FIRSTCREATE(m)  ((void) 0)
+#endif
+
 LDAP_END_DECL
 
 #elif defined( HAVE_GNU_PTH )
@@ -115,6 +125,11 @@ typedef pth_key_t  ldap_int_thread_key_t;
 typedef pth_rwlock_t ldap_int_thread_rdwr_t;
 #endif
 
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL    PTH_MUTEX_INIT
+#define LDAP_INT_MUTEX_FIRSTCREATE(m)  ((void) 0)
+#endif
+
 LDAP_END_DECL
 
 #elif defined( HAVE_THR )
@@ -143,7 +158,10 @@ typedef thread_key_t       ldap_int_thread_key_t;
 #define LDAP_THREAD_HAVE_SETCONCURRENCY 1
 #endif
 
-LDAP_END_DECL
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL    DEFAULTMUTEX
+#define LDAP_INT_MUTEX_FIRSTCREATE(m)  ((void) 0)
+#endif
 
 #elif defined(HAVE_NT_THREADS)
 /*************************************
@@ -162,6 +180,12 @@ typedef HANDLE     ldap_int_thread_mutex_t;
 typedef HANDLE ldap_int_thread_cond_t;
 typedef DWORD  ldap_int_thread_key_t;
 
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL            ((HANDLE)0)
+#define LDAP_INT_MUTEX_FIRSTCREATE(m) \
+               ((void) ((m) || ldap_int_thread_mutex_init(&(m))))
+#endif
+
 LDAP_END_DECL
 
 #else
@@ -186,6 +210,11 @@ typedef int                        ldap_int_thread_key_t;
 #define LDAP_THREAD_HAVE_TPOOL 1
 typedef int                    ldap_int_thread_pool_t;
 
+#ifndef LDAP_INT_MUTEX_NULL
+#define LDAP_INT_MUTEX_NULL                            0
+#define LDAP_INT_MUTEX_FIRSTCREATE(m)  ((void) 0)
+#endif
+
 LDAP_END_DECL
 
 #endif /* no threads support */
@@ -256,6 +285,10 @@ typedef struct {
        ldap_int_thread_t       owner;
 } ldap_debug_thread_mutex_t;
 
+#define        LDAP_DEBUG_MUTEX_NULL   {LDAP_INT_MUTEX_NULL, {0,0,{0},0} /*,owner*/}
+#define        LDAP_DEBUG_MUTEX_FIRSTCREATE(m) \
+       ((void) ((m).usage.state || ldap_pvt_thread_mutex_init(&(m))))
+
 typedef struct {
        ldap_int_thread_cond_t  wrapped;
        ldap_debug_usage_info_t usage;