[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 2/3] module: Don't load the same module if reques
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v4 2/3] module: Don't load the same module if requested multiple times |
Date: |
Mon, 5 Sep 2016 10:50:44 +0800 |
Use a hash table to keep record of all loaded modules, and return early
if the requested module is already loaded.
Signed-off-by: Fam Zheng <address@hidden>
---
util/module.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/util/module.c b/util/module.c
index a5f7fbd..c909737 100644
--- a/util/module.c
+++ b/util/module.c
@@ -163,14 +163,28 @@ void module_load_one(const char *prefix, const char
*lib_name)
char *fname = NULL;
char *exec_dir;
char *dirs[3];
+ char *module_name;
int i = 0;
int ret;
+ static GHashTable *loaded_modules;
if (!g_module_supported()) {
fprintf(stderr, "Module is not supported by system.\n");
return;
}
+ if (!loaded_modules) {
+ loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);
+ }
+
+ module_name = g_strdup_printf("%s%s", prefix, lib_name);
+
+ if (g_hash_table_lookup(loaded_modules, module_name)) {
+ g_free(module_name);
+ return;
+ }
+ g_hash_table_insert(loaded_modules, module_name, module_name);
+
exec_dir = qemu_get_exec_dir();
dirs[i++] = g_strdup_printf("%s", CONFIG_QEMU_MODDIR);
dirs[i++] = g_strdup_printf("%s/..", exec_dir ? : "");
@@ -180,8 +194,8 @@ void module_load_one(const char *prefix, const char
*lib_name)
exec_dir = NULL;
for (i = 0; i < ARRAY_SIZE(dirs); i++) {
- fname = g_strdup_printf("%s/%s%s%s",
- dirs[i], prefix, lib_name, HOST_DSOSUF);
+ fname = g_strdup_printf("%s/%s%s",
+ dirs[i], module_name, HOST_DSOSUF);
ret = module_load_file(fname);
g_free(fname);
fname = NULL;
--
2.7.4
- [Qemu-block] [PATCH v4 0/3] block: Fix libbz2 library dependency regresssion, Fam Zheng, 2016/09/04
- [Qemu-block] [PATCH v4 2/3] module: Don't load the same module if requested multiple times,
Fam Zheng <=
- [Qemu-block] [PATCH v4 1/3] scripts: Allow block module to not define BlockDriver, Fam Zheng, 2016/09/04
- [Qemu-block] [PATCH v4 3/3] dmg: Move libbz2 code to dmg-bz2.so, Fam Zheng, 2016/09/04
- Re: [Qemu-block] [PATCH v4 0/3] block: Fix libbz2 library dependency regresssion, Stefan Hajnoczi, 2016/09/14
- Re: [Qemu-block] [PATCH v4 0/3] block: Fix libbz2 library dependency regresssion, Stefan Hajnoczi, 2016/09/14
- Re: [Qemu-block] [PATCH v4 0/3] block: Fix libbz2 library dependency regresssion, Max Reitz, 2016/09/23