The branch, master has been updated via 3f35c1d tdb: version 1.3.5 via e4fe0af tdb: introduce tdb_chainlock_read_nonblock(), a nonblock variant of tdb_chainlock_read() from 06f4ba3 lib: Remove server_id_str()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3f35c1d52ee77f7cabd52dd503565cec360f1de2 Author: Alexander Drozdov <al.droz...@gmail.com> Date: Tue Apr 28 10:31:43 2015 +0300 tdb: version 1.3.5 ABI change: tdb_chainlock_read_nonblock() has been added. Signed-off-by: Alexander Drozdov <al.droz...@gmail.com> Reviewed-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Wed Apr 29 00:05:29 CEST 2015 on sn-devel-104 commit e4fe0aff5252b37536eec4a130d4e40a05a56ddb Author: Alexander Drozdov <al.droz...@gmail.com> Date: Tue Apr 28 07:42:43 2015 +0300 tdb: introduce tdb_chainlock_read_nonblock(), a nonblock variant of tdb_chainlock_read() Signed-off-by: Alexander Drozdov <al.droz...@gmail.com> Reviewed-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/tdb/ABI/{tdb-1.3.1.sigs => tdb-1.3.5.sigs} | 1 + lib/tdb/common/lock.c | 7 +++++++ lib/tdb/include/tdb.h | 1 + lib/tdb/wscript | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) copy lib/tdb/ABI/{tdb-1.3.1.sigs => tdb-1.3.5.sigs} (98%) Changeset truncated at 500 lines: diff --git a/lib/tdb/ABI/tdb-1.3.1.sigs b/lib/tdb/ABI/tdb-1.3.5.sigs similarity index 98% copy from lib/tdb/ABI/tdb-1.3.1.sigs copy to lib/tdb/ABI/tdb-1.3.5.sigs index 7d3e469..2545c99 100644 --- a/lib/tdb/ABI/tdb-1.3.1.sigs +++ b/lib/tdb/ABI/tdb-1.3.5.sigs @@ -4,6 +4,7 @@ tdb_chainlock: int (struct tdb_context *, TDB_DATA) tdb_chainlock_mark: int (struct tdb_context *, TDB_DATA) tdb_chainlock_nonblock: int (struct tdb_context *, TDB_DATA) tdb_chainlock_read: int (struct tdb_context *, TDB_DATA) +tdb_chainlock_read_nonblock: int (struct tdb_context *, TDB_DATA) tdb_chainlock_unmark: int (struct tdb_context *, TDB_DATA) tdb_chainunlock: int (struct tdb_context *, TDB_DATA) tdb_chainunlock_read: int (struct tdb_context *, TDB_DATA) diff --git a/lib/tdb/common/lock.c b/lib/tdb/common/lock.c index 6644c40..195dbb5 100644 --- a/lib/tdb/common/lock.c +++ b/lib/tdb/common/lock.c @@ -858,6 +858,13 @@ _PUBLIC_ int tdb_chainunlock_read(struct tdb_context *tdb, TDB_DATA key) return tdb_unlock(tdb, BUCKET(tdb->hash_fn(&key)), F_RDLCK); } +_PUBLIC_ int tdb_chainlock_read_nonblock(struct tdb_context *tdb, TDB_DATA key) +{ + int ret = tdb_lock_nonblock(tdb, BUCKET(tdb->hash_fn(&key)), F_RDLCK); + tdb_trace_1rec_ret(tdb, "tdb_chainlock_read_nonblock", key, ret); + return ret; +} + /* record lock stops delete underneath */ int tdb_lock_record(struct tdb_context *tdb, tdb_off_t off) { diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h index 03e429c..8478ca2 100644 --- a/lib/tdb/include/tdb.h +++ b/lib/tdb/include/tdb.h @@ -884,6 +884,7 @@ int tdb_chainlock(struct tdb_context *tdb, TDB_DATA key); int tdb_chainlock_nonblock(struct tdb_context *tdb, TDB_DATA key); int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key); int tdb_chainlock_read(struct tdb_context *tdb, TDB_DATA key); +int tdb_chainlock_read_nonblock(struct tdb_context *tdb, TDB_DATA key); int tdb_chainunlock_read(struct tdb_context *tdb, TDB_DATA key); int tdb_chainlock_mark(struct tdb_context *tdb, TDB_DATA key); int tdb_chainlock_unmark(struct tdb_context *tdb, TDB_DATA key); diff --git a/lib/tdb/wscript b/lib/tdb/wscript index b369c1b..b960bb9 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -1,7 +1,7 @@ #!/usr/bin/env python APPNAME = 'tdb' -VERSION = '1.3.4' +VERSION = '1.3.5' blddir = 'bin' -- Samba Shared Repository