[PATCH v2 4/6] perf sched timehist: Skip non-idle events when necessary

2016-12-08 Thread Namhyung Kim
Sometimes it only focuses on idle-related events like upcoming idle-hist
feature.  In this case we don't want to see other event to reduce noise.

Signed-off-by: Namhyung Kim 
---
 tools/perf/builtin-sched.c | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 4c5c58ce8958..da3ff3253741 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -2189,7 +2189,9 @@ static struct thread *timehist_get_thread(struct 
perf_sched *sched,
 }
 
 static bool timehist_skip_sample(struct perf_sched *sched,
-struct thread *thread)
+struct thread *thread,
+struct perf_evsel *evsel,
+struct perf_sample *sample)
 {
bool rc = false;
 
@@ -2198,10 +2200,19 @@ static bool timehist_skip_sample(struct perf_sched 
*sched,
sched->skipped_samples++;
}
 
+   if (sched->idle_hist) {
+   if (strcmp(perf_evsel__name(evsel), "sched:sched_switch"))
+   rc = true;
+   else if (perf_evsel__intval(evsel, sample, "prev_pid") != 0 &&
+perf_evsel__intval(evsel, sample, "next_pid") != 0)
+   rc = true;
+   }
+
return rc;
 }
 
 static void timehist_print_wakeup_event(struct perf_sched *sched,
+   struct perf_evsel *evsel,
struct perf_sample *sample,
struct machine *machine,
struct thread *awakened)
@@ -2214,8 +2225,8 @@ static void timehist_print_wakeup_event(struct perf_sched 
*sched,
return;
 
/* show wakeup unless both awakee and awaker are filtered */
-   if (timehist_skip_sample(sched, thread) &&
-   timehist_skip_sample(sched, awakened)) {
+   if (timehist_skip_sample(sched, thread, evsel, sample) &&
+   timehist_skip_sample(sched, awakened, evsel, sample)) {
return;
}
 
@@ -2260,7 +2271,7 @@ static int timehist_sched_wakeup_event(struct perf_tool 
*tool,
/* show wakeups if requested */
if (sched->show_wakeups &&
!perf_time__skip_sample(>ptime, sample->time))
-   timehist_print_wakeup_event(sched, sample, machine, thread);
+   timehist_print_wakeup_event(sched, evsel, sample, machine, 
thread);
 
return 0;
 }
@@ -2287,8 +2298,8 @@ static void timehist_print_migration_event(struct 
perf_sched *sched,
if (thread == NULL)
return;
 
-   if (timehist_skip_sample(sched, thread) &&
-   timehist_skip_sample(sched, migrated)) {
+   if (timehist_skip_sample(sched, thread, evsel, sample) &&
+   timehist_skip_sample(sched, migrated, evsel, sample)) {
return;
}
 
@@ -2373,7 +2384,7 @@ static int timehist_sched_change_event(struct perf_tool 
*tool,
goto out;
}
 
-   if (timehist_skip_sample(sched, thread))
+   if (timehist_skip_sample(sched, thread, evsel, sample))
goto out;
 
tr = thread__get_runtime(thread);
-- 
2.10.1



[PATCH v2 4/6] perf sched timehist: Skip non-idle events when necessary

2016-12-08 Thread Namhyung Kim
Sometimes it only focuses on idle-related events like upcoming idle-hist
feature.  In this case we don't want to see other event to reduce noise.

Signed-off-by: Namhyung Kim 
---
 tools/perf/builtin-sched.c | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 4c5c58ce8958..da3ff3253741 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -2189,7 +2189,9 @@ static struct thread *timehist_get_thread(struct 
perf_sched *sched,
 }
 
 static bool timehist_skip_sample(struct perf_sched *sched,
-struct thread *thread)
+struct thread *thread,
+struct perf_evsel *evsel,
+struct perf_sample *sample)
 {
bool rc = false;
 
@@ -2198,10 +2200,19 @@ static bool timehist_skip_sample(struct perf_sched 
*sched,
sched->skipped_samples++;
}
 
+   if (sched->idle_hist) {
+   if (strcmp(perf_evsel__name(evsel), "sched:sched_switch"))
+   rc = true;
+   else if (perf_evsel__intval(evsel, sample, "prev_pid") != 0 &&
+perf_evsel__intval(evsel, sample, "next_pid") != 0)
+   rc = true;
+   }
+
return rc;
 }
 
 static void timehist_print_wakeup_event(struct perf_sched *sched,
+   struct perf_evsel *evsel,
struct perf_sample *sample,
struct machine *machine,
struct thread *awakened)
@@ -2214,8 +2225,8 @@ static void timehist_print_wakeup_event(struct perf_sched 
*sched,
return;
 
/* show wakeup unless both awakee and awaker are filtered */
-   if (timehist_skip_sample(sched, thread) &&
-   timehist_skip_sample(sched, awakened)) {
+   if (timehist_skip_sample(sched, thread, evsel, sample) &&
+   timehist_skip_sample(sched, awakened, evsel, sample)) {
return;
}
 
@@ -2260,7 +2271,7 @@ static int timehist_sched_wakeup_event(struct perf_tool 
*tool,
/* show wakeups if requested */
if (sched->show_wakeups &&
!perf_time__skip_sample(>ptime, sample->time))
-   timehist_print_wakeup_event(sched, sample, machine, thread);
+   timehist_print_wakeup_event(sched, evsel, sample, machine, 
thread);
 
return 0;
 }
@@ -2287,8 +2298,8 @@ static void timehist_print_migration_event(struct 
perf_sched *sched,
if (thread == NULL)
return;
 
-   if (timehist_skip_sample(sched, thread) &&
-   timehist_skip_sample(sched, migrated)) {
+   if (timehist_skip_sample(sched, thread, evsel, sample) &&
+   timehist_skip_sample(sched, migrated, evsel, sample)) {
return;
}
 
@@ -2373,7 +2384,7 @@ static int timehist_sched_change_event(struct perf_tool 
*tool,
goto out;
}
 
-   if (timehist_skip_sample(sched, thread))
+   if (timehist_skip_sample(sched, thread, evsel, sample))
goto out;
 
tr = thread__get_runtime(thread);
-- 
2.10.1