diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-22 16:52:47 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-02-23 09:39:38 -0500 |
| commit | 280836812f5f821d26393268010f211160874810 (patch) | |
| tree | 97b9123cb6fa346fbd8fb32e129a6b058fcc7a08 /tools | |
| parent | 9fa8727aa4d98d35ca50ef9cd8a50c6468af921d (diff) | |
perf ordered_events: Stop using tool->ordered_events
To figure out if ordered_events are being used when doing a flush
operation, it is enough to check if there were in fact some events
queued, i.e. look at oe->nr_events.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-1c5r404vy766kt5nflv88uag@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/ordered-events.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c index fd4be94125fb..077ddd25189f 100644 --- a/tools/perf/util/ordered-events.c +++ b/tools/perf/util/ordered-events.c | |||
| @@ -166,7 +166,7 @@ static int __ordered_events__flush(struct perf_session *s, | |||
| 166 | struct ui_progress prog; | 166 | struct ui_progress prog; |
| 167 | int ret; | 167 | int ret; |
| 168 | 168 | ||
| 169 | if (!tool->ordered_events || !limit) | 169 | if (!limit) |
| 170 | return 0; | 170 | return 0; |
| 171 | 171 | ||
| 172 | if (show_progress) | 172 | if (show_progress) |
| @@ -216,6 +216,9 @@ int ordered_events__flush(struct perf_session *s, struct perf_tool *tool, | |||
| 216 | }; | 216 | }; |
| 217 | int err; | 217 | int err; |
| 218 | 218 | ||
| 219 | if (oe->nr_events == 0) | ||
| 220 | return 0; | ||
| 221 | |||
| 219 | switch (how) { | 222 | switch (how) { |
| 220 | case OE_FLUSH__FINAL: | 223 | case OE_FLUSH__FINAL: |
| 221 | oe->next_flush = ULLONG_MAX; | 224 | oe->next_flush = ULLONG_MAX; |