Skip to contentSkip to conversation

tools lib traceevent: Introduce trace_seq_do_fprintf function

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

lore
Share & tools
lore
#0 lore raw
Commit-ID:  402bb4e6ec6507ccbb2e556d7996bbc989db7f27
Gitweb:     http://git.kernel.org/tip/402bb4e6ec6507ccbb2e556d7996bbc989db7f27
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 3 Feb 2015 12:44:09 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 6 Feb 2015 11:46:37 +0100

tools lib traceevent: Introduce trace_seq_do_fprintf function

So that we can specify a FILE object where to direct the formatted output.

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]>
Cc Steven Rostedt <[email protected]>
---
 tools/lib/traceevent/event-parse.h |  2 ++
 tools/lib/traceevent/trace-seq.c   | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
tools/lib/traceevent/event-parse.h +2 -0
index 7a3873f..5b4efc0 100644
@@ -22,6 +22,7 @@
 
 #include <stdbool.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <regex.h>
 #include <string.h>
 
@@ -91,6 +92,7 @@ extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
 
 extern void trace_seq_terminate(struct trace_seq *s);
 
+extern int trace_seq_do_fprintf(struct trace_seq *s, FILE *fp);
 extern int trace_seq_do_printf(struct trace_seq *s);
 
 
tools/lib/traceevent/trace-seq.c +9 -4
index ec3bd16..292dc9f 100644
@@ -231,19 +231,24 @@ void trace_seq_terminate(struct trace_seq *s)
 	s->buffer[s->len] = 0;
 }
 
-int trace_seq_do_printf(struct trace_seq *s)
+int trace_seq_do_fprintf(struct trace_seq *s, FILE *fp)
 {
 	TRACE_SEQ_CHECK(s);
 
 	switch (s->state) {
 	case TRACE_SEQ__GOOD:
-		return printf("%.*s", s->len, s->buffer);
+		return fprintf(fp, "%.*s", s->len, s->buffer);
 	case TRACE_SEQ__BUFFER_POISONED:
-		puts("Usage of trace_seq after it was destroyed");
+		fprintf(fp, "%s\n", "Usage of trace_seq after it was destroyed");
 		break;
 	case TRACE_SEQ__MEM_ALLOC_FAILED:
-		puts("Can't allocate trace_seq buffer memory");
+		fprintf(fp, "%s\n", "Can't allocate trace_seq buffer memory");
 		break;
 	}
 	return -1;
 }
+
+int trace_seq_do_printf(struct trace_seq *s)
+{
+	return trace_seq_do_fprintf(s, stdout);
+}