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 <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>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/n/tip-a49bhdrx8851f04hppn8bqxq@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent dc6254cf
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include <regex.h> #include <regex.h>
#include <string.h> #include <string.h>
...@@ -91,6 +92,7 @@ extern int trace_seq_putc(struct trace_seq *s, unsigned char c); ...@@ -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 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); extern int trace_seq_do_printf(struct trace_seq *s);
......
...@@ -231,19 +231,24 @@ void trace_seq_terminate(struct trace_seq *s) ...@@ -231,19 +231,24 @@ void trace_seq_terminate(struct trace_seq *s)
s->buffer[s->len] = 0; 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); TRACE_SEQ_CHECK(s);
switch (s->state) { switch (s->state) {
case TRACE_SEQ__GOOD: case TRACE_SEQ__GOOD:
return printf("%.*s", s->len, s->buffer); return fprintf(fp, "%.*s", s->len, s->buffer);
case TRACE_SEQ__BUFFER_POISONED: 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; break;
case TRACE_SEQ__MEM_ALLOC_FAILED: 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; break;
} }
return -1; return -1;
} }
int trace_seq_do_printf(struct trace_seq *s)
{
return trace_seq_do_fprintf(s, stdout);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment