]> git.ozlabs.org Git - ccan/blobdiff - ccan/tdb/tdb.c
Fix append of zero-length records to zero-length records.
[ccan] / ccan / tdb / tdb.c
index 767452c9b34b520a51bed6aace888b3f5b2dcd4f..db5e5b49e4b663eeb290401d7346342d870b6a28 100644 (file)
@@ -41,6 +41,8 @@ void tdb_increment_seqnum_nonblock(struct tdb_context *tdb)
                return;
        }
 
+       tdb_trace(tdb, "tdb_increment_seqnum_nonblock");
+
        /* we ignore errors from this, as we have no sane way of
           dealing with them.
        */
@@ -162,13 +164,21 @@ TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
 
        /* find which hash bucket it is in */
        hash = tdb->hash_fn(&key);
-       if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec)))
+       if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
+               tdb_trace(tdb, "tdb_fetch ");
+               tdb_trace_record(tdb, key);
+               tdb_trace(tdb, "= ENOENT\n");
                return tdb_null;
-
+       }
        ret.dptr = tdb_alloc_read(tdb, rec_ptr + sizeof(rec) + rec.key_len,
                                  rec.data_len);
        ret.dsize = rec.data_len;
        tdb_unlock(tdb, BUCKET(rec.full_hash), F_RDLCK);
+       tdb_trace(tdb, "tdb_fetch ");
+       tdb_trace_record(tdb, key);
+       tdb_trace(tdb, "= ");
+       tdb_trace_record(tdb, ret);
+       tdb_trace(tdb, "\n"); 
        return ret;
 }
 
@@ -202,9 +212,16 @@ int tdb_parse_record(struct tdb_context *tdb, TDB_DATA key,
        hash = tdb->hash_fn(&key);
 
        if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
+               tdb_trace(tdb, "tdb_parse_record ");
+               tdb_trace_record(tdb, key);
+               tdb_trace(tdb, "= ENOENT\n"); 
                return TDB_ERRCODE(TDB_ERR_NOEXIST, 0);
        }
 
+       tdb_trace(tdb, "tdb_parse_record ");
+       tdb_trace_record(tdb, key);
+       tdb_trace(tdb, "= %u\n", rec.data_len); 
+
        ret = tdb_parse_data(tdb, key, rec_ptr + sizeof(rec) + rec.key_len,
                             rec.data_len, parser, private_data);
 
@@ -232,7 +249,13 @@ static int tdb_exists_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash)
 int tdb_exists(struct tdb_context *tdb, TDB_DATA key)
 {
        uint32_t hash = tdb->hash_fn(&key);
-       return tdb_exists_hash(tdb, key, hash);
+       int ret;
+
+       ret = tdb_exists_hash(tdb, key, hash);
+       tdb_trace(tdb, "tdb_exists ");
+       tdb_trace_record(tdb, key);
+       tdb_trace(tdb, "= %i\n", ret); 
+       return ret;
 }
 
 /* actually delete an entry in the database given the offset */
@@ -387,7 +410,13 @@ static int tdb_delete_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash)
 int tdb_delete(struct tdb_context *tdb, TDB_DATA key)
 {
        uint32_t hash = tdb->hash_fn(&key);
-       return tdb_delete_hash(tdb, key, hash);
+       int ret;
+
+       ret = tdb_delete_hash(tdb, key, hash);
+       tdb_trace(tdb, "tdb_delete ");
+       tdb_trace_record(tdb, key);
+       tdb_trace(tdb, "= %s\n", ret ? "ENOENT" : "0"); 
+       return ret;
 }
 
 /*
@@ -442,21 +471,29 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
        if (tdb_lock(tdb, BUCKET(hash), F_WRLCK) == -1)
                return -1;
 
+       tdb_trace(tdb, "tdb_store %s ", flag == TDB_INSERT ? "insert" :
+                 flag == TDB_MODIFY ? "modify" : "normal");
+       tdb_trace_record(tdb, key);
+       tdb_trace_record(tdb, dbuf);
+
        /* check for it existing, on insert. */
        if (flag == TDB_INSERT) {
                if (tdb_exists_hash(tdb, key, hash)) {
                        tdb->ecode = TDB_ERR_EXISTS;
+                       tdb_trace(tdb, "= EEXIST\n"); 
                        goto fail;
                }
        } else {
                /* first try in-place update, on modify or replace. */
                if (tdb_update_hash(tdb, key, hash, dbuf) == 0) {
+                       tdb_trace(tdb, "= inplace\n"); 
                        goto done;
                }
                if (tdb->ecode == TDB_ERR_NOEXIST &&
                    flag == TDB_MODIFY) {
                        /* if the record doesn't exist and we are in TDB_MODIFY mode then
                         we should fail the store */
+                       tdb_trace(tdb, "= ENOENT\n"); 
                        goto fail;
                }
        }
@@ -504,6 +541,7 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
                                goto fail;
                        }
                        goto done;
+                       tdb_trace(tdb, "= fromdead\n"); 
                }
        }
 
@@ -541,6 +579,8 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
        rec.full_hash = hash;
        rec.magic = TDB_MAGIC;
 
+       tdb_trace(tdb, "= allocate\n"); 
+
        /* write out and point the top of the hash chain at it */
        if (tdb_rec_write(tdb, rec_ptr, &rec) == -1
            || tdb->methods->tdb_write(tdb, rec_ptr+sizeof(rec), p, key.dsize+dbuf.dsize)==-1
@@ -575,12 +615,21 @@ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
                return -1;
 
        dbuf = tdb_fetch(tdb, key);
+       tdb_trace(tdb, "tdb_append ");
+       tdb_trace_record(tdb, key);
+       tdb_trace_record(tdb, dbuf);
+       tdb_trace(tdb, "= %s\n", dbuf.dptr ? "insert" : "append");
 
        if (dbuf.dptr == NULL) {
                dbuf.dptr = (unsigned char *)malloc(new_dbuf.dsize);
        } else {
-               unsigned char *new_dptr = (unsigned char *)realloc(dbuf.dptr,
-                                                    dbuf.dsize + new_dbuf.dsize);
+               unsigned int new_len = dbuf.dsize + new_dbuf.dsize;
+               unsigned char *new_dptr;
+
+               /* realloc '0' is special: don't do that. */
+               if (new_len == 0)
+                       new_len = 1;
+               new_dptr = (unsigned char *)realloc(dbuf.dptr, new_len);
                if (new_dptr == NULL) {
                        free(dbuf.dptr);
                }
@@ -648,6 +697,7 @@ int tdb_get_seqnum(struct tdb_context *tdb)
        tdb_off_t seqnum=0;
 
        tdb_ofs_read(tdb, TDB_SEQNUM_OFS, &seqnum);
+       tdb_trace(tdb, "tdb_get_seqnum = %u\n", seqnum);
        return seqnum;
 }
 
@@ -729,6 +779,8 @@ int tdb_wipe_all(struct tdb_context *tdb)
                return -1;
        }
 
+       tdb_trace(tdb, "tdb_wipe_all\n");
+
        /* see if the tdb has a recovery area, and remember its size
           if so. We don't want to lose this as otherwise each
           tdb_wipe_all() in a transaction will increase the size of
@@ -800,3 +852,33 @@ failed:
        tdb_unlockall(tdb);
        return -1;
 }
+
+#ifdef TDB_TRACE
+#include <stdarg.h>
+
+void tdb_trace(const struct tdb_context *tdb, const char *fmt, ...)
+{
+       char msg[256];
+       va_list args;
+       int len, err;
+
+       va_start(args, fmt);
+       len = vsprintf(msg, fmt, args);
+       va_end(args);
+
+       err = write(tdb->tracefd, msg, len);
+}
+
+void tdb_trace_record(const struct tdb_context *tdb, TDB_DATA rec)
+{
+       char msg[20];
+       unsigned int i;
+       int err;
+
+       err = write(tdb->tracefd, msg, sprintf(msg, "%zu:", rec.dsize));
+       for (i = 0; i < rec.dsize; i++)
+               err += write(tdb->tracefd, msg, sprintf(msg, "%02x",
+                                                       rec.dptr[i]));
+       err += write(tdb->tracefd, " ", 1);
+}
+#endif