🦄 refactor(module_manager ): new with hooks

6 files changed, 141 insertions, 126 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d05e8d..b399cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@ include(Package)
 add_definitions(-D_GNU_SOURCE)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_EXTENSIONS ON)
 
 # set warning as error
 add_compile_options(-Wall -Wextra -Werror)
diff --git a/include/stellar/module.h b/include/stellar/module.h
index b0dc738..0f43a4c 100644
--- a/include/stellar/module.h
+++ b/include/stellar/module.h
@@ -24,7 +24,7 @@ const char *module_get_name(struct module* mod);
 void module_set_name(struct module* mod, const char *name);
 
 /*******************************************
- * module API *
+ * module manager API *
  *******************************************/
 
 struct module_manager;
@@ -35,7 +35,7 @@ typedef void module_on_instance_exit_func(struct module_manager *mod_mgr, struct
 typedef struct module *module_on_thread_init_func(struct module_manager *mod_mgr, int thread_id, struct module *mod);
 typedef void module_on_thread_exit_func(struct module_manager *mod_mgr, int thread_id, struct module *mod);
 
-struct module_specification
+struct module_hooks
 {
 	module_on_instance_init_func *on_instance_init_cb;
 	module_on_instance_exit_func *on_instance_exit_cb;
@@ -43,7 +43,7 @@ struct module_specification
 	module_on_thread_exit_func *on_thread_exit_cb;
 };
 
-struct module_manager *module_manager_new(struct module_specification mod_specs[], size_t n_mod, int max_thread_num, struct mq_schema *mq_schema, struct logger *logger);
+struct module_manager *module_manager_new(struct module_hooks mod_specs[], size_t n_mod, int max_thread_num, const char *toml_path, struct mq_schema *mq_schema, struct logger *logger);
 void module_manager_free(struct module_manager *mod_mgr);
 
 void module_manager_register_thread(struct module_manager *mod_mgr, int thread_id, struct mq_runtime *mq_rt);
@@ -60,6 +60,10 @@ const char *module_manager_get_toml_path(struct module_manager *mod_mgr);
 struct mq_schema *module_manager_get_mq_schema(struct module_manager *mod_mgr);
 struct logger *module_manager_get_logger(struct module_manager *mod_mgr);
 
+/*******************************************
+ * polling API *
+ *******************************************/
+
 typedef void module_on_polling_func(struct module_manager *mod_mgr, void *polling_arg);
 int module_manager_polling_subscribe(struct module_manager *mod_mgr, module_on_polling_func on_polling, void *polling_arg);
 void module_manager_polling_active(struct module_manager *mod_mgr);
diff --git a/infra/module_manager/module_manager.c b/infra/module_manager/module_manager.c
index 99b6fc6..a1f6abf 100644
--- a/infra/module_manager/module_manager.c
+++ b/infra/module_manager/module_manager.c
@@ -6,32 +6,71 @@
 #include <assert.h>
 #include <string.h>
 
+#include "toml/toml.h"
 
 /*******************************************
  * module manager  API *
  *******************************************/
 
-#include "toml/toml.h"
+struct module_manager *module_manager_new(struct module_hooks mod_hooks[], size_t n_mod, int max_thread_num, const char *toml_path, struct mq_schema *mq_schema, struct logger *logger)
+{
+	struct module_manager *mod_mgr = CALLOC(struct module_manager, 1);
+	mod_mgr->config.max_thread_num=max_thread_num;
+	mod_mgr->config.mq_schema=mq_schema;
+	mod_mgr->config.logger=logger;
+	if(toml_path)mod_mgr->config.toml_path=strdup(toml_path);
+
+	if(mod_hooks==NULL || n_mod==0)return mod_mgr;
+
+	mod_mgr->descriptors = CALLOC(struct module_descriptor, n_mod);
+	mod_mgr->n_descriptor = n_mod;
 
-struct module_manager *module_manager_new(struct module_specification mod_specs[], size_t n_mod, int max_thread_num, struct mq_schema *mq_schema, struct logger *logger)
+	for (size_t i = 0; i < n_mod; i++) 
+	{
+		mod_mgr->descriptors[i].hooks = mod_hooks[i];
+        if (mod_hooks[i].on_instance_init_cb)
+        {
+            mod_mgr->descriptors[i].mod = mod_hooks[i].on_instance_init_cb(mod_mgr);
+            if (module_manager_get_module(mod_mgr, mod_mgr->descriptors[i].mod->name) == NULL)
+            {
+                mod_mgr->descriptors[i].initialized = true;
+            }
+            else
+            {
+                fprintf(stderr, "Module %s already exists\n", mod_mgr->descriptors[i].mod->name);
+                if (mod_hooks[i].on_instance_exit_cb)
+                    mod_hooks[i].on_instance_exit_cb(mod_mgr, mod_mgr->descriptors[i].mod);
+            }
+        }
+    }
+	return mod_mgr;
+}
+
+struct module_manager *module_manager_new_with_toml(const char *toml_path, int max_thread_num, struct mq_schema *mq_schema, struct logger *logger)
 {
 	
-	struct module_manager *mod_mgr = CALLOC(struct module_manager, 1);
-	mod_mgr->schema.max_thread_num=max_thread_num;
-	mod_mgr->schema.mq_schema=mq_schema;
-	mod_mgr->schema.logger=logger;
+	FILE *fp=fopen(toml_path, "r");
+	if(!fp)return module_manager_new(NULL, 0, max_thread_num, toml_path, mq_schema, logger);
 
-    int mod_num = 0;
 	toml_table_t *conf = toml_parse_file(fp, NULL, 0);
+	fclose(fp);
+
+	if(conf==NULL)return module_manager_new(NULL, 0, max_thread_num, toml_path, mq_schema, logger);
+
     toml_array_t* mod_array = toml_array_in(conf, "module");
+	if(mod_array==NULL)
+	{
+		toml_free(conf);
+		return module_manager_new(NULL, 0, max_thread_num, toml_path, mq_schema, logger);
+	}
 
-	if(mod_array==NULL)goto MODULE_SPEC_LOAD_END;
+    int mod_num = toml_array_nelem(mod_array);
 
-    mod_num = toml_array_nelem(mod_array);
-    mod_mgr->module_specs = CALLOC(struct module_spec_load, mod_num);
+	struct module_hooks mod_hooks[mod_num];
+	memset(mod_hooks, 0, sizeof(mod_hooks));
 
-    // TODO: store module specific in hash
-    for (int i = 0; i < mod_num; i++) {
+    for (int i = 0; i < mod_num; i++) 
+	{
         toml_table_t* toml_mod = toml_table_at(mod_array, i);
 
         const char *path_raw = toml_raw_in(toml_mod, "path");
@@ -40,103 +79,71 @@ struct module_manager *module_manager_new(struct module_specification mod_specs[
 		const char *thread_init_func_name_raw = toml_raw_in(toml_mod, "thread_init");
 		const char *thread_exit_func_name_raw = toml_raw_in(toml_mod, "thread_exit");
 
-		toml_rtos(path_raw, &mod_mgr->module_specs[i].path);
-		toml_rtos(init_func_name_raw, &mod_mgr->module_specs[i].instance_init_cb_name);
-		toml_rtos(exit_func_name_raw, &mod_mgr->module_specs[i].instance_exit_cb_name);
-		toml_rtos(thread_init_func_name_raw, &mod_mgr->module_specs[i].thread_init_cb_name);
-		toml_rtos(thread_exit_func_name_raw, &mod_mgr->module_specs[i].thread_exit_cb_name);
+        char *path = NULL;
+        char *instance_init_cb_name = NULL, *instance_exit_cb_name = NULL, *thread_init_cb_name = NULL,
+             *thread_exit_cb_name = NULL;
 
-        void* handle = dlopen(mod_mgr->module_specs[i].path, RTLD_NOW|RTLD_LAZY|RTLD_GLOBAL);
+        toml_rtos(path_raw, &path);
+		toml_rtos(init_func_name_raw, &instance_init_cb_name);
+		toml_rtos(exit_func_name_raw, &instance_exit_cb_name);
+		toml_rtos(thread_init_func_name_raw, &thread_init_cb_name);
+		toml_rtos(thread_exit_func_name_raw, &thread_exit_cb_name);
+
+        void* handle = dlopen(path, RTLD_NOW|RTLD_LAZY|RTLD_GLOBAL);
         if (!handle) {
-            fprintf(stderr, "Error loading module %s: %s\n", mod_mgr->module_specs[i].path, dlerror());
+            fprintf(stderr, "Error loading module %s: %s\n", path, dlerror());
             break;
         }
-        if (mod_mgr->module_specs[i].instance_init_cb_name)
+        if (instance_init_cb_name)
         {
-            mod_mgr->module_specs[i].on_instance_init_cb =
-                (module_on_instance_init_func *)dlsym(handle, mod_mgr->module_specs[i].instance_init_cb_name);
-            if (mod_mgr->module_specs[i].on_instance_init_cb)
-            {
-                mod_mgr->module_specs[i].mod = mod_mgr->module_specs[i].on_instance_init_cb(mod_mgr);
-                if (module_manager_get_module(mod_mgr, mod_mgr->module_specs[i].mod->name) == NULL)
-                {
-                    mod_mgr->module_specs[i].init_succ = true;
-                }
-                else
-                {
-                    fprintf(stderr, "Module %s already exists\n", mod_mgr->module_specs[i].mod->name);
-                    if (mod_mgr->module_specs[i].on_instance_exit_cb)
-                        mod_mgr->module_specs[i].on_instance_exit_cb(mod_mgr, mod_mgr->module_specs[i].mod);
-                }
-            }
-            else
-            {
-                fprintf(stderr, "Could not load init function %s: %s\n", mod_mgr->module_specs[i].instance_init_cb_name, dlerror());
-            }
+            mod_hooks[i].on_instance_init_cb =
+                (module_on_instance_init_func *)dlsym(handle, instance_init_cb_name);
+			//TODO: logger error
+
+			FREE(instance_init_cb_name);
         }
-        if (mod_mgr->module_specs[i].instance_exit_cb_name)
+        if (instance_exit_cb_name)
         {
-            mod_mgr->module_specs[i].on_instance_exit_cb =
-                (module_on_instance_exit_func *)dlsym(handle, mod_mgr->module_specs[i].instance_exit_cb_name);
-            if (!mod_mgr->module_specs[i].on_instance_exit_cb)
-            {
-                fprintf(stderr, "Could not load exit function %s: %s\n", mod_mgr->module_specs[i].instance_exit_cb_name, dlerror());
-            }
+            mod_hooks[i].on_instance_exit_cb =
+                (module_on_instance_exit_func *)dlsym(handle, instance_exit_cb_name);
+			FREE(instance_exit_cb_name);
         }
 
-        if (mod_mgr->module_specs[i].thread_init_cb_name)
+        if (thread_init_cb_name)
         {
-            mod_mgr->module_specs[i].on_thread_init_cb =
-                (module_on_thread_init_func *)dlsym(handle, mod_mgr->module_specs[i].thread_init_cb_name);
-            if (!mod_mgr->module_specs[i].on_thread_init_cb)
-            {
-                fprintf(stderr, "Could not load init function %s: %s\n", mod_mgr->module_specs[i].thread_init_cb_name, dlerror());
-            }
+            mod_hooks[i].on_thread_init_cb =
+                (module_on_thread_init_func *)dlsym(handle, thread_init_cb_name);
+			FREE(thread_init_cb_name);
         }
 
-
-        if (mod_mgr->module_specs[i].thread_exit_cb_name)
+        if (thread_exit_cb_name)
         {
-            mod_mgr->module_specs[i].on_thread_exit_cb =
-                (module_on_thread_exit_func *)dlsym(handle, mod_mgr->module_specs[i].thread_exit_cb_name);
-            if (!mod_mgr->module_specs[i].on_thread_exit_cb)
-            {
-                fprintf(stderr, "Could not load exit function %s: %s\n", mod_mgr->module_specs[i].thread_exit_cb_name, dlerror());
-            }
+            mod_hooks[i].on_thread_exit_cb =
+                (module_on_thread_exit_func *)dlsym(handle, thread_exit_cb_name);
+			FREE(thread_exit_cb_name);	
         }
-		mod_mgr->load_module_num+=1;
     }
 
-MODULE_SPEC_LOAD_END:
-
-	assert(mod_mgr->load_module_num==mod_num);
-
-	if(conf	)toml_free(conf);
-	if(fp)fclose(fp);
-	return mod_mgr;
+	toml_free(conf);
+	return module_manager_new(mod_hooks, mod_num, max_thread_num, toml_path, mq_schema, logger);
 }
 
 
 void module_manager_free(struct module_manager *mod_mgr)
 {
 	if(mod_mgr==NULL)return;
-	if(mod_mgr->module_spec_toml_path)FREE(mod_mgr->module_spec_toml_path);
-    if (mod_mgr->module_specs)
+	if(mod_mgr->config.toml_path)FREE(mod_mgr->config.toml_path);
+    if (mod_mgr->descriptors)
     {
-        for (int i = 0; i < mod_mgr->load_module_num; i++)
+        for (int i = 0; i < mod_mgr->n_descriptor; i++)
         {
-            if (mod_mgr->module_specs[i].on_instance_exit_cb != NULL &&
-                mod_mgr->module_specs[i].init_succ)
+            if (mod_mgr->descriptors[i].hooks.on_instance_exit_cb != NULL &&
+                mod_mgr->descriptors[i].initialized)
             {
-                mod_mgr->module_specs[i].on_instance_exit_cb(mod_mgr, mod_mgr->module_specs[i].mod);
+                mod_mgr->descriptors[i].hooks.on_instance_exit_cb(mod_mgr, mod_mgr->descriptors[i].mod);
             }
-			if(mod_mgr->module_specs[i].path)FREE(mod_mgr->module_specs[i].path);
-			if(mod_mgr->module_specs[i].instance_init_cb_name)FREE(mod_mgr->module_specs[i].instance_init_cb_name);
-			if(mod_mgr->module_specs[i].instance_exit_cb_name)FREE(mod_mgr->module_specs[i].instance_exit_cb_name);
-			if(mod_mgr->module_specs[i].thread_init_cb_name)FREE(mod_mgr->module_specs[i].thread_init_cb_name);
-			if(mod_mgr->module_specs[i].thread_exit_cb_name)FREE(mod_mgr->module_specs[i].thread_exit_cb_name);
         }
-		FREE(mod_mgr->module_specs);
+		FREE(mod_mgr->descriptors);
     }
     FREE(mod_mgr);
 	return;
@@ -145,25 +152,25 @@ void module_manager_free(struct module_manager *mod_mgr)
 int module_manager_get_max_thread_num(struct module_manager*mod_mgr)
 {
 	if(mod_mgr==NULL)return -1;
-	return mod_mgr->schema.max_thread_num;
+	return mod_mgr->config.max_thread_num;
 }
 
 struct mq_schema *module_manager_get_mq_schema(struct module_manager *mod_mgr)
 {
 	if(mod_mgr==NULL)return NULL;
-	return mod_mgr->schema.mq_schema;
+	return mod_mgr->config.mq_schema;
 }
 
 struct logger *module_manager_get_logger(struct module_manager *mod_mgr)
 {
 	if(mod_mgr==NULL)return NULL;
-	return mod_mgr->schema.logger;
+	return mod_mgr->config.logger;
 }
 
 const char *module_manager_get_toml_path(struct module_manager *mod_mgr)
 {
 	if(mod_mgr==NULL)return NULL;
-	return mod_mgr->module_spec_toml_path;
+	return mod_mgr->config.toml_path;
 }
 
 __thread int local_thread_id=-1;
@@ -184,12 +191,12 @@ void module_manager_register_thread(struct module_manager* mod_mgr, int thread_i
 	local_thread_id=thread_id;
 	local_mq_rt=mq_rt;
 
-	for(int i=0; i<mod_mgr->load_module_num; i++)
+	for(int i=0; i<mod_mgr->n_descriptor; i++)
 	{
-		if(mod_mgr->module_specs[i].mod == NULL)break;
-		if(mod_mgr->module_specs[i].on_thread_init_cb && mod_mgr->module_specs[i].init_succ)
+		if(mod_mgr->descriptors[i].mod == NULL)break;
+		if(mod_mgr->descriptors[i].hooks.on_thread_init_cb && mod_mgr->descriptors[i].initialized)
 		{
-			mod_mgr->module_specs[i].on_thread_init_cb(mod_mgr, thread_id, mod_mgr->module_specs[i].mod);
+			mod_mgr->descriptors[i].hooks.on_thread_init_cb(mod_mgr, thread_id, mod_mgr->descriptors[i].mod);
 		}
 	}
 	return;
@@ -198,12 +205,12 @@ void module_manager_register_thread(struct module_manager* mod_mgr, int thread_i
 void module_manager_unregister_thread(struct module_manager *mod_mgr, int thread_id)
 {
 	assert(local_thread_id==thread_id);
-	for(int i=0; i<mod_mgr->load_module_num; i++)
+	for(int i=0; i<mod_mgr->n_descriptor; i++)
 	{
-		if(mod_mgr->module_specs[i].mod == NULL)break;
-		if(mod_mgr->module_specs[i].on_thread_exit_cb && mod_mgr->module_specs[i].init_succ)
+		if(mod_mgr->descriptors[i].mod == NULL)break;
+		if(mod_mgr->descriptors[i].hooks.on_thread_exit_cb && mod_mgr->descriptors[i].initialized)
 		{
-			mod_mgr->module_specs[i].on_thread_exit_cb(mod_mgr, thread_id, mod_mgr->module_specs[i].mod);
+			mod_mgr->descriptors[i].hooks.on_thread_exit_cb(mod_mgr, thread_id, mod_mgr->descriptors[i].mod);
 		}
 	}
 	local_thread_id=-1;
@@ -214,14 +221,14 @@ void module_manager_unregister_thread(struct module_manager *mod_mgr, int thread
 struct module *module_manager_get_module(struct module_manager *mod_mgr, const char *module_name)
 {
 	if(mod_mgr==NULL || module_name == NULL)return NULL;
-	if (mod_mgr->module_specs)
+	if (mod_mgr->descriptors)
 	{
-		for(int i=0; i<mod_mgr->load_module_num; i++)
+		for(int i=0; i<mod_mgr->n_descriptor; i++)
 		{
-			if(mod_mgr->module_specs[i].mod == NULL)break;
-			if(strcmp(mod_mgr->module_specs[i].mod->name, module_name)==0 && mod_mgr->module_specs[i].init_succ)
+			if(mod_mgr->descriptors[i].mod == NULL)break;
+			if(strcmp(mod_mgr->descriptors[i].mod->name, module_name)==0 && mod_mgr->descriptors[i].initialized)
 			{
-				return mod_mgr->module_specs[i].mod;
+				return mod_mgr->descriptors[i].mod;
 			}
 		}
 	}
@@ -237,7 +244,7 @@ struct module *module_new(const char *name, void *ctx)
 {
 	struct module *mod = CALLOC(struct module, 1);
 	memcpy(mod->name, name, MIN(NAME_MAX, strlen(name)));
-	mod->module_ctx=ctx;
+	mod->ctx=ctx;
 	return mod;
 }
 
@@ -251,13 +258,13 @@ void module_free(struct module *mod)
 void * module_get_ctx(struct module *mod)
 {
 	if(mod==NULL)return NULL;
-	return mod->module_ctx;
+	return mod->ctx;
 }
 
 void module_set_ctx(struct module *mod, void *ctx)
 {
 	if(mod==NULL)return;
-	mod->module_ctx=ctx;
+	mod->ctx=ctx;
 	return;
 }
 
@@ -299,9 +306,9 @@ int module_manager_polling_subscribe(struct module_manager	*mod_mgr,  module_on_
 	mod_mgr->topic_polling_id=mq_schema_get_topic_id(module_manager_get_mq_schema(mod_mgr), TOPIC_POLLING);
 	if(mod_mgr->topic_polling_id<0)
 	{
-		mod_mgr->topic_polling_id=mq_schema_create_topic(mod_mgr->schema.mq_schema, TOPIC_POLLING, on_polling_dispatch, mod_mgr, NULL, NULL);
+		mod_mgr->topic_polling_id=mq_schema_create_topic(mod_mgr->config.mq_schema, TOPIC_POLLING, on_polling_dispatch, mod_mgr, NULL, NULL);
 	}
-	return mq_schema_subscribe(mod_mgr->schema.mq_schema, mod_mgr->topic_polling_id, (on_msg_cb_func *)on_polling, polling_arg);
+	return mq_schema_subscribe(mod_mgr->config.mq_schema, mod_mgr->topic_polling_id, (on_msg_cb_func *)on_polling, polling_arg);
 }
 
 #pragma GCC diagnostic pop 
@@ -313,7 +320,7 @@ void module_manager_polling_active(struct module_manager *mod_mgr)
 }
 
 
-void stellar_polling_dispatch(struct module_manager *mod_mgr)
+void module_manager_polling_dispatch(struct module_manager *mod_mgr)
 {
 	if(mod_mgr==NULL)return;
 	module_manager_polling_active(mod_mgr);
diff --git a/infra/module_manager/module_manager_interna.h b/infra/module_manager/module_manager_interna.h
index 3e47bf0..08b285a 100644
--- a/infra/module_manager/module_manager_interna.h
+++ b/infra/module_manager/module_manager_interna.h
@@ -16,33 +16,35 @@ extern "C"
 struct module
 {
 	char name[NAME_MAX];
-	void *module_ctx;
+	void *ctx;
 };
 
-struct module_spec_load
+struct module_descriptor
 {
+    struct module_hooks hooks;
 	struct module *mod;
-    struct module_specification spec;
-    bool init_succ;
+    bool initialized;
 }__attribute__((aligned(sizeof(void*))));
 
 
 struct module_manager
 {
-    char *module_spec_toml_path;
-    struct module_spec_load *module_specs;
-    int load_module_num;
+    struct module_descriptor *descriptors;
+    int n_descriptor;
     int topic_polling_id;
     struct
     {
+        char *toml_path;
         int max_thread_num;
         struct mq_schema *mq_schema;
         struct logger *logger;
-    }schema;
+    }config;
     
 }__attribute__((aligned(sizeof(void*))));
 
-void stellar_polling_dispatch(struct module_manager *mod_mgr);
+struct module_manager *module_manager_new_with_toml(const char *toml_path, int max_thread_num, struct mq_schema *mq_schema, struct logger *logger);
+
+void module_manager_polling_dispatch(struct module_manager *mod_mgr);
 
 #ifdef __cplusplus
 }
diff --git a/infra/module_manager/test/gtest_module_manager_main.cpp b/infra/module_manager/test/gtest_module_manager_main.cpp
index 0493cc4..4087611 100644
--- a/infra/module_manager/test/gtest_module_manager_main.cpp
+++ b/infra/module_manager/test/gtest_module_manager_main.cpp
@@ -31,7 +31,7 @@ TEST(module_manager_internal, stellar_module_manager_new_with_toml) {
 	write(fd, gtest_mock_spec_toml, strlen(gtest_mock_spec_toml));
 	close(fd);
 
-	struct module_manager *mod_mgr=module_manager_new(toml_template, 10, mq_schema, NULL);
+	struct module_manager *mod_mgr=module_manager_new_with_toml(toml_template, 10, mq_schema, NULL);
 	
 	EXPECT_TRUE(mod_mgr!=NULL);
 	EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
@@ -72,7 +72,7 @@ TEST(stellar_module, basic_new_and_free) {
 TEST(stellar_module_manager, new_with_null_toml) {
 
 	struct mq_schema *mq_schema=NULL;
-	struct module_manager *mod_mgr = module_manager_new(NULL, 10, mq_schema, NULL);
+	struct module_manager *mod_mgr = module_manager_new_with_toml(NULL, 10, mq_schema, NULL);
 	EXPECT_TRUE(mod_mgr!=NULL);
 	EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
 	EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
@@ -87,7 +87,7 @@ TEST(stellar_module_manager, new_with_null_toml) {
 TEST(stellar_module_manager, new_with_empty_toml) {
 
 	struct mq_schema *mq_schema=NULL;
-	struct module_manager *mod_mgr = module_manager_new("/dev/null", 10, mq_schema, NULL);
+	struct module_manager *mod_mgr = module_manager_new_with_toml("/dev/null", 10, mq_schema, NULL);
 	EXPECT_TRUE(mod_mgr!=NULL);
 	EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
 	EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
@@ -102,7 +102,7 @@ TEST(stellar_module_manager, new_with_empty_toml) {
 TEST(stellar_module_manager, register_thread) {
 
 	struct mq_schema *mq_schema=(struct mq_schema*)1;
-	struct module_manager *mod_mgr=module_manager_new(NULL, 10, mq_schema, NULL);
+	struct module_manager *mod_mgr=module_manager_new_with_toml(NULL, 10, mq_schema, NULL);
 
 	EXPECT_TRUE(mod_mgr!=NULL);
 
@@ -182,7 +182,7 @@ TEST(module_manager, basic_module) {
 	write(fd, gtest_module_spec_toml, strlen(gtest_module_spec_toml));
 	close(fd);
 
-	struct module_manager *mod_mgr=module_manager_new(toml_template, 10, mq_schema, NULL);
+	struct module_manager *mod_mgr=module_manager_new_with_toml(toml_template, 10, mq_schema, NULL);
 	EXPECT_TRUE(mod_mgr!=NULL);
 
 	EXPECT_TRUE(module_manager_get_module(mod_mgr, "gtest")!=NULL);
@@ -232,7 +232,7 @@ TEST(module_manager, basic_polling_module) {
 
 	struct mq_schema *mq_schema=mq_schema_new();
 
-	struct module_manager *mod_mgr=module_manager_new(NULL, 10, mq_schema, NULL);
+	struct module_manager *mod_mgr=module_manager_new_with_toml(NULL, 10, mq_schema, NULL);
 	EXPECT_TRUE(mod_mgr!=NULL);
 
 
@@ -252,7 +252,7 @@ TEST(module_manager, basic_polling_module) {
 
 	for(int i=0; i<env.N_round; i++)
 	{
-		stellar_polling_dispatch(mod_mgr);
+		module_manager_polling_dispatch(mod_mgr);
 	}
 
 	module_manager_unregister_thread(mod_mgr, 1);
diff --git a/infra/stellar_core.c b/infra/stellar_core.c
index 362dfda..9141daf 100644
--- a/infra/stellar_core.c
+++ b/infra/stellar_core.c
@@ -80,7 +80,7 @@ static void *worker_thread(void *arg)
         }
         packet_io_clean(pkt_io, thread_id);
 
-        stellar_polling_dispatch(mod_mgr);
+        module_manager_polling_dispatch(mod_mgr);
 
         if (nr_recv == 0)
         {
@@ -168,7 +168,7 @@ struct stellar *stellar_new(const char *toml_file)
         goto error_out;
     }
 
-    st->mod_mgr = module_manager_new(toml_file, st->thread_num, st->mq_schema, st->logger);
+    st->mod_mgr = module_manager_new_with_toml(toml_file, st->thread_num, st->mq_schema, st->logger);
     if (st->mod_mgr == NULL)
     {
         CORE_LOG_ERROR("unable to create packet manager");