sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

tdb: use tdb_nest_lock() for transaction lock.

Browse Source 
Rather than a boutique lock and a separate nest count, use our
newly-generic nested lock tracking for the transaction lock.

Note that the tdb_have_extra_locks() and tdb_release_extra_locks()
functions have to skip over this lock now it is tracked.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

(Imported from commit e8fa70a321)

(This used to be ctdb commit 4ca1b96a70048b2eaa0d12fb5f0fdb54ec396aa3)
This commit is contained in:
Rusty Russell 2010-04-22 13:53:51 +09:30
parent 43585f9200
commit 685473b1cb
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ctdb/lib/tdb/common/lock.c
View File

@ -415,18 +415,7 @@ int tdb_unlock(struct tdb_context *tdb, int list, int ltype)
*/
int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
{
if (tdb->transaction_lock_count > 0) {
tdb->transaction_lock_count++;
return 0;
}
if (tdb->methods->brlock(tdb, ltype, TRANSACTION_LOCK, 1, TDB_LOCK_WAIT) == -1) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_lock: failed to get transaction lock\n"));
tdb->ecode = TDB_ERR_LOCK;
return -1;
}
tdb->transaction_lock_count++;
return 0;
return tdb_nest_lock(tdb, TRANSACTION_LOCK, ltype, TDB_LOCK_WAIT);
}
/*
@ -434,16 +423,7 @@ int tdb_transaction_lock(struct tdb_context *tdb, int ltype)
*/
int tdb_transaction_unlock(struct tdb_context *tdb, int ltype)
{
int ret;
if (tdb->transaction_lock_count > 1) {
tdb->transaction_lock_count--;
return 0;
}
ret = tdb->methods->brunlock(tdb, ltype, TRANSACTION_LOCK, 1);
if (ret == 0) {
tdb->transaction_lock_count = 0;
}
return ret;
return tdb_nest_unlock(tdb, TRANSACTION_LOCK, ltype, false);
}
@ -689,19 +669,24 @@ int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off)
bool tdb_have_extra_locks(struct tdb_context *tdb)
{
unsigned int extra = tdb->num_lockrecs;
if (tdb->allrecord_lock.count) {
return true;
}
if (tdb->num_lockrecs) {
return true;
/* In a transaction, we expect to hold the transaction lock */
if (tdb->transaction && find_nestlock(tdb, TRANSACTION_LOCK)) {
extra--;
}
return false;
return extra;
}
/* The transaction code uses this to remove all locks. */
void tdb_release_extra_locks(struct tdb_context *tdb)
{
unsigned int i;
unsigned int i, extra = 0;
if (tdb->allrecord_lock.count != 0) {
tdb_brunlock(tdb, tdb->allrecord_lock.ltype,
@ -710,10 +695,17 @@ void tdb_release_extra_locks(struct tdb_context *tdb)
}
for (i=0;i<tdb->num_lockrecs;i++) {
tdb_brunlock(tdb, tdb->lockrecs[i].ltype,
tdb->lockrecs[i].off, 1);
struct tdb_lock_type *lck = &tdb->lockrecs[i];
if (tdb->transaction && lck->off == TRANSACTION_LOCK) {
tdb->lockrecs[extra++] = *lck;
} else {
tdb_brunlock(tdb, lck->ltype, lck->off, 1);
}
}
tdb->num_locks = extra;
tdb->num_lockrecs = extra;
if (tdb->num_lockrecs == 0) {
SAFE_FREE(tdb->lockrecs);
}
tdb->num_locks = 0;
tdb->num_lockrecs = 0;
SAFE_FREE(tdb->lockrecs);
}

1
ctdb/lib/tdb/common/tdb_private.h
View File

@ -209,7 +209,6 @@ struct tdb_context {
struct tdb_transaction *transaction;
int page_size;
int max_dead_records;
int transaction_lock_count;
#ifdef TDB_TRACE
int tracefd;
#endif