From bda65697eaddf2c22a06a6b23566ce24bf4fd2db Mon Sep 17 00:00:00 2001 From: yangwei Date: Tue, 16 Jul 2024 18:24:23 +0800 Subject: 🦄 refactor(packet mq & exdata): backport packet mq & exdata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin_manager/plugin_manager_interna.h | 4 ++-- test/plugin_manager/plugin_manager_gtest_main.cpp | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/plugin_manager/plugin_manager_interna.h b/src/plugin_manager/plugin_manager_interna.h index 4f97e9a..abb2e5d 100644 --- a/src/plugin_manager/plugin_manager_interna.h +++ b/src/plugin_manager/plugin_manager_interna.h @@ -124,12 +124,12 @@ struct stellar_mq_topic_schema struct stellar_mq_subscriber *subscribers; }__attribute__((aligned(sizeof(void*)))); -enum plugin_ctx_state +enum plugin_exdata_state { INIT, ACTIVE, EXIT }; struct session_plugin_ctx_runtime { - enum plugin_ctx_state state; + enum plugin_exdata_state state; int session_plugin_id; void *plugin_ctx; }__attribute__((aligned(sizeof(void*)))); diff --git a/test/plugin_manager/plugin_manager_gtest_main.cpp b/test/plugin_manager/plugin_manager_gtest_main.cpp index 381c6d5..13a61c5 100644 --- a/test/plugin_manager/plugin_manager_gtest_main.cpp +++ b/test/plugin_manager/plugin_manager_gtest_main.cpp @@ -886,6 +886,8 @@ TEST(plugin_manager, no_plugin_register_runtime) { 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++) @@ -1010,6 +1012,7 @@ TEST(plugin_manager, session_plugin_on_intrinsic_ingress_egress) { 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++) @@ -1152,6 +1155,8 @@ TEST(plugin_manager, session_plugin_ignore_on_ctx_new_sub_other_msg) { 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++) @@ -1305,6 +1310,7 @@ TEST(plugin_manager, session_plugin_pub_msg_overlimt) { 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++) @@ -1386,6 +1392,7 @@ TEST(plugin_manager, session_plugin_on_ctx_new_then_dettach) { 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++) @@ -1473,6 +1480,7 @@ TEST(plugin_manager, session_plugin_pub_on_ctx_free) { 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++) @@ -1591,6 +1599,7 @@ TEST(plugin_manager, session_plugin_pub_msg_on_closing) { 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++) @@ -1706,7 +1715,7 @@ TEST(plugin_manager, test_session_mq_topic_is_active) { 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; @@ -1715,6 +1724,7 @@ TEST(plugin_manager, test_session_mq_topic_is_active) { 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++) @@ -1821,6 +1831,7 @@ TEST(plugin_manager, test_session_dettach) { 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++) @@ -1945,6 +1956,7 @@ TEST(plugin_manager, test_session_mq_priority) { 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++) -- cgit v1.2.3