Skip to contentSkip to conversation

perf ordered_events: Stop using tool-> ordered_events

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 26, 2015 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  280836812f5f821d26393268010f211160874810
Gitweb:     http://git.kernel.org/tip/280836812f5f821d26393268010f211160874810
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Sun, 22 Feb 2015 13:52:47 -0800
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 23 Feb 2015 11:39:38 -0300

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 <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/ordered-events.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/ordered-events.c +4 -1
index fd4be94..077ddd2 100644
@@ -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;