lkml.org 
[lkml]   [2014]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 06/17] tools lib traceevent: Add pevent_unregister_event_handler()
On Wed, 15 Jan 2014 10:45:29 +0900
Namhyung Kim <namhyung@kernel.org> wrote:

> pr_stat("overriding event (%d) %s:%s with new print handler",
> event->id, event->system, event->name);
> @@ -5637,6 +5649,79 @@ int pevent_register_event_handler(struct pevent *pevent, int id,
> return -1;
> }
>
> +static int handle_matches(struct event_handler *handler, int id,
> + const char *sys_name, const char *event_name,
> + pevent_event_handler_func func, void *context)
> +{
> + if (id >= 0 && id != handler->id)
> + return 0;
> +
> + if (event_name && (strcmp(event_name, handler->event_name) != 0))
> + return 0;
> +
> + if (sys_name && (strcmp(sys_name, handler->sys_name) != 0))
> + return 0;
> +
> + if (func != handler->func || context != handler->context)
> + return 0;
> +
> + return 1;
> +}
> +
> +/**
> + * pevent_unregister_event_handler - unregister an existing event handler
> + * @pevent: the handle to the pevent
> + * @id: the id of the event to unregister
> + * @sys_name: the system name the handler belongs to
> + * @event_name: the name of the event handler
> + * @func: the function to call to parse the event information
> + * @context: the data to be passed to @func
> + *
> + * This function removes existing event handler (parser).
> + *
> + * If @id is >= 0, then it is used to find the event.
> + * else @sys_name and @event_name are used.
> + *
> + * Returns 0 if handler was removed successfully, -1 if event was not found.
> + */
> +int pevent_unregister_event_handler(struct pevent *pevent, int id,
> + const char *sys_name, const char *event_name,
> + pevent_event_handler_func func, void *context)
> +{
> + struct event_format *event;
> + struct event_handler *handle;
> + struct event_handler **next;
> +
> + event = pevent_search_event(pevent, id, sys_name, event_name);
> + if (event == NULL)
> + goto not_found;
> +
> + if (event->handler == func && event->context == context) {
> + pr_stat("overriding event (%d) %s:%s with default print handler",

Should we use the word "overriding" again? Perhaps saying:

"removing override print handler (%d) %s:%s. Going back to default handler."

Or something?

-- Steve

> + event->id, event->system, event->name);
> +
> + event->handler = NULL;
> + event->context = NULL;
> + return 0;
> + }
> +
> +not_found:
> + for (next = &pevent->handlers; *next; next = &(*next)->next) {
> + handle = *next;
> + if (handle_matches(handle, id, sys_name, event_name,
> + func, context))
> + break;
> + }
> +
> + if (!(*next))
> + return -1;
> +
> + *next = handle->next;
> + free_handler(handle);
> +
> + return 0;
> +}
> +


\
 
 \ /
  Last update: 2014-01-15 18:01    [W:0.196 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site