perf tools: Do proper comm override error handling

The comm overriding API ignores memory allocation failures by silently
keeping the previous and out of date comm.

As a result, the user may get buggy events without ever being notified
about the problem and its source.

Lets start to fix this by propagating the error from the API. Not all
callers may be doing proper error handling on comm set yet but this is
the first step toward it.

Signed-off-by: Frederic Weisbecker <[email protected]>
Acked-by: Namhyung Kim <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This commit is contained in:
Frederic Weisbecker 2014-01-14 16:37:14 +01:00 • committed by Arnaldo Carvalho de Melo
commit 3178f58b98
3 changed files with 15 additions and 11 deletions

View file

@ -94,19 +94,20 @@ struct comm *comm__new(const char *str, u64 timestamp)
return comm;
}
void comm__override(struct comm *comm, const char *str, u64 timestamp)
int comm__override(struct comm *comm, const char *str, u64 timestamp)
{
struct comm_str *old = comm->comm_str;
struct comm_str *new, *old = comm->comm_str;
comm->comm_str = comm_str__findnew(str, &comm_str_root);
if (!comm->comm_str) {
comm->comm_str = old;
return;
}
new = comm_str__findnew(str, &comm_str_root);
if (!new)
return -ENOMEM;
comm->start = timestamp;
comm_str__get(comm->comm_str);
comm_str__get(new);
comm_str__put(old);
comm->comm_str = new;
comm->start = timestamp;
return 0;
}
void comm__free(struct comm *comm)

View file

@ -16,6 +16,6 @@ struct comm {
void comm__free(struct comm *comm);
struct comm *comm__new(const char *str, u64 timestamp);
const char *comm__str(const struct comm *comm);
void comm__override(struct comm *comm, const char *str, u64 timestamp);
int comm__override(struct comm *comm, const char *str, u64 timestamp);
#endif /* __PERF_COMM_H */

View file

@ -66,10 +66,13 @@ struct comm *thread__comm(const struct thread *thread)
int thread__set_comm(struct thread *thread, const char *str, u64 timestamp)
{
struct comm *new, *curr = thread__comm(thread);
int err;
/* Override latest entry if it had no specific time coverage */
if (!curr->start) {
comm__override(curr, str, timestamp);
err = comm__override(curr, str, timestamp);
if (err)
return err;
} else {
new = comm__new(str, timestamp);
if (!new)