Skip to content

Commit

Permalink
perf trace: Use thread_{,_set}_priv helpers
Browse files Browse the repository at this point in the history
This is mechanical changes only for accounting access to thread->priv
properly in the source level.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1412556363-26229-6-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Oct 15, 2014
1 parent 69e865c commit 89dceb2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tools/perf/builtin-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1189,13 +1189,13 @@ static struct thread_trace *thread__trace(struct thread *thread, FILE *fp)
if (thread == NULL)
goto fail;

if (thread->priv == NULL)
thread->priv = thread_trace__new();
if (thread__priv(thread) == NULL)
thread__set_priv(thread, thread_trace__new());

if (thread->priv == NULL)
if (thread__priv(thread) == NULL)
goto fail;

ttrace = thread->priv;
ttrace = thread__priv(thread);
++ttrace->nr_events;

return ttrace;
Expand Down Expand Up @@ -1248,7 +1248,7 @@ struct trace {

static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pathname)
{
struct thread_trace *ttrace = thread->priv;
struct thread_trace *ttrace = thread__priv(thread);

if (fd > ttrace->paths.max) {
char **npath = realloc(ttrace->paths.table, (fd + 1) * sizeof(char *));
Expand Down Expand Up @@ -1301,7 +1301,7 @@ static int thread__read_fd_path(struct thread *thread, int fd)
static const char *thread__fd_path(struct thread *thread, int fd,
struct trace *trace)
{
struct thread_trace *ttrace = thread->priv;
struct thread_trace *ttrace = thread__priv(thread);

if (ttrace == NULL)
return NULL;
Expand Down Expand Up @@ -1338,7 +1338,7 @@ static size_t syscall_arg__scnprintf_close_fd(char *bf, size_t size,
{
int fd = arg->val;
size_t printed = syscall_arg__scnprintf_fd(bf, size, arg);
struct thread_trace *ttrace = arg->thread->priv;
struct thread_trace *ttrace = thread__priv(arg->thread);

if (ttrace && fd >= 0 && fd <= ttrace->paths.max)
zfree(&ttrace->paths.table[fd]);
Expand Down Expand Up @@ -2381,7 +2381,7 @@ static int trace__fprintf_one_thread(struct thread *thread, void *priv)
FILE *fp = data->fp;
size_t printed = data->printed;
struct trace *trace = data->trace;
struct thread_trace *ttrace = thread->priv;
struct thread_trace *ttrace = thread__priv(thread);
double ratio;

if (ttrace == NULL)
Expand Down

0 comments on commit 89dceb2

Please sign in to comment.