summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2024-05-30 20:21:51 +0800
committeryangwei <[email protected]>2024-05-31 00:34:03 +0800
commita43c864e7220649761b6e3244de123e42cb6a1b7 (patch)
tree5c52629324a879099adb0d1fe94c01ba1daf638d
parent2e1fef341c44ad9a8066d3979920fa6a37f9994f (diff)
🐞 fix(session runtime new & free): invalid mem op when no plugin register
-rw-r--r--src/plugin_manager/plugin_manager.c33
-rw-r--r--test/plugin_manager/plugin_manager_gtest_main.cpp102
2 files changed, 114 insertions, 21 deletions
diff --git a/src/plugin_manager/plugin_manager.c b/src/plugin_manager/plugin_manager.c
index 76a1c03..2cd5a81 100644
--- a/src/plugin_manager/plugin_manager.c
+++ b/src/plugin_manager/plugin_manager.c
@@ -872,7 +872,8 @@ struct plugin_manager_runtime *plugin_manager_session_runtime_new(struct plugin_
rt->delivered_mq = NULL;
rt->session_mq_status=bitmap_new(plug_mgr->session_mq_topic_num, plug_mgr->session_topic_subscriber_num, 1);
rt->sess_exdata_array = (struct stellar_exdata *)session_exdata_runtime_new(plug_mgr);
- rt->plugin_ctx_array = CALLOC(struct session_plugin_ctx_runtime, utarray_len(plug_mgr->registered_session_plugin_array));
+ if(plug_mgr->registered_session_plugin_array)
+ rt->plugin_ctx_array = CALLOC(struct session_plugin_ctx_runtime, utarray_len(plug_mgr->registered_session_plugin_array));
return rt;
}
@@ -894,19 +895,23 @@ void plugin_manager_session_runtime_free(struct plugin_manager_runtime *rt)
{
bitmap_free(rt->session_mq_status);
}
- unsigned int len = utarray_len(rt->plug_mgr->registered_session_plugin_array);
- for(unsigned int i = 0; i < len; i++)
- {
- struct session_plugin_ctx_runtime *plugin_ctx_rt=(rt->plugin_ctx_array+i);
- struct registered_session_plugin_schema *session_plugin_schema = (struct registered_session_plugin_schema *)utarray_eltptr(rt->plug_mgr->registered_session_plugin_array, i);
- if(session_plugin_schema->on_ctx_free && plugin_ctx_rt->state==ACTIVE)
- {
- session_plugin_schema->on_ctx_free(rt->sess, plugin_ctx_rt->plugin_ctx, session_plugin_schema->plugin_env);
- }
- }
- FREE(rt->plugin_ctx_array);
-
- session_exdata_runtime_free(rt->plug_mgr, rt->sess, rt->sess_exdata_array);
+ if (rt->plug_mgr->registered_session_plugin_array)
+ {
+ unsigned int len = utarray_len(rt->plug_mgr->registered_session_plugin_array);
+ for (unsigned int i = 0; i < len; i++)
+ {
+ struct session_plugin_ctx_runtime *plugin_ctx_rt = (rt->plugin_ctx_array + i);
+ struct registered_session_plugin_schema *session_plugin_schema =
+ (struct registered_session_plugin_schema *)utarray_eltptr(rt->plug_mgr->registered_session_plugin_array, i);
+ if (session_plugin_schema->on_ctx_free && plugin_ctx_rt->state == ACTIVE)
+ {
+ session_plugin_schema->on_ctx_free(rt->sess, plugin_ctx_rt->plugin_ctx,
+ session_plugin_schema->plugin_env);
+ }
+ }
+ FREE(rt->plugin_ctx_array);
+ }
+ session_exdata_runtime_free(rt->plug_mgr, rt->sess, rt->sess_exdata_array);
FREE(rt->sess_exdata_array);
FREE(rt);
}
diff --git a/test/plugin_manager/plugin_manager_gtest_main.cpp b/test/plugin_manager/plugin_manager_gtest_main.cpp
index 6b7a0e8..ab24c6e 100644
--- a/test/plugin_manager/plugin_manager_gtest_main.cpp
+++ b/test/plugin_manager/plugin_manager_gtest_main.cpp
@@ -699,10 +699,6 @@ TEST(plugin_manager_init, session_mq_subscribe) {
* TEST PLUGIN MANAGER ON SESSION PLUGIN RUNTIME *
**********************************************/
-/*******************************************
- * TEST PLUGIN MANAGER PACKET PLUGIN RUNTIME*
- *******************************************/
-
struct session_plugin_env
{
struct plugin_manager_schema *plug_mgr;
@@ -724,6 +720,55 @@ struct session_plugin_env
int test_mq_topic_id;
};
+TEST(plugin_manager, no_plugin_runtime) {
+
+ struct stellar st={0};
+
+// init stage
+ struct plugin_manager_schema *plug_mgr = plugin_manager_init(&st, NULL);
+ whitebox_test_plugin_manager_intrisic_metadata(&st, plug_mgr);
+
+// init plugin
+
+// prepare packet and session
+
+ struct session_plugin_env env;
+ memset(&env, 0, sizeof(struct session_plugin_env));
+ env.plug_mgr=plug_mgr;
+ env.N_per_session_pkt_cnt=10;
+ env.N_session=10;
+
+ struct packet pkt={&st, TCP, 6};
+
+ struct session sess[env.N_session];
+ memset(&sess, 0, sizeof(sess));
+
+// pesudo running stage
+ for(int i=0; i < env.N_session; i++)
+ sess[i].plug_mgr_rt=plugin_manager_session_runtime_new(plug_mgr, &sess[i]);
+
+ for (int j = 0; j < env.N_per_session_pkt_cnt; j++)
+ {
+ plugin_manager_on_packet_ingress(plug_mgr, &pkt);
+
+ for (int i = 0; i < env.N_session; i++)
+ {
+ sess[i].sess_pkt_cnt+=1;
+ plugin_manager_on_session_ingress(&sess[i], &pkt);
+ plugin_manager_on_session_egress(&sess[i], &pkt);
+ }
+
+ plugin_manager_on_packet_egress(plug_mgr, &pkt);
+ }
+
+ for(int i=0; i < env.N_session; i++)
+ plugin_manager_session_runtime_free(sess[i].plug_mgr_rt);
+
+//exit stage
+ plugin_manager_exit(plug_mgr);
+}
+
+
struct test_basic_ctx
{
int called;
@@ -824,13 +869,14 @@ TEST(plugin_manager, basic_session_plugin) {
for (int j = 0; j < env.N_per_session_pkt_cnt; j++)
{
plugin_manager_on_packet_ingress(plug_mgr, &pkt);
- plugin_manager_on_packet_egress(plug_mgr, &pkt);
for (int i = 0; i < env.N_session; i++)
{
plugin_manager_on_session_ingress(&sess[i], &pkt);
plugin_manager_on_session_egress(&sess[i], &pkt);
}
+
+ plugin_manager_on_packet_egress(plug_mgr, &pkt);
}
for(int i=0; i < env.N_session; i++)
@@ -957,13 +1003,14 @@ TEST(plugin_manager, basic_session_plugin_mq) {
for (int j = 0; j < env.N_per_session_pkt_cnt; j++)
{
plugin_manager_on_packet_ingress(plug_mgr, &pkt);
- plugin_manager_on_packet_egress(plug_mgr, &pkt);
for (int i = 0; i < env.N_session; i++)
{
plugin_manager_on_session_ingress(&sess[i], &pkt);
plugin_manager_on_session_egress(&sess[i], &pkt);
}
+
+ plugin_manager_on_packet_egress(plug_mgr, &pkt);
}
for(int i=0; i < env.N_session; i++)
@@ -1034,7 +1081,6 @@ TEST(plugin_manager, session_plugin_ctx_new_dettach) {
for (int j = 0; j < env.N_per_session_pkt_cnt; j++)
{
plugin_manager_on_packet_ingress(plug_mgr, &pkt);
- plugin_manager_on_packet_egress(plug_mgr, &pkt);
for (int i = 0; i < env.N_session; i++)
{
@@ -1042,6 +1088,8 @@ TEST(plugin_manager, session_plugin_ctx_new_dettach) {
plugin_manager_on_session_ingress(&sess[i], &pkt);
plugin_manager_on_session_egress(&sess[i], &pkt);
}
+
+ plugin_manager_on_packet_egress(plug_mgr, &pkt);
}
for(int i=0; i < env.N_session; i++)
@@ -1056,8 +1104,48 @@ TEST(plugin_manager, session_plugin_ctx_new_dettach) {
TEST(plugin_manager, session_plugin_ctx_free_send_msg) {
struct stellar st={0};
+
+// pesudo init stage
struct plugin_manager_schema *plug_mgr = plugin_manager_init(&st, NULL);
whitebox_test_plugin_manager_intrisic_metadata(&st, plug_mgr);
+
+// plugin manager register plugin
+
+// pesudo packet and session
+
+ struct session_plugin_env env;
+ memset(&env, 0, sizeof(struct session_plugin_env));
+ env.plug_mgr=plug_mgr;
+ env.N_per_session_pkt_cnt=10;
+ env.N_session=10;
+
+ struct packet pkt={&st, TCP, 6};
+
+ struct session sess[env.N_session];
+ memset(&sess, 0, sizeof(sess));
+
+// pesudo running stage
+ for(int i=0; i < env.N_session; i++)
+ sess[i].plug_mgr_rt=plugin_manager_session_runtime_new(plug_mgr, &sess[i]);
+
+ for (int j = 0; j < env.N_per_session_pkt_cnt; j++)
+ {
+ plugin_manager_on_packet_ingress(plug_mgr, &pkt);
+
+ for (int i = 0; i < env.N_session; i++)
+ {
+ sess[i].sess_pkt_cnt+=1;
+ plugin_manager_on_session_ingress(&sess[i], &pkt);
+ plugin_manager_on_session_egress(&sess[i], &pkt);
+ }
+
+ plugin_manager_on_packet_egress(plug_mgr, &pkt);
+ }
+
+ for(int i=0; i < env.N_session; i++)
+ plugin_manager_session_runtime_free(sess[i].plug_mgr_rt);
+
+// pesudo exit stage
plugin_manager_exit(plug_mgr);
}