OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/disk_cache: use unambiguous naming

Browse Source 
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Marek Olšák
2016-11-13 16:54:38 +01:00
parent 31727300e1
commit a6ff2a3378
3 changed files with 114 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/compiler/glsl/tests/cache_test.c
View File

@@ -115,65 +115,65 @@ rmrf_local(const char *path)
#define CACHE_TEST_TMP "./cache-test-tmp"
static void
test_cache_create(void)
test_disk_cache_create(void)
{
struct program_cache *cache;
struct disk_cache *cache;
int err;
/* Before doing anything else, ensure that with
* MESA_GLSL_CACHE_DISABLE set, that cache_create returns NULL.
* MESA_GLSL_CACHE_DISABLE set, that disk_cache_create returns NULL.
*/
setenv("MESA_GLSL_CACHE_DISABLE", "1", 1);
cache = cache_create();
expect_null(cache, "cache_create with MESA_GLSL_CACHE_DISABLE set");
cache = disk_cache_create();
expect_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DISABLE set");
unsetenv("MESA_GLSL_CACHE_DISABLE");
/* For the first real cache_create() clear these environment
/* For the first real disk_cache_create() clear these environment
* variables to test creation of cache in home directory.
*/
unsetenv("MESA_GLSL_CACHE_DIR");
unsetenv("XDG_CACHE_HOME");
cache = cache_create();
expect_non_null(cache, "cache_create with no environment variables");
cache = disk_cache_create();
expect_non_null(cache, "disk_cache_create with no environment variables");
cache_destroy(cache);
disk_cache_destroy(cache);
/* Test with XDG_CACHE_HOME set */
setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
cache = cache_create();
expect_null(cache, "cache_create with XDG_CACHE_HOME set with"
cache = disk_cache_create();
expect_null(cache, "disk_cache_create with XDG_CACHE_HOME set with"
"a non-existing parent directory");
mkdir(CACHE_TEST_TMP, 0755);
cache = cache_create();
expect_non_null(cache, "cache_create with XDG_CACHE_HOME set");
cache = disk_cache_create();
expect_non_null(cache, "disk_cache_create with XDG_CACHE_HOME set");
cache_destroy(cache);
disk_cache_destroy(cache);
/* Test with MESA_GLSL_CACHE_DIR set */
err = rmrf_local(CACHE_TEST_TMP);
expect_equal(err, 0, "Removing " CACHE_TEST_TMP);
setenv("MESA_GLSL_CACHE_DIR", CACHE_TEST_TMP "/mesa-glsl-cache-dir", 1);
cache = cache_create();
expect_null(cache, "cache_create with MESA_GLSL_CACHE_DIR set with"
cache = disk_cache_create();
expect_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DIR set with"
"a non-existing parent directory");
mkdir(CACHE_TEST_TMP, 0755);
cache = cache_create();
expect_non_null(cache, "cache_create with MESA_GLSL_CACHE_DIR set");
cache = disk_cache_create();
expect_non_null(cache, "disk_cache_create with MESA_GLSL_CACHE_DIR set");
cache_destroy(cache);
disk_cache_destroy(cache);
}
static bool
does_cache_contain(struct program_cache *cache, cache_key key)
does_cache_contain(struct disk_cache *cache, cache_key key)
{
void *result;
result = cache_get(cache, key, NULL);
result = disk_cache_get(cache, key, NULL);
if (result) {
free(result);
@@ -186,7 +186,7 @@ does_cache_contain(struct program_cache *cache, cache_key key)
static void
test_put_and_get(void)
{
struct program_cache *cache;
struct disk_cache *cache;
/* If the text of this blob is changed, then blob_key_byte_zero
* also needs to be updated.
*/
@@ -201,39 +201,39 @@ test_put_and_get(void)
uint8_t one_KB_key[20], one_MB_key[20];
int count;
cache = cache_create();
cache = disk_cache_create();
_mesa_sha1_compute(blob, sizeof(blob), blob_key);
/* Ensure that cache_get returns nothing before anything is added. */
result = cache_get(cache, blob_key, &size);
expect_null(result, "cache_get with non-existent item (pointer)");
expect_equal(size, 0, "cache_get with non-existent item (size)");
/* Ensure that disk_cache_get returns nothing before anything is added. */
result = disk_cache_get(cache, blob_key, &size);
expect_null(result, "disk_cache_get with non-existent item (pointer)");
expect_equal(size, 0, "disk_cache_get with non-existent item (size)");
/* Simple test of put and get. */
cache_put(cache, blob_key, blob, sizeof(blob));
disk_cache_put(cache, blob_key, blob, sizeof(blob));
result = cache_get(cache, blob_key, &size);
expect_equal_str(blob, result, "cache_get of existing item (pointer)");
expect_equal(size, sizeof(blob), "cache_get of existing item (size)");
result = disk_cache_get(cache, blob_key, &size);
expect_equal_str(blob, result, "disk_cache_get of existing item (pointer)");
expect_equal(size, sizeof(blob), "disk_cache_get of existing item (size)");
free(result);
/* Test put and get of a second item. */
_mesa_sha1_compute(string, sizeof(string), string_key);
cache_put(cache, string_key, string, sizeof(string));
disk_cache_put(cache, string_key, string, sizeof(string));
result = cache_get(cache, string_key, &size);
expect_equal_str(result, string, "2nd cache_get of existing item (pointer)");
expect_equal(size, sizeof(string), "2nd cache_get of existing item (size)");
result = disk_cache_get(cache, string_key, &size);
expect_equal_str(result, string, "2nd disk_cache_get of existing item (pointer)");
expect_equal(size, sizeof(string), "2nd disk_cache_get of existing item (size)");
free(result);
/* Set the cache size to 1KB and add a 1KB item to force an eviction. */
cache_destroy(cache);
disk_cache_destroy(cache);
setenv("MESA_GLSL_CACHE_MAX_SIZE", "1K", 1);
cache = cache_create();
cache = disk_cache_create();
one_KB = calloc(1, 1024);
@@ -243,7 +243,7 @@ test_put_and_get(void)
* (with only three files in the cache), the probability is good
* that each of the three files will end up in their own
* directory. Then, if the directory containing the .tmp file for
* the new item being added for cache_put() is the chosen victim
* the new item being added for disk_cache_put() is the chosen victim
* directory for eviction, then no suitable file will be found and
* nothing will be evicted.
*
@@ -257,13 +257,13 @@ test_put_and_get(void)
_mesa_sha1_compute(one_KB, 1024, one_KB_key);
one_KB_key[0] = blob_key_byte_zero;
cache_put(cache, one_KB_key, one_KB, 1024);
disk_cache_put(cache, one_KB_key, one_KB, 1024);
free(one_KB);
result = cache_get(cache, one_KB_key, &size);
expect_non_null(result, "3rd cache_get of existing item (pointer)");
expect_equal(size, 1024, "3rd cache_get of existing item (size)");
result = disk_cache_get(cache, one_KB_key, &size);
expect_non_null(result, "3rd disk_cache_get of existing item (pointer)");
expect_equal(size, 1024, "3rd disk_cache_get of existing item (size)");
free(result);
@@ -277,18 +277,18 @@ test_put_and_get(void)
if (does_cache_contain(cache, string_key))
count++;
expect_equal(count, 1, "cache_put eviction with MAX_SIZE=1K");
expect_equal(count, 1, "disk_cache_put eviction with MAX_SIZE=1K");
/* Now increase the size to 1M, add back both items, and ensure all
* three that have been added are available via cache_get.
* three that have been added are available via disk_cache_get.
*/
cache_destroy(cache);
disk_cache_destroy(cache);
setenv("MESA_GLSL_CACHE_MAX_SIZE", "1M", 1);
cache = cache_create();
cache = disk_cache_create();
cache_put(cache, blob_key, blob, sizeof(blob));
cache_put(cache, string_key, string, sizeof(string));
disk_cache_put(cache, blob_key, blob, sizeof(blob));
disk_cache_put(cache, string_key, string, sizeof(string));
count = 0;
if (does_cache_contain(cache, blob_key))
@@ -308,7 +308,7 @@ test_put_and_get(void)
_mesa_sha1_compute(one_MB, 1024 * 1024, one_MB_key);
one_MB_key[0] = blob_key_byte_zero;;
cache_put(cache, one_MB_key, one_MB, 1024 * 1024);
disk_cache_put(cache, one_MB_key, one_MB, 1024 * 1024);
free(one_MB);
@@ -324,13 +324,13 @@ test_put_and_get(void)
expect_equal(count, 2, "eviction after overflow with MAX_SIZE=1M");
cache_destroy(cache);
disk_cache_destroy(cache);
}
static void
test_put_key_and_get_key(void)
{
struct program_cache *cache;
struct disk_cache *cache;
bool result;
uint8_t key_a[20] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
@@ -341,42 +341,42 @@ test_put_key_and_get_key(void)
{ 0, 1, 42, 43, 44, 45, 46, 47, 48, 49,
50, 55, 52, 53, 54, 55, 56, 57, 58, 59};
cache = cache_create();
cache = disk_cache_create();
/* First test that cache_has_key returns false before cache_put_key */
result = cache_has_key(cache, key_a);
expect_equal(result, 0, "cache_has_key before key added");
/* First test that disk_cache_has_key returns false before disk_cache_put_key */
result = disk_cache_has_key(cache, key_a);
expect_equal(result, 0, "disk_cache_has_key before key added");
/* Then a couple of tests of cache_put_key followed by cache_has_key */
cache_put_key(cache, key_a);
result = cache_has_key(cache, key_a);
expect_equal(result, 1, "cache_has_key after key added");
/* Then a couple of tests of disk_cache_put_key followed by disk_cache_has_key */
disk_cache_put_key(cache, key_a);
result = disk_cache_has_key(cache, key_a);
expect_equal(result, 1, "disk_cache_has_key after key added");
cache_put_key(cache, key_b);
result = cache_has_key(cache, key_b);
expect_equal(result, 1, "2nd cache_has_key after key added");
disk_cache_put_key(cache, key_b);
result = disk_cache_has_key(cache, key_b);
expect_equal(result, 1, "2nd disk_cache_has_key after key added");
/* Test that a key with the same two bytes as an existing key
* forces an eviction.
*/
cache_put_key(cache, key_a_collide);
result = cache_has_key(cache, key_a_collide);
disk_cache_put_key(cache, key_a_collide);
result = disk_cache_has_key(cache, key_a_collide);
expect_equal(result, 1, "put_key of a colliding key lands in the cache");
result = cache_has_key(cache, key_a);
result = disk_cache_has_key(cache, key_a);
expect_equal(result, 0, "put_key of a colliding key evicts from the cache");
/* And finally test that we can re-add the original key to re-evict
* the colliding key.
*/
cache_put_key(cache, key_a);
result = cache_has_key(cache, key_a);
disk_cache_put_key(cache, key_a);
result = disk_cache_has_key(cache, key_a);
expect_equal(result, 1, "put_key of original key lands again");
result = cache_has_key(cache, key_a_collide);
result = disk_cache_has_key(cache, key_a_collide);
expect_equal(result, 0, "put_key of orginal key evicts the colliding key");
cache_destroy(cache);
disk_cache_destroy(cache);
}
#endif /* ENABLE_SHADER_CACHE */
@@ -386,7 +386,7 @@ main(void)
#ifdef ENABLE_SHADER_CACHE
int err;
test_cache_create();
test_disk_cache_create();
test_put_and_get();