lib: Add "mem_ctx" to gencache_get_data_blob

[mat/samba.git] / source3 / lib / gencache.c

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index a64677d2bfed632555418d2314e301d94c6f74ad..7d89c7d05ab56e169ebd0683f3677ecfb90cb163 100644 (file)
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -58,33 +58,36 @@ static bool gencache_init(void)
 {
        char* cache_fname = NULL;
        int open_flags = O_RDWR|O_CREAT;
-       bool first_try = true;
 
        /* skip file open if it's already opened */
        if (cache) return True;
 
-       cache_fname = lock_path("gencache.tdb");
+       cache_fname = cache_path("gencache.tdb");
 
        DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 
-again:
        cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT|TDB_INCOMPATIBLE_HASH, open_flags, 0644);
        if (cache) {
                int ret;
                ret = tdb_check(cache, NULL, NULL);
                if (ret != 0) {
                        tdb_close(cache);
-                       cache = NULL;
-                       if (!first_try) {
-                               DEBUG(0, ("gencache_init: tdb_check(%s) failed\n",
-                                         cache_fname));
-                               return false;
-                       }
-                       first_try = false;
-                       DEBUG(0, ("gencache_init: tdb_check(%s) failed - retry after truncate\n",
-                                 cache_fname));
-                       truncate(cache_fname, 0);
-                       goto again;
+
+                       /*
+                        * Retry with CLEAR_IF_FIRST.
+                        *
+                        * Warning: Converting this to dbwrap won't work
+                        * directly. gencache.c does transactions on this tdb,
+                        * and dbwrap forbids this for CLEAR_IF_FIRST
+                        * databases. tdb does allow transactions on
+                        * CLEAR_IF_FIRST databases, so lets use it here to
+                        * clean up a broken database.
+                        */
+                       cache = tdb_open_log(cache_fname, 0,
+                                            TDB_DEFAULT|
+                                            TDB_INCOMPATIBLE_HASH|
+                                            TDB_CLEAR_IF_FIRST,
+                                            open_flags, 0644);
                }
        }
 
@@ -106,7 +109,10 @@ again:
 
        DEBUG(5, ("Opening cache file at %s\n", cache_fname));
 
-       cache_notrans = tdb_open_log(cache_fname, 0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+       cache_notrans = tdb_open_log(cache_fname, 0,
+                                    TDB_CLEAR_IF_FIRST|
+                                    TDB_INCOMPATIBLE_HASH|
+                                    TDB_NOSYNC,
                                     open_flags, 0644);
        if (cache_notrans == NULL) {
                DEBUG(5, ("Opening %s failed: %s\n", cache_fname,
@@ -283,8 +289,9 @@ bool gencache_set_data_blob(const char *keystr, const DATA_BLOB *blob,
                return false;
        }
 
-       DEBUG(10, ("Adding cache entry with key = %s and timeout ="
-                  " %s (%d seconds %s)\n", keystr, ctime(&timeout),
+       DEBUG(10, ("Adding cache entry with key=[%s] and timeout="
+                  "[%s] (%d seconds %s)\n", keystr,
+                  timestring(talloc_tos(), timeout),
                   (int)(timeout - time(NULL)), 
                   timeout > time(NULL) ? "ahead" : "in the past"));
 
@@ -353,7 +360,7 @@ bool gencache_del(const char *keystr)
 
        if (!gencache_init()) return False;     
 
-       DEBUG(10, ("Deleting cache entry (key = %s)\n", keystr));
+       DEBUG(10, ("Deleting cache entry (key=[%s])\n", keystr));
 
        /*
         * We delete an element by setting its timeout to 0. This way we don't
@@ -361,7 +368,8 @@ bool gencache_del(const char *keystr)
         * element.
         */
 
-       exists = gencache_get_data_blob(keystr, &value, NULL, &was_expired);
+       exists = gencache_get_data_blob(keystr, NULL, &value, NULL,
+                                       &was_expired);
 
        if (!exists && was_expired) {
                /*
@@ -462,6 +470,7 @@ bool gencache_parse(const char *keystr,
 }
 
 struct gencache_get_data_blob_state {
+       TALLOC_CTX *mem_ctx;
        DATA_BLOB *blob;
        time_t timeout;
        bool result;
@@ -484,7 +493,8 @@ static void gencache_get_data_blob_parser(time_t timeout, DATA_BLOB blob,
                return;
        }
 
-       *state->blob = data_blob(blob.data, blob.length);
+       *state->blob = data_blob_talloc(state->mem_ctx, blob.data,
+                                       blob.length);
        if (state->blob->data == NULL) {
                state->result = false;
                return;
@@ -504,13 +514,15 @@ static void gencache_get_data_blob_parser(time_t timeout, DATA_BLOB blob,
  * @retval False for failure
  **/
 
-bool gencache_get_data_blob(const char *keystr, DATA_BLOB *blob,
+bool gencache_get_data_blob(const char *keystr, TALLOC_CTX *mem_ctx,
+                           DATA_BLOB *blob,
                            time_t *timeout, bool *was_expired)
 {
        struct gencache_get_data_blob_state state;
        bool expired = false;
 
        state.result = false;
+       state.mem_ctx = mem_ctx;
        state.blob = blob;
 
        if (!gencache_parse(keystr, gencache_get_data_blob_parser, &state)) {
@@ -698,7 +710,7 @@ bool gencache_get(const char *keystr, char **value, time_t *ptimeout)
        DATA_BLOB blob;
        bool ret = False;
 
-       ret = gencache_get_data_blob(keystr, &blob, ptimeout, NULL);
+       ret = gencache_get_data_blob(keystr, NULL, &blob, ptimeout, NULL);
        if (!ret) {
                return false;
        }
@@ -783,8 +795,9 @@ static int gencache_iterate_blobs_fn(struct tdb_context *tdb, TDB_DATA key,
                goto done;
        }
 
-       DEBUG(10, ("Calling function with arguments (key=%s, timeout=%s)\n",
-                  keystr, ctime(&timeout)));
+       DEBUG(10, ("Calling function with arguments "
+                  "(key=[%s], timeout=[%s])\n",
+                  keystr, timestring(talloc_tos(), timeout)));
 
        state->fn(keystr,
                  data_blob_const(endptr,
@@ -853,8 +866,8 @@ static void gencache_iterate_fn(const char *key, DATA_BLOB value,
        }
 
        DEBUG(10, ("Calling function with arguments "
-                  "(key = %s, value = %s, timeout = %s)\n",
-                  key, valstr, ctime(&timeout)));
+                  "(key=[%s], value=[%s], timeout=[%s])\n",
+                  key, valstr, timestring(talloc_tos(), timeout)));
 
        state->fn(key, valstr, timeout, state->private_data);