Mesa (staging/18.2): util: add disk_cache_get_function_identifier()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 11 08:26:13 UTC 2018
Module: Mesa
Branch: staging/18.2
Commit: 06e726ddb572b84ae29ad766f55163559e90fb57
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06e726ddb572b84ae29ad766f55163559e90fb57
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Wed Sep 19 11:44:12 2018 +1000
util: add disk_cache_get_function_identifier()
This can be used as a drop in replacement for
disk_cache_get_function_timestamp().
Here we use build-id to generate a driver-id rather than build
timestamp if available. This should resolve issues such as
distros using reproducable builds and flatpak not having
real build timestamps.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 83ea8dd99bb16e5d9bb880e64cd2047abc536b70)
---
src/util/disk_cache.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index c8685a53ed..3129de8ec9 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -27,6 +27,7 @@
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
#include <stdio.h>
+#include "util/build_id.h"
#endif
#include <assert.h>
#include <stdint.h>
@@ -112,6 +113,21 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
return true;
}
+
+static inline bool
+disk_cache_get_function_identifier(void *ptr, uint32_t *id)
+{
+#ifdef HAVE_DL_ITERATE_PHDR
+ const struct build_id_note *note = NULL;
+ if ((note = build_id_find_nhdr_for_addr(ptr))) {
+ const uint8_t *id_sha1 = build_id_data(note);
+ assert(id_sha1);
+ *id = *id_sha1;
+ return true;
+ } else
+#endif
+ return disk_cache_get_function_timestamp(ptr, id);
+}
#endif
/* Provide inlined stub functions if the shader cache is disabled. */
More information about the mesa-commit
mailing list