util: virfilecache: Introduce virFileCacheClear for usage in tests

In tests we need to be able to populate the cache with a deterministic
set of entries. This means we need to drop the contents of the cache
between runs to prevent spillage between test cases.

virFileCacheClear drops all entries from the hash table used for the
cache.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8792bf7f5486db9ec2584ab759f8af9f3af1cbe9..d5b1b9cb7216c7a9efce52f5d210bc8f671d93b1 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2354,6 +2354,7 @@ virFindFileInPath;
 
 
 # util/virfilecache.h
+virFileCacheClear;
 virFileCacheGetPriv;
 virFileCacheInsertData;
 virFileCacheLookup;

diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index bad37c9f004f7755de76dc40b3487e353df1b09e..b9e06545c0203c3d4ae7080d5104a37ae846fd4c 100644 (file)
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -407,3 +407,19 @@ virFileCacheInsertData(virFileCache *cache,
 
     return ret;
 }
+
+
+/**
+ * virFileCacheClear:
+ * @cache: existing cache object
+ *
+ * Drops all entries from the cache. This is useful in tests to clean out
+ * previous usage.
+ */
+void
+virFileCacheClear(virFileCache *cache)
+{
+    virObjectLock(cache);
+    virHashRemoveAll(cache->table);
+    virObjectUnlock(cache);
+}

diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h
index 81be8feef53686e9cb8c14bd55bfb18ebf9c09ab..c3bc0f529ca17931a5c28a7f973164bb1f45a22b 100644 (file)
--- a/src/util/virfilecache.h
+++ b/src/util/virfilecache.h
@@ -135,3 +135,7 @@ int
 virFileCacheInsertData(virFileCache *cache,
                        const char *name,
                        void *data);
+
+/* for testing usage */
+void
+virFileCacheClear(virFileCache *cache);