Changeset 745 for trunk/server/lib/tdb/common/tdb.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/tdb.c (modified) (31 diffs)

trunk/server/lib/tdb/common/tdb.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
@@ -28 +28 @@
 #include "tdb_private.h"
 
-TDB_DATA tdb_null;
+_PUBLIC_ TDB_DATA tdb_null;
 
 /*
@@ -34 +34 @@
   the TDB_SEQNUM flag
 */
-void tdb_increment_seqnum_nonblock(struct tdb_context *tdb)
+_PUBLIC_ void tdb_increment_seqnum_nonblock(struct tdb_context *tdb)
 {
         tdb_off_t seqnum=0;
-        
+
         if (!(tdb->flags & TDB_SEQNUM)) {
                 return;
@@ -60 +60 @@
         }
 
-        if (tdb_brlock(tdb, TDB_SEQNUM_OFS, F_WRLCK, F_SETLKW, 1, 1) != 0) {
+        if (tdb_nest_lock(tdb, TDB_SEQNUM_OFS, F_WRLCK,
+                          TDB_LOCK_WAIT|TDB_LOCK_PROBE) != 0) {
                 return;
         }
@@ -66 +67 @@
         tdb_increment_seqnum_nonblock(tdb);
 
-        tdb_brlock(tdb, TDB_SEQNUM_OFS, F_UNLCK, F_SETLKW, 1, 1);
+        tdb_nest_unlock(tdb, TDB_SEQNUM_OFS, F_WRLCK, false);
 }
 
@@ -80 +81 @@
 {
         tdb_off_t rec_ptr;
-        
+
         /* read in the hash top */
         if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1)
@@ -154 +155 @@
                 }
         }
-         
 
         /* must be long enough key, data and tailer */
@@ -171 +171 @@
                 return tdb_rec_write(tdb, rec_ptr, &rec);
         }
- 
+
         return 0;
 }
@@ -200 +200 @@
 }
 
-TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
+_PUBLIC_ TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
 {
         TDB_DATA ret = _tdb_fetch(tdb, key);
@@ -213 +213 @@
  * should be fast and should not block on other syscalls.
  *
- * DONT CALL OTHER TDB CALLS FROM THE PARSER, THIS MIGHT LEAD TO SEGFAULTS.
+ * DON'T CALL OTHER TDB CALLS FROM THE PARSER, THIS MIGHT LEAD TO SEGFAULTS.
  *
  * For mmapped tdb's that do not have a transaction open it points the parsing
@@ -222 +222 @@
  * This is interesting for all readers of potentially large data structures in
  * the tdb records, ldb indexes being one example.
+ *
+ * Return -1 if the record was not found.
  */
 
-int tdb_parse_record(struct tdb_context *tdb, TDB_DATA key,
+_PUBLIC_ int tdb_parse_record(struct tdb_context *tdb, TDB_DATA key,
                      int (*parser)(TDB_DATA key, TDB_DATA data,
                                    void *private_data),
@@ -238 +240 @@
 
         if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
+                /* record not found */
                 tdb_trace_1rec_ret(tdb, "tdb_parse_record", key, -1);
                 tdb->ecode = TDB_ERR_NOEXIST;
-                return 0;
+                return -1;
         }
         tdb_trace_1rec_ret(tdb, "tdb_parse_record", key, 0);
@@ -261 +264 @@
 {
         struct tdb_record rec;
-        
+
         if (tdb_find_lock_hash(tdb, key, hash, F_RDLCK, &rec) == 0)
                 return 0;
@@ -268 +271 @@
 }
 
-int tdb_exists(struct tdb_context *tdb, TDB_DATA key)
+_PUBLIC_ int tdb_exists(struct tdb_context *tdb, TDB_DATA key)
 {
         uint32_t hash = tdb->hash_fn(&key);
@@ -319 +322 @@
         tdb_off_t rec_ptr;
         struct tdb_record rec;
-        
+
         /* read in the hash top */
         if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1)
@@ -348 +351 @@
                 return -1;
         }
-        
+
         /* read in the hash top */
         if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1)
@@ -427 +430 @@
 }
 
-int tdb_delete(struct tdb_context *tdb, TDB_DATA key)
+_PUBLIC_ int tdb_delete(struct tdb_context *tdb, TDB_DATA key)
 {
         uint32_t hash = tdb->hash_fn(&key);
@@ -444 +447 @@
 {
         tdb_off_t rec_ptr;
-        
+
         /* read in the hash top */
         if (tdb_ofs_read(tdb, TDB_HASH_TOP(hash), &rec_ptr) == -1)
@@ -597 +600 @@
    return 0 on success, -1 on failure
 */
-int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
+_PUBLIC_ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
 {
         uint32_t hash;
@@ -620 +623 @@
 
 /* Append to an entry. Create if not exist. */
-int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
+_PUBLIC_ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
 {
         uint32_t hash;
@@ -659 +662 @@
         ret = _tdb_store(tdb, key, dbuf, 0, hash);
         tdb_trace_2rec_retrec(tdb, "tdb_append", key, new_dbuf, dbuf);
-        
+
 failed:
         tdb_unlock(tdb, BUCKET(hash), F_WRLCK);
@@ -671 +674 @@
   useful for external logging functions
 */
-const char *tdb_name(struct tdb_context *tdb)
+_PUBLIC_ const char *tdb_name(struct tdb_context *tdb)
 {
         return tdb->name;
@@ -681 +684 @@
   of the fd
 */
-int tdb_fd(struct tdb_context *tdb)
+_PUBLIC_ int tdb_fd(struct tdb_context *tdb)
 {
         return tdb->fd;
@@ -690 +693 @@
   useful for external tdb routines that wish to log tdb errors
 */
-tdb_log_func tdb_log_fn(struct tdb_context *tdb)
+_PUBLIC_ tdb_log_func tdb_log_fn(struct tdb_context *tdb)
 {
         return tdb->log.log_fn;
@@ -706 +709 @@
   test of a possible tdb change.
 */
-int tdb_get_seqnum(struct tdb_context *tdb)
+_PUBLIC_ int tdb_get_seqnum(struct tdb_context *tdb)
 {
         tdb_off_t seqnum=0;
@@ -714 +717 @@
 }
 
-int tdb_hash_size(struct tdb_context *tdb)
+_PUBLIC_ int tdb_hash_size(struct tdb_context *tdb)
 {
         return tdb->header.hash_size;
 }
 
-size_t tdb_map_size(struct tdb_context *tdb)
+_PUBLIC_ size_t tdb_map_size(struct tdb_context *tdb)
 {
         return tdb->map_size;
 }
 
-int tdb_get_flags(struct tdb_context *tdb)
+_PUBLIC_ int tdb_get_flags(struct tdb_context *tdb)
 {
         return tdb->flags;
 }
 
-void tdb_add_flags(struct tdb_context *tdb, unsigned flags)
+_PUBLIC_ void tdb_add_flags(struct tdb_context *tdb, unsigned flags)
 {
         if ((flags & TDB_ALLOW_NESTING) &&
@@ -749 +752 @@
 }
 
-void tdb_remove_flags(struct tdb_context *tdb, unsigned flags)
+_PUBLIC_ void tdb_remove_flags(struct tdb_context *tdb, unsigned flags)
 {
         if ((flags & TDB_ALLOW_NESTING) &&
@@ -773 +776 @@
   enable sequence number handling on an open tdb
 */
-void tdb_enable_seqnum(struct tdb_context *tdb)
+_PUBLIC_ void tdb_enable_seqnum(struct tdb_context *tdb)
 {
         tdb->flags |= TDB_SEQNUM;
@@ -805 +808 @@
 /*
   wipe the entire database, deleting all records. This can be done
-  very fast by using a global lock. The entire data portion of the
+  very fast by using a allrecord lock. The entire data portion of the
   file becomes a single entry in the freelist.
 
   This code carefully steps around the recovery area, leaving it alone
  */
-int tdb_wipe_all(struct tdb_context *tdb)
+_PUBLIC_ int tdb_wipe_all(struct tdb_context *tdb)
 {
         int i;
@@ -917 +920 @@
   repack a tdb
  */
-int tdb_repack(struct tdb_context *tdb)
+_PUBLIC_ int tdb_repack(struct tdb_context *tdb)
 {
         struct tdb_context *tmp_db;
@@ -987 +990 @@
 }
 
+/* Even on files, we can get partial writes due to signals. */
+bool tdb_write_all(int fd, const void *buf, size_t count)
+{
+        while (count) {
+                ssize_t ret;
+                ret = write(fd, buf, count);
+                if (ret < 0)
+                        return false;
+                buf = (const char *)buf + ret;
+                count -= ret;
+        }
+        return true;
+}
+
 #ifdef TDB_TRACE
 static void tdb_trace_write(struct tdb_context *tdb, const char *str)
 {
-        if (write(tdb->tracefd, str, strlen(str)) != strlen(str)) {
+        if (!tdb_write_alltdb->tracefd, str, strlen(str)) {
                 close(tdb->tracefd);
                 tdb->tracefd = -1;