Changeset 745 for trunk/server/lib/tdb/common/traverse.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/common/traverse.c (modified) (12 diffs)

trunk/server/lib/tdb/common/traverse.c

@@ -7 +7 @@
    Copyright (C) Paul `Rusty' Russell              2000
    Copyright (C) Jeremy Allison                    2000-2003
-   
+
      ** NOTE! The following LGPL license applies to the tdb
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -45 +45 @@
                            hashes are used. In that case we spend most of our
                            time in tdb_brlock(), locking empty hash chains.
-                           
+
                            To avoid this, we do an unlocked pre-check to see
                            if the hash chain is empty before starting to look
@@ -53 +53 @@
                            lock, so instead we get the lock and re-fetch the
                            value below.
-                           
+
                            Notice that not doing this optimisation on the
                            first hash chain is critical. We must guarantee
@@ -63 +63 @@
                            could miss them anyway without this trick, so the
                            semantics don't change.
-                           
+
                            With a non-indexed ldb search this trick gains us a
                            factor of around 80 in speed on a linux 2.6.x
@@ -213 +213 @@
   a write style traverse - temporarily marks the db read only
 */
-int tdb_traverse_read(struct tdb_context *tdb, 
+_PUBLIC_ int tdb_traverse_read(struct tdb_context *tdb, 
                       tdb_traverse_func fn, void *private_data)
 {
-
         struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
         int ret;
@@ -222 +221 @@
         /* 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_transaction_lock(tdb, F_RDLCK, TDB_LOCK_WAIT)) {
                 return -1;
         }
@@ -231 +230 @@
         tdb->traverse_read--;
 
-        tdb_transaction_unlock(tdb);
+        tdb_transaction_unlock(tdb, F_RDLCK);
 
         return ret;
@@ -243 +242 @@
   alignment restrictions malloc gives you.
 */
-int tdb_traverse(struct tdb_context *tdb, 
+_PUBLIC_ int tdb_traverse(struct tdb_context *tdb, 
                  tdb_traverse_func fn, void *private_data)
 {
@@ -253 +252 @@
         }
 
-        if (tdb_transaction_lock(tdb, F_WRLCK)) {
+        if (tdb_transaction_lock(tdb, F_WRLCK, TDB_LOCK_WAIT)) {
                 return -1;
         }
@@ -262 +261 @@
         tdb->traverse_write--;
 
-        tdb_transaction_unlock(tdb);
+        tdb_transaction_unlock(tdb, F_WRLCK);
 
         return ret;
@@ -269 +268 @@
 
 /* find the first entry in the database and return its key */
-TDB_DATA tdb_firstkey(struct tdb_context *tdb)
+_PUBLIC_ TDB_DATA tdb_firstkey(struct tdb_context *tdb)
 {
         TDB_DATA key;
@@ -300 +299 @@
 
 /* find the next entry in the database, returning its key */
-TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
+_PUBLIC_ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
 {
         uint32_t oldhash;