Module: Mesa Branch: master Commit: 83c81b6cce761ea6f202f222bde568f0bc006f3f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83c81b6cce761ea6f202f222bde568f0bc006f3f
Author: Tapani Pälli <[email protected]> Date: Tue Jan 30 11:42:55 2018 +0200 glsl/tests: move utility functions in cache_test Patch moves functions higher so that we can utilize them from test_disk_cache_create which is modified by next patch. Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Emil Velikov <[email protected]> --- src/compiler/glsl/tests/cache_test.c | 70 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/compiler/glsl/tests/cache_test.c b/src/compiler/glsl/tests/cache_test.c index 75319f1160..dd11fd5944 100644 --- a/src/compiler/glsl/tests/cache_test.c +++ b/src/compiler/glsl/tests/cache_test.c @@ -147,6 +147,41 @@ check_directories_created(const char *cache_dir) expect_true(sub_dirs_created, "create sub dirs"); } +static bool +does_cache_contain(struct disk_cache *cache, const cache_key key) +{ + void *result; + + result = disk_cache_get(cache, key, NULL); + + if (result) { + free(result); + return true; + } + + return false; +} + +static void +wait_until_file_written(struct disk_cache *cache, const cache_key key) +{ + struct timespec req; + struct timespec rem; + + /* Set 100ms delay */ + req.tv_sec = 0; + req.tv_nsec = 100000000; + + unsigned retries = 0; + while (retries++ < 20) { + if (does_cache_contain(cache, key)) { + break; + } + + nanosleep(&req, &rem); + } +} + #define CACHE_TEST_TMP "./cache-test-tmp" static void @@ -209,41 +244,6 @@ test_disk_cache_create(void) disk_cache_destroy(cache); } -static bool -does_cache_contain(struct disk_cache *cache, const cache_key key) -{ - void *result; - - result = disk_cache_get(cache, key, NULL); - - if (result) { - free(result); - return true; - } - - return false; -} - -static void -wait_until_file_written(struct disk_cache *cache, const cache_key key) -{ - struct timespec req; - struct timespec rem; - - /* Set 100ms delay */ - req.tv_sec = 0; - req.tv_nsec = 100000000; - - unsigned retries = 0; - while (retries++ < 20) { - if (does_cache_contain(cache, key)) { - break; - } - - nanosleep(&req, &rem); - } -} - static void test_put_and_get(void) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
