diff options
Diffstat (limited to 'src/plugin_manager/plugin_manager.cpp')
| -rw-r--r-- | src/plugin_manager/plugin_manager.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/plugin_manager/plugin_manager.cpp b/src/plugin_manager/plugin_manager.cpp index d90122c..88aae1e 100644 --- a/src/plugin_manager/plugin_manager.cpp +++ b/src/plugin_manager/plugin_manager.cpp @@ -19,11 +19,12 @@ enum plugin_status struct callback_runtime { - enum plugin_status status; void *cb_args; + fn_session_event_callback *event_cb; enum session_event_type event; - fn_session_event_callback *event_cb; + enum plugin_status status; + int is_be_called; }; struct session_plugin_ctx @@ -95,6 +96,7 @@ static struct session_plugin_ctx *plugin_manager_create_plugin_ctx(struct plugin for (int i = 0; i < plug_ctx->callback_num; i++) { + plug_ctx->callbacks[i].is_be_called = 0; plug_ctx->callbacks[i].status = PLUGIN_STATUS_NORMAL; plug_ctx->callbacks[i].event = elem->callbacks[i].event; plug_ctx->callbacks[i].event_cb = elem->callbacks[i].event_cb; @@ -435,12 +437,7 @@ void plugin_manager_dispatch(struct plugin_manager *plug_mgr, struct stellar_eve } else if (runtime->status == PLUGIN_STATUS_TAKEN_OVER) { - /* - * This plugin may be taken over when the session is open (SESSION_EVENT_OPENING), - * and the pme may be NULL when event_cb() is run to free memory with the session is closed (SESSION_EVENT_CLOSING). - * So, The plugin must check whether the pme is NULL before freeing memory. - */ - if (event_type & SESSION_EVENT_CLOSING) + if ((event_type & SESSION_EVENT_CLOSING) && (runtime->event & SESSION_EVENT_CLOSING) && runtime->is_be_called) { plug_ctx->callback_index = i; plugin_manager_log(DEBUG, "dispatch, run event_cb: %p, plugin status: 'taken over', session: %s, event: (%d, %s)", runtime->event_cb, session_name, event_type, event_str_buffer); @@ -459,6 +456,7 @@ void plugin_manager_dispatch(struct plugin_manager *plug_mgr, struct stellar_eve plug_ctx->callback_index = i; plugin_manager_log(DEBUG, "dispatch, run event_cb: %p, plugin status: 'normal', session: %s, event: (%d, %s)", runtime->event_cb, session_name, event_type, event_str_buffer); runtime->event_cb(seesion, event_type, packet, payload, payload_len, &runtime->cb_args); + runtime->is_be_called = 1; } else { @@ -499,12 +497,18 @@ void pm_session_dettach_me(const struct stellar_session *session) } /* - * The current plugin takes over the current session, the pm_session_take_over setting flag disables other plugins, + * The current plugin(cb2) takes over the current session, the pm_session_take_over setting flag disables other plugins, * and the current session does not call other plugins except for the SESSION_EVENT_CLOSING event. * - * The current plugin may be taken over while the session is open (SESSION_EVENT_OPENING), - * other plugins event_cb is not called, the session pme on other plugins is NULL, - * When the session is closed (SESSION_EVENT_CLOSING), call other plugin even_cb to destroy pme must check if pme is NULL + * +-----+ +-----+ +-----+ +-----+ + * Plugin runtime callback list: | cb1 |-->| cb2 |-->| cb3 |-->| cb4 | + * +-----+ +-----+ +-----+ +-----+ + * /|\ + * | + * plugin cb2 run pm_session_take_over + * + * A plugin(cb1/cb3/cb4) that is taken over, if the plugin was called before being taken over and has a registered SESSION_EVENT_CLOSING event, + * it will be called again when the SESSION_EVENT_CLOSING event comes. Otherwise, the plugin will not be called. */ void pm_session_take_over(const struct stellar_session *session) { |