Introduce new libtracevent API: tep_override_comm()
PATCH 1/1 Introduce new libtracevent API: tep_override_comm()
Added a new API of tracevent library: tep_override_comm() It registers a pid / comm mapping. If a mapping with the same pid already exists, the entry is updated with the new comm.
--- include/traceevent/event-parse.h | 1 + lib/traceevent/event-parse.c | 67 +++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 15 deletions(-)
include/traceevent/event-parse.h +1 -0
@@ -607,6 +607,7 @@ int tep_set_function_resolver(struct tep_handle *pevent, tep_func_resolver_t *func, void *priv);void tep_reset_function_resolver (struct tep_handle *pevent);int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid); +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid);int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock);int tep_register_function (struct tep_handle *pevent,char *name,unsigned long long addr,char *mod);
lib/traceevent/event-parse.c +52 -15
97 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 27 lines · On Thu, 30 Aug 2018 18:09:00 +0300 "Tzvetomir Stoyanov (VMware)"…
Added a new API of tracevent library:
tep_override_comm()It registers a pid / comm mapping. If a mapping with the same pid already exists, the entry is updated with the new comm.Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>--- include/traceevent/event-parse.h | 1 + lib/traceevent/event-parse.c | 67 +++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 15 deletions(-)include/traceevent/event-parse.h +1
-0@@ -607,6 +607,7 @@ int tep_set_function_resolver(struct tep_handle *pevent, tep_func_resolver_t *func, void *priv);void tep_reset_function_resolver (struct tep_handle *pevent);int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid); +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid);int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock);int tep_register_function (struct tep_handle *pevent,char *name,unsigned long long addr,char *mod);lib/traceevent/event-parse.c +0
-0
lib/traceevent/event-parse.c int tep_pid_is_registered(struct tep_handle *pevent, int pid) · line 234
Quoted 6 lines
lib/traceevent/event-parse.c +2
-1@@ -230,10 +230,11 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent,const char *comm,int pid) +static int add_new_comm (struct tep_handle *pevent, +const char *comm,int pid,int overrite)
Typo, should be "overwrite" or "override". Also make it a "bool" type.
Quoted 10 lines
lib/traceevent/event-parse.c +1
-1{struct cmdline *cmdlines = pevent->cmdlines; -const struct cmdline *cmdline; +struct cmdline *cmdline;struct cmdline key;if (!pid)@@ -245,8 +246,18 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count,sizeof (*pevent->cmdlines), cmdline_cmp);
lib/traceevent/event-parse.c static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) · line 255
Quoted 10 lines
lib/traceevent/event-parse.c +7
-2if (cmdline) { - errno =EEXIST ; -return -1 ; +if (!overrite) { + errno =EEXIST ; +return -1 ; + } +if (cmdline->comm) +free (cmdline->comm); + cmdline->comm =strdup (comm);
We don't want to lose the old comm if the new comm fails to be allocated. Thus, use a temp variable to save the strdup().
char *new_comm;
new_comm = strdup(comm);
if (!new_comm) {
errno = ENOMEM;
return -1;
}
free(cmdline->comm);
cmdline->comm = new_comm;Quoted 14 lines
lib/traceevent/event-parse.c +5
-2+if (!cmdline->comm) { + errno =ENOMEM ; +return -1 ; + } +return 0 ; } cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 ));@@ -273,21 +284,13 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } -/** -* tep_register_comm - register a pid / comm mapping
lib/traceevent/event-parse.c static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) · line 288
Quoted 10 lines
lib/traceevent/event-parse.c +2
-8-* @pevent: handle for the pevent -* @comm: the command line to register -* @pid: the pid to map the command line to -* -* This adds a mapping to search for command line names with -* a given pid. The comm is duplicated. -*/ -int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +static int _tep_register_comm (struct tep_handle *pevent, +const char *comm,int pid,int overrite)
Same comment here for "overrite".
Quoted 16 lines
lib/traceevent/event-parse.c +4
-1{struct cmdline_list *item;if (pevent->cmdlines) -return add_new_comm (pevent, comm, pid); +return add_new_comm (pevent, comm, pid, overrite); item =malloc (sizeof (*item));if (!item)@@ -310,6 +313,40 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } +/** +* tep_register_comm - register a pid / comm mapping +* @pevent: handle for the pevent
lib/traceevent/event-parse.c int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) · line 328
Quoted 10 lines
lib/traceevent/event-parse.c +10
-0+* @comm: the command line to register +* @pid: the pid to map the command line to +* +* This adds a mapping to search for command line names with +* a given pid. The comm is duplicated. If a command with the same pid +* already exist, -1 is returned and errno is set to EEXIST +*/ +int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +return _tep_register_comm (pevent, comm, pid,0 );
Pass in "false" instead of 0.
Quoted 9 lines
lib/traceevent/event-parse.c +9
-0+} + +/** +* tep_override_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 +* +* This adds a mapping to search for command line names with
lib/traceevent/event-parse.c int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) · line 347
Quoted 10 lines
lib/traceevent/event-parse.c +10
-0+* a given pid. The comm is duplicated. If a command with the same pid +* already exist, the command string is udapted with the new one +*/ +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +if (!pevent->cmdlines &&cmdline_init (pevent)) { + errno =ENOMEM ; +return -1 ; + } +return _tep_register_comm (pevent, comm, pid,1 );
Pass in "true" instead of 1.
lib/traceevent/event-parse.c int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) · line 349
Quoted 2 lines
lib/traceevent/event-parse.c +2
-0+} +
Rest looks good.
Thanks Tzvetomir!
-- Steve
Quoted 3 lines
lib/traceevent/event-parse.c +0
-0int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock) { pevent->trace_clock =strdup (trace_clock);
PATCH v2 1/1 Introduce new libtracevent API: tep_override_comm()
In reply to Tzvetomir Stoyanov (VMware)Added a new API of tracevent library: tep_override_comm() It registers a pid / comm mapping. If a mapping with the same pid already exists, the entry is updated with the new comm.
--- include/traceevent/event-parse.h | 1 + lib/traceevent/event-parse.c | 70 +++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 15 deletions(-)
include/traceevent/event-parse.h +1 -0
@@ -607,6 +607,7 @@ int tep_set_function_resolver(struct tep_handle *pevent, tep_func_resolver_t *func, void *priv);void tep_reset_function_resolver (struct tep_handle *pevent);int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid); +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid);int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock);int tep_register_function (struct tep_handle *pevent,char *name,unsigned long long addr,char *mod);
lib/traceevent/event-parse.c +55 -15
101 lines not on this page · raw message
Signature · 1 line
2.17.1
ping
Hi Steven, is there a problem with this patch ? Yordan needs these changes, he wants to use the new API in KernelShark.
Quoted 135 lines · Tzvetomir Stoyanov (VMware)
Added a new API of tracevent library:
tep_override_comm()It registers a pid / comm mapping. If a mapping with the same pid already exists, the entry is updated with the new comm.Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>--- include/traceevent/event-parse.h | 1 + lib/traceevent/event-parse.c | 70 +++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 15 deletions(-)include/traceevent/event-parse.h +1
-0@@ -607,6 +607,7 @@ int tep_set_function_resolver(struct tep_handle *pevent, tep_func_resolver_t *func, void *priv);void tep_reset_function_resolver (struct tep_handle *pevent);int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid); +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid);int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock);int tep_register_function (struct tep_handle *pevent,char *name,unsigned long long addr,char *mod);lib/traceevent/event-parse.c +55
-16@@ -230,11 +230,13 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent,const char *comm,int pid) +static int add_new_comm (struct tep_handle *pevent, +const char *comm,int pid,bool override) {struct cmdline *cmdlines = pevent->cmdlines; -const struct cmdline *cmdline; +struct cmdline *cmdline;struct cmdline key; +char *new_comm;if (!pid)return 0 ;@@ -245,8 +247,20 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count,sizeof (*pevent->cmdlines), cmdline_cmp);if (cmdline) { - errno =EEXIST ; -return -1 ; +if (!override) { + errno =EEXIST ; +return -1 ; + } + new_comm =strdup (comm); +if (!new_comm) { + errno =ENOMEM ; +return -1 ; + } +if (cmdline->comm) +free (cmdline->comm); + cmdline->comm = new_comm; + +return 0 ; } cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 ));@@ -273,21 +287,13 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } -/** -* 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 -* -* This adds a mapping to search for command line names with -* a given pid. The comm is duplicated. -*/ -int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +static int _tep_register_comm (struct tep_handle *pevent, +const char *comm,int pid,bool override) {struct cmdline_list *item;if (pevent->cmdlines) -return add_new_comm (pevent, comm, pid); +return add_new_comm (pevent, comm, pid, override); item =malloc (sizeof (*item));if (!item)@@ -310,6 +316,40 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } +/** +* 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 +* +* This adds a mapping to search for command line names with +* a given pid. The comm is duplicated. If a command with the same pid +* already exist, -1 is returned and errno is set to EEXIST +*/ +int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +return _tep_register_comm (pevent, comm, pid, false); +} + +/** +* tep_override_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 +* +* This adds a mapping to search for command line names with +* a given pid. The comm is duplicated. If a command with the same pid +* already exist, the command string is udapted with the new one +*/ +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +if (!pevent->cmdlines &&cmdline_init (pevent)) { + errno =ENOMEM ; +return -1 ; + } +return _tep_register_comm (pevent, comm, pid, true); +} +int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock) { pevent->trace_clock =strdup (trace_clock); --2.17.1
Quoted 3 lines · On Tue, 16 Oct 2018 09:46:07 +0300 Ceco <[email protected]> wrote:
ping
Hi Steven, is there a problem with this patch ? Yordan needs these changes, he wants to use the new API in KernelShark.
Just woke up, so I haven't had a chance to look at the patch. But the one thing that is wrong with it, is that a v2 shouldn't be a reply to a v1. That is, it should start a new thread. With thousands of emails in my Inbox, I look at email threads (as do many kernel developers), and if there's a patch within the thread, it is commonly missed.
I will say that I did mark it to look at it, so I did see it. But other patches came in during that time, and I sorted my inbox by thread, which did hide the patch again.
I'll take a look at it later today.
Also, don't be afraid to send a ping if there's no response for a week, as that usually means it was lost in the flood.
Thanks!
-- Steve
Quoted 4 lines
Quoted 1 line · Tzvetomir Stoyanov (VMware)
Quoted 58 lines · On Tue, 16 Oct 2018 09:46:07 +0300 Ceco <[email protected]> wrote:
ping
Hi Steven, is there a problem with this patch ? Yordan needs these changes, he wants to use the new API in KernelShark.Quoted 52 lines · Tzvetomir Stoyanov (VMware)
Added a new API of tracevent library:
tep_override_comm()It registers a pid / comm mapping. If a mapping with the same pid already exists, the entry is updated with the new comm.Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>--- include/traceevent/event-parse.h | 1 + lib/traceevent/event-parse.c | 70 +++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 15 deletions(-)include/traceevent/event-parse.h +1
-0@@ -607,6 +607,7 @@ int tep_set_function_resolver(struct tep_handle *pevent, tep_func_resolver_t *func, void *priv);void tep_reset_function_resolver (struct tep_handle *pevent);int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid); +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid);int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock);int tep_register_function (struct tep_handle *pevent,char *name,unsigned long long addr,char *mod);lib/traceevent/event-parse.c +7
-4@@ -230,11 +230,13 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent,const char *comm,int pid) +static int add_new_comm (struct tep_handle *pevent, +const char *comm,int pid,bool override) {struct cmdline *cmdlines = pevent->cmdlines; -const struct cmdline *cmdline; +struct cmdline *cmdline;struct cmdline key; +char *new_comm;if (!pid)return 0 ;@@ -245,8 +247,20 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count,sizeof (*pevent->cmdlines), cmdline_cmp);if (cmdline) { - errno =EEXIST ; -return -1 ; +if (!override) { + errno =EEXIST ; +return -1 ;
Quoted 8 lines
lib/traceevent/event-parse.c static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid) · line 260
Quoted 8 lines
lib/traceevent/event-parse.c +8
-0+ } + new_comm =strdup (comm); +if (!new_comm) { + errno =ENOMEM ; +return -1 ; + } +if (cmdline->comm) +free (cmdline->comm);
One nit here. free() can take a NULL parameter without issue, so the if isn't necessary.
free(cmdline->comm); cmdline->comm = new_comm;
Other than that, the rest looks good.
Want to send a v3 (new thread).
Thanks!
-- Steve
Quoted 75 lines
Quoted 75 lines
lib/traceevent/event-parse.c +40
-12+ cmdline->comm = new_comm; + +return 0 ; } cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 ));@@ -273,21 +287,13 @@ static int add_new_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } -/** -* 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 -* -* This adds a mapping to search for command line names with -* a given pid. The comm is duplicated. -*/ -int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +static int _tep_register_comm (struct tep_handle *pevent, +const char *comm,int pid,bool override) {struct cmdline_list *item;if (pevent->cmdlines) -return add_new_comm (pevent, comm, pid); +return add_new_comm (pevent, comm, pid, override); item =malloc (sizeof (*item));if (!item)@@ -310,6 +316,40 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid)return 0 ; } +/** +* 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 +* +* This adds a mapping to search for command line names with +* a given pid. The comm is duplicated. If a command with the same pid +* already exist, -1 is returned and errno is set to EEXIST +*/ +int tep_register_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +return _tep_register_comm (pevent, comm, pid, false); +} + +/** +* tep_override_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 +* +* This adds a mapping to search for command line names with +* a given pid. The comm is duplicated. If a command with the same pid +* already exist, the command string is udapted with the new one +*/ +int tep_override_comm (struct tep_handle *pevent,const char *comm,int pid) +{ +if (!pevent->cmdlines &&cmdline_init (pevent)) { + errno =ENOMEM ; +return -1 ; + } +return _tep_register_comm (pevent, comm, pid, true); +} +int tep_register_trace_clock (struct tep_handle *pevent,const char *trace_clock) { pevent->trace_clock =strdup (trace_clock); --2.17.1