dbuf.dptr = key.dptr + rec.key_len;
dbuf.dsize = rec.data_len;
+ tdb_trace(tdb, "traverse ");
+ tdb_trace_record(tdb, key);
+ tdb_trace_record(tdb, dbuf);
+ tdb_trace(tdb, "\n");
+
/* Drop chain lock, call out */
if (tdb_unlock(tdb, tl->hash, tl->lock_rw) != 0) {
ret = -1;
}
if (fn && fn(tdb, key, dbuf, private_data)) {
/* They want us to terminate traversal */
+ tdb_trace(tdb, "tdb_traverse_end = %i\n", count);
ret = count;
if (tdb_unlock_record(tdb, tl->off) != 0) {
TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_traverse: unlock_record failed!\n"));;
}
SAFE_FREE(key.dptr);
}
+ tdb_trace(tdb, "tdb_traverse_end\n");
out:
tdb->travlocks.next = tl->next;
if (ret < 0)
/* we need to get a read lock on the transaction lock here to
cope with the lock ordering semantics of solaris10 */
- if (tdb_transaction_lock(tdb, F_RDLCK)) {
+ if (tdb->traverse_read == 0 && tdb_transaction_lock(tdb, F_RDLCK)) {
return -1;
}
tdb->traverse_read++;
+ tdb_trace(tdb, "tdb_traverse_read_start\n");
ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
tdb->traverse_read--;
- tdb_trace(tdb, "tdb_traverse_read = %i\n", ret);
- tdb_transaction_unlock(tdb);
+ if (tdb->traverse_read == 0) {
+ tdb_transaction_unlock(tdb);
+ }
return ret;
}
if (tdb->read_only || tdb->traverse_read) {
return tdb_traverse_read(tdb, fn, private_data);
}
-
- if (tdb_transaction_lock(tdb, F_WRLCK)) {
+
+ /* Nested traversals: transaction lock doesn't nest. */
+ if (tdb->traverse_write == 0 && tdb_transaction_lock(tdb, F_WRLCK)) {
return -1;
}
tdb->traverse_write++;
+ tdb_trace(tdb, "tdb_traverse_start\n");
ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
tdb->traverse_write--;
- tdb_trace(tdb, "tdb_traverse = %i\n", ret);
- tdb_transaction_unlock(tdb);
+ if (tdb->traverse_write == 0) {
+ tdb_transaction_unlock(tdb);
+ }
return ret;
}