Commit 28083681 authored Feb 22, 2015 by Arnaldo Carvalho de Melo

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>

parent 9fa8727a

tools/perf/util/ordered-events.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ static int __ordered_events__flush(struct perf_session *s,
		struct ui_progress prog;
		int ret;

		if (!tool->ordered_events \|\| !limit)
		if (!limit)
		return 0;

		if (show_progress)
		@@ -216,6 +216,9 @@ int ordered_events__flush(struct perf_session s, struct perf_tool tool,
		};
		int err;

		if (oe->nr_events == 0)
		return 0;

		switch (how) {
		case OE_FLUSH__FINAL:
		oe->next_flush = ULLONG_MAX;