mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-12 10:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2013-07-19 10:02:24 -07:00
commit 96bf741367
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/liblmdb/mdb.c
View File

@ -2078,14 +2078,6 @@ mdb_txn_renew0(MDB_txn *txn)
pid_t pid = env->me_pid; pid_t pid = env->me_pid;
pthread_t tid = pthread_self(); pthread_t tid = pthread_self();
LOCK_MUTEX_R(env);
for (i=0; i<env->me_txns->mti_numreaders; i++)
if (env->me_txns->mti_readers[i].mr_pid == 0)
break;
if (i == env->me_maxreaders) {
UNLOCK_MUTEX_R(env);
return MDB_READERS_FULL;
}
if (!(env->me_flags & MDB_LIVE_READER)) { if (!(env->me_flags & MDB_LIVE_READER)) {
rc = mdb_reader_pid(env, Pidset, pid); rc = mdb_reader_pid(env, Pidset, pid);
if (rc) { if (rc) {
@ -2094,6 +2086,15 @@ mdb_txn_renew0(MDB_txn *txn)
} }
env->me_flags |= MDB_LIVE_READER; env->me_flags |= MDB_LIVE_READER;
} }
LOCK_MUTEX_R(env);
for (i=0; i<env->me_txns->mti_numreaders; i++)
if (env->me_txns->mti_readers[i].mr_pid == 0)
break;
if (i == env->me_maxreaders) {
UNLOCK_MUTEX_R(env);
return MDB_READERS_FULL;
}
env->me_txns->mti_readers[i].mr_pid = pid; env->me_txns->mti_readers[i].mr_pid = pid;
env->me_txns->mti_readers[i].mr_tid = tid; env->me_txns->mti_readers[i].mr_tid = tid;
if (i >= env->me_txns->mti_numreaders) if (i >= env->me_txns->mti_numreaders)
@ -8091,11 +8092,13 @@ int mdb_reader_check(MDB_env *env, int *dead)
if (mdb_pid_insert(pids, pid) == 0) { if (mdb_pid_insert(pids, pid) == 0) {
if (mdb_reader_pid(env, Pidcheck, pid)) { if (mdb_reader_pid(env, Pidcheck, pid)) {
LOCK_MUTEX_R(env); LOCK_MUTEX_R(env);
if (mdb_reader_pid(env, Pidcheck, pid)) {
for (j=i; j<rdrs; j++) for (j=i; j<rdrs; j++)
if (mr[j].mr_pid == pid) { if (mr[j].mr_pid == pid) {
mr[j].mr_pid = 0; mr[j].mr_pid = 0;
count++; count++;
} }
}
UNLOCK_MUTEX_R(env); UNLOCK_MUTEX_R(env);
} }
} }