diff options
Diffstat (limited to 'src/plugin_manager/plugin_manager.c')
| -rw-r--r-- | src/plugin_manager/plugin_manager.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugin_manager/plugin_manager.c b/src/plugin_manager/plugin_manager.c index 239b13a..700646f 100644 --- a/src/plugin_manager/plugin_manager.c +++ b/src/plugin_manager/plugin_manager.c @@ -259,7 +259,7 @@ static struct stellar_exdata *per_thread_packet_exdata_arrary_get(struct plugin_ return plug_mgr->per_thread_data[tid].per_thread_pkt_exdata_array.exdata_array; } -static void per_thread_packet_exdata_arrary_clean(struct plugin_manager_schema *plug_mgr, struct packet *pkt) +static void per_thread_packet_exdata_arrary_clean(struct plugin_manager_schema *plug_mgr) { if(plug_mgr==NULL || plug_mgr->stellar_exdata_schema_array == NULL)return; unsigned int len=utarray_len(plug_mgr->stellar_exdata_schema_array); @@ -593,7 +593,7 @@ static void stellar_mq_dispatch(struct stellar_message *priority_mq[], struct st return; } -static void stellar_mq_free(struct session *sess, struct packet *pkt, struct stellar_message **head, UT_array *mq_schema_array) +static void stellar_mq_free(struct stellar_message **head, UT_array *mq_schema_array) { struct stellar_message *mq_elt, *tmp; struct stellar_mq_topic_schema *topic; @@ -780,7 +780,7 @@ static struct stellar_exdata *session_exdata_runtime_new(struct plugin_manager_s return exdata_rt; } -static void session_exdata_runtime_free(struct plugin_manager_schema *plug_mgr, struct session *sess, struct stellar_exdata *exdata_rt) +static void session_exdata_runtime_free(struct plugin_manager_schema *plug_mgr, struct stellar_exdata *exdata_rt) { if(exdata_rt==NULL)return; if(plug_mgr->stellar_exdata_schema_array==NULL)return; @@ -844,7 +844,7 @@ void plugin_manager_session_runtime_free(struct plugin_manager_runtime *rt) } FREE(rt->plugin_ctx_array); } - session_exdata_runtime_free(rt->plug_mgr, rt->sess, rt->sess_exdata_array); + session_exdata_runtime_free(rt->plug_mgr, rt->sess_exdata_array); FREE(rt->sess_exdata_array); FREE(rt); } @@ -896,10 +896,9 @@ void plugin_manager_on_packet_egress(struct plugin_manager_schema *plug_mgr, str int tid=stellar_get_current_thread_id(plug_mgr->st); stellar_mq_dispatch(plug_mgr->per_thread_data[tid].priority_mq, &plug_mgr->per_thread_data[tid].dealth_letter_queue, NULL, pkt); plug_mgr->per_thread_data[tid].pub_packet_msg_cnt=-1;//disable packet message publish - stellar_mq_free(NULL, pkt, - &plug_mgr->per_thread_data[stellar_get_current_thread_id(plug_mgr->st)].dealth_letter_queue, + stellar_mq_free(&plug_mgr->per_thread_data[tid].dealth_letter_queue, plug_mgr->stellar_mq_schema_array); - per_thread_packet_exdata_arrary_clean(plug_mgr, pkt); + per_thread_packet_exdata_arrary_clean(plug_mgr); } /********************************************* @@ -1001,7 +1000,7 @@ void plugin_manager_on_session_egress(struct session *sess, struct packet *pkt) int tid=stellar_get_current_thread_id(plug_mgr_rt->plug_mgr->st); stellar_mq_dispatch(plug_mgr_rt->plug_mgr->per_thread_data[tid].priority_mq, &plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, sess, pkt); plug_mgr_rt->pub_session_msg_cnt=-1;//disable session message publish - stellar_mq_free(plug_mgr_rt->sess,pkt, &plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, plug_mgr_rt->plug_mgr->stellar_mq_schema_array); + stellar_mq_free(&plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, plug_mgr_rt->plug_mgr->stellar_mq_schema_array); return; } @@ -1025,7 +1024,7 @@ void plugin_manager_on_session_closing(struct session *sess) int tid=stellar_get_current_thread_id(plug_mgr_rt->plug_mgr->st); stellar_mq_dispatch(plug_mgr_rt->plug_mgr->per_thread_data[tid].priority_mq, &plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, sess, NULL); plug_mgr_rt->pub_session_msg_cnt=-1;//disable session message publish - stellar_mq_free(plug_mgr_rt->sess,NULL,&plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, plug_mgr_rt->plug_mgr->stellar_mq_schema_array); + stellar_mq_free(&plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, plug_mgr_rt->plug_mgr->stellar_mq_schema_array); return; } |