mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use pthread_equal to compare thread IDs

Browse Source
This commit is contained in:
Howard Chu 2003-05-02 12:23:31 +00:00
parent e8cd5c2386
commit a54549f1d5
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/libldap_r/tpool.c
View File

@ -43,6 +43,13 @@ typedef struct ldap_int_thread_key_s {
#define MAXKEYS 32 #define MAXKEYS 32
#define MAXTHREADS 1024 /* must be a power of 2 */ #define MAXTHREADS 1024 /* must be a power of 2 */
static ldap_pvt_thread_t tid_zero;
#ifdef HAVE_PTHREADS
#define TID_EQ(a,b) pthread_equal((a),(b))
#else
#define TID_EQ(a,b) ((a) == (b))
#endif
static struct { static struct {
ldap_pvt_thread_t id; ldap_pvt_thread_t id;
ldap_int_thread_key_t *ctx; ldap_int_thread_key_t *ctx;
@ -249,7 +256,8 @@ ldap_pvt_thread_pool_submit (
* look for an empty slot. * look for an empty slot.
*/ */
TID_HASH(thr, hash); TID_HASH(thr, hash);
for (rc = hash & (MAXTHREADS-1); thread_keys[rc].id; for (rc = hash & (MAXTHREADS-1);
!TID_EQ(thread_keys[rc].id, tid_zero);
rc = (rc+1) & (MAXTHREADS-1)); rc = (rc+1) & (MAXTHREADS-1));
thread_keys[rc].id = thr; thread_keys[rc].id = thr;
} else { } else {
@ -408,7 +416,7 @@ ldap_int_thread_pool_wrapper (
/* store pointer to our keys */ /* store pointer to our keys */
TID_HASH(tid, hash); TID_HASH(tid, hash);
for (i = hash & (MAXTHREADS-1); thread_keys[i].id != tid; for (i = hash & (MAXTHREADS-1); !TID_EQ(thread_keys[i].id, tid);
i = (i+1) & (MAXTHREADS-1)); i = (i+1) & (MAXTHREADS-1));
thread_keys[i].ctx = ltc_key; thread_keys[i].ctx = ltc_key;
keyslot = i; keyslot = i;
@ -478,7 +486,7 @@ ldap_int_thread_pool_wrapper (
} }
thread_keys[keyslot].ctx = NULL; thread_keys[keyslot].ctx = NULL;
thread_keys[keyslot].id = 0; thread_keys[keyslot].id = tid_zero;
pool->ltp_open_count--; pool->ltp_open_count--;
ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex); ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex);
@ -545,8 +553,8 @@ void *ldap_pvt_thread_pool_context( )
tid = ldap_pvt_thread_self(); tid = ldap_pvt_thread_self();
TID_HASH( tid, hash ); TID_HASH( tid, hash );
for (i = hash & (MAXTHREADS-1); thread_keys[i].id && for (i = hash & (MAXTHREADS-1); !TID_EQ(thread_keys[i].id, tid_zero) &&
thread_keys[i].id != tid; i = (i+1) & (MAXTHREADS-1)); !TID_EQ(thread_keys[i].id, tid); i = (i+1) & (MAXTHREADS-1));
return thread_keys[i].ctx; return thread_keys[i].ctx;
} }