[Mesa-dev] [PATCH v2 3/7] util/disk_cache: hash timestamps into the cache keys
Grazvydas Ignotas
notasas at gmail.com
Wed Mar 15 23:09:29 UTC 2017
Instead of using a directory, hash the timestamps into the cache keys
themselves. Since there is no more timestamp directory, there is no more
need for deleting the cache of other mesa versions and we rely on
eviction to clean up the old cache entries. This solves the problem of
using several incarnations of disk_cache at the same time, where one
deletes a directory belonging to the other, like when both OpenGL and
gallium nine are used simultaneously (or several different mesa
installations).
v2: using additional blob instead of trying to clone sha1 state
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100091
Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
---
src/compiler/glsl/tests/cache_test.c | 10 ++---
src/util/disk_cache.c | 71 ++++++++++--------------------------
2 files changed, 25 insertions(+), 56 deletions(-)
diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c
index b1b3c33..b604943 100644
--- a/src/compiler/glsl/tests/cache_test.c
+++ b/src/compiler/glsl/tests/cache_test.c
@@ -128,7 +128,7 @@ rmrf_local(const char *path)
}
static void
-check_timestamp_and_gpu_id_directories_created(char *cache_dir)
+check_directories_created(char *cache_dir)
{
bool sub_dirs_created = false;
@@ -184,13 +184,13 @@ test_disk_cache_create(void)
/* Create string with expected directory hierarchy */
char expected_dir_h[255];
sprintf(expected_dir_h, "%s%s%s", CACHE_TEST_TMP "/xdg-cache-home/mesa/",
- get_arch_bitness_str(), "/make_check/test");
+ get_arch_bitness_str(), "/test");
mkdir(CACHE_TEST_TMP, 0755);
cache = disk_cache_create("test", "make_check");
expect_non_null(cache, "disk_cache_create with XDG_CACHE_HOME set");
- check_timestamp_and_gpu_id_directories_created(expected_dir_h);
+ check_directories_created(expected_dir_h);
disk_cache_destroy(cache);
@@ -205,13 +205,13 @@ test_disk_cache_create(void)
sprintf(expected_dir_h, "%s%s%s", CACHE_TEST_TMP
"/mesa-glsl-cache-dir/mesa/", get_arch_bitness_str(),
- "/make_check/test");
+ "/test");
mkdir(CACHE_TEST_TMP, 0755);
cache = disk_cache_create("test", "make_check");
expect_non_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DIR set");
- check_timestamp_and_gpu_id_directories_created(expected_dir_h);
+ check_directories_created(expected_dir_h);
disk_cache_destroy(cache);
}
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 620adc0..76c2df9 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -78,6 +78,10 @@ struct disk_cache {
/* Maximum size of all cached objects (in bytes). */
uint64_t max_size;
+
+ /* Extra data blob to hash into the cache keys. */
+ void *key_blob;
+ size_t key_blob_size;
};
struct disk_cache_put_job {
@@ -154,45 +158,8 @@ concatenate_and_mkdir(void *ctx, const char *path, const char *name)
return NULL;
}
-static int
-remove_dir(const char *fpath, const struct stat *sb,
- int typeflag, struct FTW *ftwbuf)
-{
- if (S_ISREG(sb->st_mode))
- unlink(fpath);
- else if (S_ISDIR(sb->st_mode))
- rmdir(fpath);
-
- return 0;
-}
-
-static void
-remove_old_cache_directories(void *mem_ctx, const char *path,
- const char *timestamp)
-{
- DIR *dir = opendir(path);
-
- struct dirent* d_entry;
- while((d_entry = readdir(dir)) != NULL)
- {
- char *full_path =
- ralloc_asprintf(mem_ctx, "%s/%s", path, d_entry->d_name);
-
- struct stat sb;
- if (stat(full_path, &sb) == 0 && S_ISDIR(sb.st_mode) &&
- strcmp(d_entry->d_name, timestamp) != 0 &&
- strcmp(d_entry->d_name, "..") != 0 &&
- strcmp(d_entry->d_name, ".") != 0) {
- nftw(full_path, remove_dir, 20, FTW_DEPTH);
- }
- }
-
- closedir(dir);
-}
-
static char *
-create_mesa_cache_dir(void *mem_ctx, const char *path, const char *timestamp,
- const char *gpu_name)
+create_mesa_cache_dir(void *mem_ctx, const char *path, const char *gpu_name)
{
char *new_path = concatenate_and_mkdir(mem_ctx, path, "mesa");
if (new_path == NULL)
@@ -207,13 +174,6 @@ create_mesa_cache_dir(void *mem_ctx, const char *path, const char *timestamp,
if (new_path == NULL)
return NULL;
- /* Remove cache directories for old Mesa versions */
- remove_old_cache_directories(mem_ctx, new_path, timestamp);
-
- new_path = concatenate_and_mkdir(mem_ctx, new_path, timestamp);
- if (new_path == NULL)
- return NULL;
-
new_path = concatenate_and_mkdir(mem_ctx, new_path, gpu_name);
if (new_path == NULL)
return NULL;
@@ -257,8 +217,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
if (mkdir_if_needed(path) == -1)
goto fail;
- path = create_mesa_cache_dir(local, path, timestamp,
- gpu_name);
+ path = create_mesa_cache_dir(local, path, gpu_name);
if (path == NULL)
goto fail;
}
@@ -270,8 +229,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
if (mkdir_if_needed(xdg_cache_home) == -1)
goto fail;
- path = create_mesa_cache_dir(local, xdg_cache_home, timestamp,
- gpu_name);
+ path = create_mesa_cache_dir(local, xdg_cache_home, gpu_name);
if (path == NULL)
goto fail;
}
@@ -307,7 +265,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
if (path == NULL)
goto fail;
- path = create_mesa_cache_dir(local, path, timestamp, gpu_name);
+ path = create_mesa_cache_dir(local, path, gpu_name);
if (path == NULL)
goto fail;
}
@@ -316,6 +274,12 @@ disk_cache_create(const char *gpu_name, const char *timestamp)
if (cache == NULL)
goto fail;
+ cache->key_blob_size = strlen(timestamp);
+ cache->key_blob = ralloc_size(cache, cache->key_blob_size);
+ if (cache->key_blob == NULL)
+ goto fail;
+ memcpy(cache->key_blob, timestamp, cache->key_blob_size);
+
cache->path = ralloc_strdup(cache, path);
if (cache->path == NULL)
goto fail;
@@ -1074,7 +1038,12 @@ void
disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size,
cache_key key)
{
- _mesa_sha1_compute(data, size, key);
+ struct mesa_sha1 ctx;
+
+ _mesa_sha1_init(&ctx);
+ _mesa_sha1_update(&ctx, cache->key_blob, cache->key_blob_size);
+ _mesa_sha1_update(&ctx, data, size);
+ _mesa_sha1_final(&ctx, key);
}
#endif /* ENABLE_SHADER_CACHE */
--
2.7.4
More information about the mesa-dev
mailing list