Commit 13df45ca authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar

perf session: Register the idle thread in perf_session__process_events

No need for all tools to register it and then immediately call
perf_session__process_events.
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260741029-4430-3-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 301a0b02
...@@ -464,14 +464,11 @@ static int __cmd_annotate(void) ...@@ -464,14 +464,11 @@ static int __cmd_annotate(void)
{ {
struct perf_session *session = perf_session__new(input_name, O_RDONLY, struct perf_session *session = perf_session__new(input_name, O_RDONLY,
force); force);
struct thread *idle;
int ret; int ret;
if (session == NULL) if (session == NULL)
return -ENOMEM; return -ENOMEM;
idle = register_idle_thread();
ret = perf_session__process_events(session, &event_ops, 0, ret = perf_session__process_events(session, &event_ops, 0,
&event__cwdlen, &event__cwd); &event__cwdlen, &event__cwd);
if (ret) if (ret)
......
...@@ -372,7 +372,6 @@ static int read_events(void) ...@@ -372,7 +372,6 @@ static int read_events(void)
if (session == NULL) if (session == NULL)
return -ENOMEM; return -ENOMEM;
register_idle_thread();
err = perf_session__process_events(session, &event_ops, 0, err = perf_session__process_events(session, &event_ops, 0,
&event__cwdlen, &event__cwd); &event__cwdlen, &event__cwd);
perf_session__delete(session); perf_session__delete(session);
......
...@@ -761,7 +761,6 @@ static struct perf_event_ops event_ops = { ...@@ -761,7 +761,6 @@ static struct perf_event_ops event_ops = {
static int __cmd_report(void) static int __cmd_report(void)
{ {
struct thread *idle;
int ret; int ret;
struct perf_session *session; struct perf_session *session;
...@@ -769,9 +768,6 @@ static int __cmd_report(void) ...@@ -769,9 +768,6 @@ static int __cmd_report(void)
if (session == NULL) if (session == NULL)
return -ENOMEM; return -ENOMEM;
idle = register_idle_thread();
thread__comm_adjust(idle);
if (show_threads) if (show_threads)
perf_read_values_init(&show_threads_values); perf_read_values_init(&show_threads_values);
......
...@@ -1670,8 +1670,6 @@ static int read_events(void) ...@@ -1670,8 +1670,6 @@ static int read_events(void)
if (session == NULL) if (session == NULL)
return -ENOMEM; return -ENOMEM;
register_idle_thread();
err = perf_session__process_events(session, &event_ops, 0, err = perf_session__process_events(session, &event_ops, 0,
&event__cwdlen, &event__cwd); &event__cwdlen, &event__cwd);
perf_session__delete(session); perf_session__delete(session);
......
...@@ -125,7 +125,6 @@ static struct perf_event_ops event_ops = { ...@@ -125,7 +125,6 @@ static struct perf_event_ops event_ops = {
static int __cmd_trace(struct perf_session *session) static int __cmd_trace(struct perf_session *session)
{ {
register_idle_thread();
return perf_session__process_events(session, &event_ops, 0, return perf_session__process_events(session, &event_ops, 0,
&event__cwdlen, &event__cwd); &event__cwdlen, &event__cwd);
} }
......
#include "symbol.h" #include "symbol.h"
#include "util.h" #include "util.h"
#include "debug.h" #include "debug.h"
#include "thread.h"
#include "session.h" #include "session.h"
static unsigned long mmap_window = 32; static unsigned long mmap_window = 32;
...@@ -127,6 +128,18 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size) ...@@ -127,6 +128,18 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
return err; return err;
} }
static struct thread *perf_session__register_idle_thread(struct perf_session *self __used)
{
struct thread *thread = threads__findnew(0);
if (!thread || thread__set_comm(thread, "swapper")) {
pr_err("problem inserting idle task.\n");
thread = NULL;
}
return thread;
}
int perf_session__process_events(struct perf_session *self, int perf_session__process_events(struct perf_session *self,
struct perf_event_ops *ops, struct perf_event_ops *ops,
int full_paths, int *cwdlen, char **cwd) int full_paths, int *cwdlen, char **cwd)
...@@ -140,6 +153,9 @@ int perf_session__process_events(struct perf_session *self, ...@@ -140,6 +153,9 @@ int perf_session__process_events(struct perf_session *self,
uint32_t size; uint32_t size;
char *buf; char *buf;
if (perf_session__register_idle_thread(self) == NULL)
return -ENOMEM;
perf_event_ops__fill_defaults(ops); perf_event_ops__fill_defaults(ops);
page_size = getpagesize(); page_size = getpagesize();
......
...@@ -161,18 +161,6 @@ struct thread *threads__findnew(pid_t pid) ...@@ -161,18 +161,6 @@ struct thread *threads__findnew(pid_t pid)
return th; return th;
} }
struct thread *register_idle_thread(void)
{
struct thread *thread = threads__findnew(0);
if (!thread || thread__set_comm(thread, "swapper")) {
fprintf(stderr, "problem inserting idle task.\n");
exit(-1);
}
return thread;
}
static void map_groups__remove_overlappings(struct map_groups *self, static void map_groups__remove_overlappings(struct map_groups *self,
struct map *map) struct map *map)
{ {
......
...@@ -24,7 +24,6 @@ void map_groups__init(struct map_groups *self); ...@@ -24,7 +24,6 @@ void map_groups__init(struct map_groups *self);
int thread__set_comm(struct thread *self, const char *comm); int thread__set_comm(struct thread *self, const char *comm);
int thread__comm_len(struct thread *self); int thread__comm_len(struct thread *self);
struct thread *threads__findnew(pid_t pid); struct thread *threads__findnew(pid_t pid);
struct thread *register_idle_thread(void);
void thread__insert_map(struct thread *self, struct map *map); void thread__insert_map(struct thread *self, struct map *map);
int thread__fork(struct thread *self, struct thread *parent); int thread__fork(struct thread *self, struct thread *parent);
size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp); size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment