🦄 refactor(stellar_module to module): simplify stellar module to module
This commit is contained in:
@@ -13,8 +13,8 @@
|
||||
* TEST MODUEL MANAGER INTERNAL API *
|
||||
***********************************/
|
||||
|
||||
extern "C" struct stellar_module *gtest_mock_init(struct stellar_module_manager *mod_mgr){return NULL;}
|
||||
extern "C" void gtest_mock_exit(struct stellar_module_manager *mod_mgr, struct stellar_module *mod){}
|
||||
extern "C" struct module *gtest_mock_init(struct module_manager *mod_mgr){return NULL;}
|
||||
extern "C" void gtest_mock_exit(struct module_manager *mod_mgr, struct module *mod){}
|
||||
const char *gtest_mock_spec_toml =
|
||||
"[[module]]\n"
|
||||
"path = \"\"\n"
|
||||
@@ -31,18 +31,18 @@ TEST(module_manager_internal, stellar_module_manager_new_with_toml) {
|
||||
write(fd, gtest_mock_spec_toml, strlen(gtest_mock_spec_toml));
|
||||
close(fd);
|
||||
|
||||
struct stellar_module_manager *mod_mgr=stellar_module_manager_new(toml_template, 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr=module_manager_new(toml_template, 10, mq_schema, NULL);
|
||||
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
EXPECT_TRUE(stellar_module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(stellar_module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(stellar_module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
EXPECT_STREQ(stellar_module_manager_get_toml_path(mod_mgr), toml_template);
|
||||
EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
EXPECT_STREQ(module_manager_get_toml_path(mod_mgr), toml_template);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(stellar_module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
|
||||
unlink(toml_template);
|
||||
}
|
||||
@@ -53,16 +53,16 @@ TEST(module_manager_internal, stellar_module_manager_new_with_toml) {
|
||||
|
||||
TEST(stellar_module, basic_new_and_free) {
|
||||
|
||||
struct stellar_module *mod = stellar_module_new("test", NULL);
|
||||
struct module *mod = module_new("test", NULL);
|
||||
EXPECT_TRUE(mod!=NULL);
|
||||
|
||||
stellar_module_set_name(mod, "test1");
|
||||
EXPECT_STREQ(stellar_module_get_name(mod), "test1");
|
||||
module_set_name(mod, "test1");
|
||||
EXPECT_STREQ(module_get_name(mod), "test1");
|
||||
|
||||
stellar_module_set_ctx(mod, (void*)1);
|
||||
EXPECT_EQ((long)stellar_module_get_ctx(mod), 1);
|
||||
module_set_ctx(mod, (void*)1);
|
||||
EXPECT_EQ((long)module_get_ctx(mod), 1);
|
||||
|
||||
stellar_module_free(mod);
|
||||
module_free(mod);
|
||||
}
|
||||
|
||||
/***********************************
|
||||
@@ -72,57 +72,57 @@ TEST(stellar_module, basic_new_and_free) {
|
||||
TEST(stellar_module_manager, new_with_null_toml) {
|
||||
|
||||
struct mq_schema *mq_schema=NULL;
|
||||
struct stellar_module_manager *mod_mgr = stellar_module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr = module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
EXPECT_TRUE(stellar_module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(stellar_module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(stellar_module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
|
||||
EXPECT_TRUE(stellar_module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
}
|
||||
|
||||
TEST(stellar_module_manager, new_with_empty_toml) {
|
||||
|
||||
struct mq_schema *mq_schema=NULL;
|
||||
struct stellar_module_manager *mod_mgr = stellar_module_manager_new("/dev/null", 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr = module_manager_new("/dev/null", 10, mq_schema, NULL);
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
EXPECT_TRUE(stellar_module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(stellar_module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(stellar_module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
EXPECT_TRUE(module_manager_get_module(mod_mgr, "test")==NULL);
|
||||
EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(stellar_module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
}
|
||||
|
||||
TEST(stellar_module_manager, register_thread) {
|
||||
|
||||
struct mq_schema *mq_schema=(struct mq_schema*)1;
|
||||
struct stellar_module_manager *mod_mgr=stellar_module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr=module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_schema(mod_mgr), 1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_schema(mod_mgr), 1);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(stellar_module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);// no thread registered
|
||||
EXPECT_TRUE(module_manager_get_mq_runtime(mod_mgr)==NULL);
|
||||
|
||||
struct mq_runtime *mq_rt = (struct mq_runtime*)2;
|
||||
stellar_module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_runtime(mod_mgr), 2);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_runtime(mod_mgr), 2);
|
||||
|
||||
stellar_module_manager_unregister_thread(mod_mgr, 1);
|
||||
module_manager_unregister_thread(mod_mgr, 1);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
|
||||
}
|
||||
|
||||
@@ -130,38 +130,38 @@ TEST(stellar_module_manager, register_thread) {
|
||||
* TEST MODULE MANAGER API *
|
||||
***********************************/
|
||||
|
||||
extern "C" struct stellar_module *gtest_module_init(struct stellar_module_manager *mod_mgr)
|
||||
extern "C" struct module *gtest_module_init(struct module_manager *mod_mgr)
|
||||
{
|
||||
struct stellar_module *mod = stellar_module_new("gtest", NULL);
|
||||
EXPECT_STREQ(stellar_module_get_name(mod), "gtest");
|
||||
stellar_module_set_ctx(mod, (void*)1);
|
||||
struct module *mod = module_new("gtest", NULL);
|
||||
EXPECT_STREQ(module_get_name(mod), "gtest");
|
||||
module_set_ctx(mod, (void*)1);
|
||||
|
||||
return mod;
|
||||
}
|
||||
|
||||
extern "C" void gtest_module_exit(struct stellar_module_manager *mod_mgr, struct stellar_module *mod)
|
||||
extern "C" void gtest_module_exit(struct module_manager *mod_mgr, struct module *mod)
|
||||
{
|
||||
EXPECT_STREQ(stellar_module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)stellar_module_get_ctx(mod), 1);
|
||||
EXPECT_STREQ(module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)module_get_ctx(mod), 1);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_module(mod_mgr, "gtest"), mod);
|
||||
EXPECT_EQ(module_manager_get_module(mod_mgr, "gtest"), mod);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
EXPECT_EQ(module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
|
||||
stellar_module_free(mod);
|
||||
module_free(mod);
|
||||
}
|
||||
|
||||
extern "C" void gtest_thread_init(struct stellar_module_manager *mod_mgr, int thread_id, struct stellar_module *mod)
|
||||
extern "C" void gtest_thread_init(struct module_manager *mod_mgr, int thread_id, struct module *mod)
|
||||
{
|
||||
EXPECT_STREQ(stellar_module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)stellar_module_get_ctx(mod), 1);
|
||||
EXPECT_STREQ(module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)module_get_ctx(mod), 1);
|
||||
}
|
||||
|
||||
extern "C" void gtest_thread_exit(struct stellar_module_manager *mod_mgr, int thread_id, struct stellar_module *mod)
|
||||
extern "C" void gtest_thread_exit(struct module_manager *mod_mgr, int thread_id, struct module *mod)
|
||||
{
|
||||
EXPECT_STREQ(stellar_module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)stellar_module_get_ctx(mod), 1);
|
||||
EXPECT_STREQ(module_get_name(mod), "gtest");
|
||||
EXPECT_EQ((long)module_get_ctx(mod), 1);
|
||||
}
|
||||
|
||||
const char *gtest_module_spec_toml =
|
||||
@@ -182,26 +182,26 @@ TEST(module_manager, basic_module) {
|
||||
write(fd, gtest_module_spec_toml, strlen(gtest_module_spec_toml));
|
||||
close(fd);
|
||||
|
||||
struct stellar_module_manager *mod_mgr=stellar_module_manager_new(toml_template, 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr=module_manager_new(toml_template, 10, mq_schema, NULL);
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
|
||||
EXPECT_TRUE(stellar_module_manager_get_module(mod_mgr, "gtest")!=NULL);
|
||||
EXPECT_TRUE(module_manager_get_module(mod_mgr, "gtest")!=NULL);
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_schema(mod_mgr), 1);
|
||||
EXPECT_STREQ(stellar_module_manager_get_toml_path(mod_mgr), toml_template);
|
||||
EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ((long)module_manager_get_mq_schema(mod_mgr), 1);
|
||||
EXPECT_STREQ(module_manager_get_toml_path(mod_mgr), toml_template);
|
||||
|
||||
struct mq_runtime *mq_rt = (struct mq_runtime*)2;
|
||||
stellar_module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
|
||||
EXPECT_EQ((long)stellar_module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_runtime(mod_mgr), 2);
|
||||
EXPECT_EQ((long)module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_runtime(mod_mgr), 2);
|
||||
|
||||
stellar_module_manager_unregister_thread(mod_mgr, 1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)stellar_module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
module_manager_unregister_thread(mod_mgr, 1);
|
||||
EXPECT_EQ((long)module_manager_get_thread_id(mod_mgr), -1);
|
||||
EXPECT_EQ((long)module_manager_get_mq_runtime(mod_mgr), 0);
|
||||
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
unlink(toml_template);
|
||||
}
|
||||
|
||||
@@ -216,13 +216,13 @@ struct test_module_polling_env
|
||||
int polling_active_count;
|
||||
};
|
||||
|
||||
void test_module_on_polling(struct stellar_module_manager* mod_mgr, void *polling_arg)
|
||||
void test_module_on_polling(struct module_manager* mod_mgr, void *polling_arg)
|
||||
{
|
||||
struct test_module_polling_env *env = (struct test_module_polling_env*)polling_arg;
|
||||
env->polling_count++;
|
||||
if(env->polling_count%2==0)
|
||||
{
|
||||
stellar_module_manager_polling_active(mod_mgr);
|
||||
module_manager_polling_active(mod_mgr);
|
||||
env->polling_active_count++;
|
||||
}
|
||||
}
|
||||
@@ -232,34 +232,34 @@ TEST(module_manager, basic_polling_module) {
|
||||
|
||||
struct mq_schema *mq_schema=mq_schema_new();
|
||||
|
||||
struct stellar_module_manager *mod_mgr=stellar_module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
struct module_manager *mod_mgr=module_manager_new(NULL, 10, mq_schema, NULL);
|
||||
EXPECT_TRUE(mod_mgr!=NULL);
|
||||
|
||||
|
||||
EXPECT_EQ(stellar_module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(stellar_module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
EXPECT_EQ(module_manager_get_max_thread_num(mod_mgr), 10);
|
||||
EXPECT_EQ(module_manager_get_mq_schema(mod_mgr), mq_schema);
|
||||
|
||||
struct test_module_polling_env env={};
|
||||
env.N_round=10;
|
||||
|
||||
stellar_module_manager_polling_subscribe(mod_mgr, test_module_on_polling, &env);
|
||||
module_manager_polling_subscribe(mod_mgr, test_module_on_polling, &env);
|
||||
|
||||
struct mq_runtime *mq_rt = mq_runtime_new(mq_schema);
|
||||
stellar_module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
module_manager_register_thread(mod_mgr, 1, mq_rt);
|
||||
|
||||
EXPECT_EQ((long)stellar_module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ(stellar_module_manager_get_mq_runtime(mod_mgr), mq_rt);
|
||||
EXPECT_EQ((long)module_manager_get_thread_id(mod_mgr), 1);
|
||||
EXPECT_EQ(module_manager_get_mq_runtime(mod_mgr), mq_rt);
|
||||
|
||||
for(int i=0; i<env.N_round; i++)
|
||||
{
|
||||
stellar_polling_dispatch(mod_mgr);
|
||||
}
|
||||
|
||||
stellar_module_manager_unregister_thread(mod_mgr, 1);
|
||||
module_manager_unregister_thread(mod_mgr, 1);
|
||||
|
||||
mq_runtime_free(mq_rt);
|
||||
mq_schema_free(mq_schema);
|
||||
stellar_module_manager_free(mod_mgr);
|
||||
module_manager_free(mod_mgr);
|
||||
|
||||
EXPECT_EQ(env.polling_count, env.N_round+env.polling_active_count);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user