Mesa (main): util/disk_cache: add nocopy variant of disk cache store function

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9fdb6f56e1e49e70c261b816f327dce83fd2918a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fdb6f56e1e49e70c261b816f327dce83fd2918a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon May 10 07:37:09 2021 -0400

util/disk_cache: add nocopy variant of disk cache store function

this is a bit more convenient in some cases

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11304>

---

 src/util/disk_cache.c | 52 ++++++++++++++++++++++++++++++++++++++++++++-------
 src/util/disk_cache.h | 24 ++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 511b2c7920d..4aa719a2de6 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -261,17 +261,22 @@ disk_cache_remove(struct disk_cache *cache, const cache_key key)
 
 static struct disk_cache_put_job *
 create_put_job(struct disk_cache *cache, const cache_key key,
-               const void *data, size_t size,
-               struct cache_item_metadata *cache_item_metadata)
+               void *data, size_t size,
+               struct cache_item_metadata *cache_item_metadata,
+               bool take_ownership)
 {
    struct disk_cache_put_job *dc_job = (struct disk_cache_put_job *)
-      malloc(sizeof(struct disk_cache_put_job) + size);
+      malloc(sizeof(struct disk_cache_put_job) + (take_ownership ? 0 : size));
 
    if (dc_job) {
       dc_job->cache = cache;
       memcpy(dc_job->key, key, sizeof(cache_key));
-      dc_job->data = dc_job + 1;
-      memcpy(dc_job->data, data, size);
+      if (take_ownership) {
+         dc_job->data = data;
+      } else {
+         dc_job->data = dc_job + 1;
+         memcpy(dc_job->data, data, size);
+      }
       dc_job->size = size;
 
       /* Copy the cache item metadata */
@@ -310,11 +315,18 @@ destroy_put_job(void *job, int thread_index)
    if (job) {
       struct disk_cache_put_job *dc_job = (struct disk_cache_put_job *) job;
       free(dc_job->cache_item_metadata.keys);
-
       free(job);
    }
 }
 
+static void
+destroy_put_job_nocopy(void *job, int thread_index)
+{
+   struct disk_cache_put_job *dc_job = (struct disk_cache_put_job *) job;
+   free(dc_job->data);
+   destroy_put_job(job, thread_index);
+}
+
 static void
 cache_put(void *job, int thread_index)
 {
@@ -359,7 +371,7 @@ disk_cache_put(struct disk_cache *cache, const cache_key key,
       return;
 
    struct disk_cache_put_job *dc_job =
-      create_put_job(cache, key, data, size, cache_item_metadata);
+      create_put_job(cache, key, (void*)data, size, cache_item_metadata, false);
 
    if (dc_job) {
       util_queue_fence_init(&dc_job->fence);
@@ -368,6 +380,32 @@ disk_cache_put(struct disk_cache *cache, const cache_key key,
    }
 }
 
+void
+disk_cache_put_nocopy(struct disk_cache *cache, const cache_key key,
+                      void *data, size_t size,
+                      struct cache_item_metadata *cache_item_metadata)
+{
+   if (cache->blob_put_cb) {
+      cache->blob_put_cb(key, CACHE_KEY_SIZE, data, size);
+      free(data);
+      return;
+   }
+
+   if (cache->path_init_failed) {
+      free(data);
+      return;
+   }
+
+   struct disk_cache_put_job *dc_job =
+      create_put_job(cache, key, data, size, cache_item_metadata, true);
+
+   if (dc_job) {
+      util_queue_fence_init(&dc_job->fence);
+      util_queue_add_job(&cache->cache_queue, dc_job, &dc_job->fence,
+                         cache_put, destroy_put_job_nocopy, dc_job->size);
+   }
+}
+
 void *
 disk_cache_get(struct disk_cache *cache, const cache_key key, size_t *size)
 {
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index fd4b17c2224..978e1dee5ef 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -207,6 +207,22 @@ disk_cache_put(struct disk_cache *cache, const cache_key key,
                const void *data, size_t size,
                struct cache_item_metadata *cache_item_metadata);
 
+/**
+ * Store an item in the cache under the name \key without copying the data param.
+ *
+ * The item can be retrieved later with disk_cache_get(), (unless the item has
+ * been evicted in the interim).
+ *
+ * Any call to disk_cache_put() may cause an existing, random item to be
+ * evicted from the cache.
+ *
+ * @p data will be freed
+ */
+void
+disk_cache_put_nocopy(struct disk_cache *cache, const cache_key key,
+                      void *data, size_t size,
+                      struct cache_item_metadata *cache_item_metadata);
+
 /**
  * Retrieve an item previously stored in the cache with the name <key>.
  *
@@ -281,6 +297,14 @@ disk_cache_put(struct disk_cache *cache, const cache_key key,
    return;
 }
 
+static inline void
+disk_cache_put_nocopy(struct disk_cache *cache, const cache_key key,
+                      void *data, size_t size,
+                      struct cache_item_metadata *cache_item_metadata)
+{
+   return;
+}
+
 static inline void
 disk_cache_remove(struct disk_cache *cache, const cache_key key)
 {