Mesa (master): util/disk_cache: support caches for multiple architectures
Timothy Arceri
tarceri at kemper.freedesktop.org
Sun Mar 5 22:27:22 UTC 2017
Module: Mesa
Branch: master
Commit: 11f0efec2e615f5233defdd8ca9693c54ea49b1f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11f0efec2e615f5233defdd8ca9693c54ea49b1f
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Sun Mar 5 08:07:22 2017 +1100
util/disk_cache: support caches for multiple architectures
Previously we were deleting the entire cache if a user switched
between 32 and 64 bit applications.
V2: make the check more generic, it should now work with any
platform we are likely to support.
V3: Use suggestion from Emil to make even more generic/fix issue
with __ILP32__ not being declared on gcc for regular 32-bit builds.
Tested-by: Grazvydas Ignotas <notasas at gmail.com>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
---
src/util/disk_cache.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 198d90e..7f24939 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -74,6 +74,23 @@ struct disk_cache {
uint64_t max_size;
};
+static const char *
+get_arch_bitness_str(void)
+{
+ if (sizeof(void *) == 4)
+#ifdef __ILP32__
+ return "ilp-32";
+#else
+ return "32";
+#endif
+ if (sizeof(void *) == 8)
+ return "64";
+
+ /* paranoia check which will be dropped by the optimiser */
+ assert(!"unknown_arch");
+ return "unknown_arch";
+}
+
/* Create a directory named 'path' if it does not already exist.
*
* Returns: 0 if path already exists as a directory or if created.
@@ -178,6 +195,15 @@ create_mesa_cache_dir(void *mem_ctx, const char *path, const char *timestamp,
if (new_path == NULL)
return NULL;
+ /* Create a parent architecture directory so that we don't remove cache
+ * files for other architectures. In theory we could share the cache
+ * between architectures but we have no way of knowing if they were created
+ * by a compatible Mesa version.
+ */
+ new_path = concatenate_and_mkdir(mem_ctx, new_path, get_arch_bitness_str());
+ if (new_path == NULL)
+ return NULL;
+
/* Remove cache directories for old Mesa versions */
remove_old_cache_directories(mem_ctx, new_path, timestamp);
More information about the mesa-commit
mailing list