Skip to content

Commit

Permalink
perf tools: Fix perf_evsel::exclude_GH handling
Browse files Browse the repository at this point in the history
Let the perf_evsel::exclude_GH only prevent the reset of exclude_host
and exclude_guest attributes in case they were already set.

We cannot reset their values to 0, because they might have other
defaults set by event_attr_init.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1359971803-2343-2-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Feb 6, 2013
1 parent b22e793 commit 89bb67f
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions tools/perf/util/parse-events.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,14 +699,6 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
int exclude = eu | ek | eh;
int exclude_GH = evsel ? evsel->exclude_GH : 0;

/*
* We are here for group and 'GH' was not set as event
* modifier and whatever event/group modifier override
* default 'GH' setup.
*/
if (evsel && !exclude_GH)
eH = eG = 0;

memset(mod, 0, sizeof(*mod));

while (*str) {
Expand Down

0 comments on commit 89bb67f

Please sign in to comment.