lkml.org 
[lkml]   [2018]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 09/24] tools/lib/traceevent, tools/perf: Rename pevent_register_* APIs
    From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>

    In order to make libtraceevent into a proper library, variables, data
    structures and functions require a unique prefix to prevent name space
    conflicts. That prefix will be "tep_" and not "pevent_". This changes
    APIs: pevent_register_comm, pevent_register_print_string

    Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    ---
    tools/lib/traceevent/event-parse.c | 10 +++++-----
    tools/lib/traceevent/event-parse.h | 6 +++---
    tools/lib/traceevent/plugin_sched_switch.c | 2 +-
    tools/perf/util/trace-event-parse.c | 4 ++--
    4 files changed, 11 insertions(+), 11 deletions(-)

    diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
    index 4220b15781c8..cab411b99087 100644
    --- a/tools/lib/traceevent/event-parse.c
    +++ b/tools/lib/traceevent/event-parse.c
    @@ -288,7 +288,7 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid)
    }

    /**
    - * pevent_register_comm - register a pid / comm mapping
    + * tep_register_comm - register a pid / comm mapping
    * @pevent: handle for the pevent
    * @comm: the command line to register
    * @pid: the pid to map the command line to
    @@ -296,7 +296,7 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid)
    * This adds a mapping to search for command line names with
    * a given pid. The comm is duplicated.
    */
    -int pevent_register_comm(struct tep_handle *pevent, const char *comm, int pid)
    +int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid)
    {
    struct cmdline_list *item;

    @@ -685,7 +685,7 @@ find_printk(struct tep_handle *pevent, unsigned long long addr)
    }

    /**
    - * pevent_register_print_string - register a string by its address
    + * tep_register_print_string - register a string by its address
    * @pevent: handle for the pevent
    * @fmt: the string format to register
    * @addr: the address the string was located at
    @@ -693,8 +693,8 @@ find_printk(struct tep_handle *pevent, unsigned long long addr)
    * This registers a string by the address it was stored in the kernel.
    * The @fmt passed in is duplicated.
    */
    -int pevent_register_print_string(struct tep_handle *pevent, const char *fmt,
    - unsigned long long addr)
    +int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
    + unsigned long long addr)
    {
    struct printk_list *item = malloc(sizeof(*item));
    char *p;
    diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
    index 58d9f0dedf05..399dea66b80e 100644
    --- a/tools/lib/traceevent/event-parse.h
    +++ b/tools/lib/traceevent/event-parse.h
    @@ -618,12 +618,12 @@ enum trace_flag_type {
    int pevent_set_function_resolver(struct tep_handle *pevent,
    tep_func_resolver_t *func, void *priv);
    void pevent_reset_function_resolver(struct tep_handle *pevent);
    -int pevent_register_comm(struct tep_handle *pevent, const char *comm, int pid);
    +int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid);
    int pevent_register_trace_clock(struct tep_handle *pevent, const char *trace_clock);
    int pevent_register_function(struct tep_handle *pevent, char *name,
    unsigned long long addr, char *mod);
    -int pevent_register_print_string(struct tep_handle *pevent, const char *fmt,
    - unsigned long long addr);
    +int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
    + unsigned long long addr);
    int pevent_pid_is_registered(struct tep_handle *pevent, int pid);

    void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s,
    diff --git a/tools/lib/traceevent/plugin_sched_switch.c b/tools/lib/traceevent/plugin_sched_switch.c
    index 90d2ef293cf9..4d8eaab6ac15 100644
    --- a/tools/lib/traceevent/plugin_sched_switch.c
    +++ b/tools/lib/traceevent/plugin_sched_switch.c
    @@ -61,7 +61,7 @@ static void write_and_save_comm(struct format_field *field,
    comm = &s->buffer[len];

    /* Help out the comm to ids. This will handle dups */
    - pevent_register_comm(field->event->pevent, comm, pid);
    + tep_register_comm(field->event->pevent, comm, pid);
    }

    static int sched_wakeup_handler(struct trace_seq *s,
    diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
    index a0e2b2c54567..920b1d58a068 100644
    --- a/tools/perf/util/trace-event-parse.c
    +++ b/tools/perf/util/trace-event-parse.c
    @@ -157,7 +157,7 @@ void parse_ftrace_printk(struct tep_handle *pevent,
    /* fmt still has a space, skip it */
    printk = strdup(fmt+1);
    line = strtok_r(NULL, "\n", &next);
    - pevent_register_print_string(pevent, printk, addr);
    + tep_register_print_string(pevent, printk, addr);
    }
    }

    @@ -172,7 +172,7 @@ void parse_saved_cmdline(struct tep_handle *pevent,
    line = strtok_r(file, "\n", &next);
    while (line) {
    sscanf(line, "%d %ms", &pid, &comm);
    - pevent_register_comm(pevent, comm, pid);
    + tep_register_comm(pevent, comm, pid);
    free(comm);
    line = strtok_r(NULL, "\n", &next);
    }
    --
    2.18.0

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