From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754705AbbBRS1Z (ORCPT ); Wed, 18 Feb 2015 13:27:25 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40770 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbbBRS1V (ORCPT ); Wed, 18 Feb 2015 13:27:21 -0500 Date: Wed, 18 Feb 2015 10:26:38 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, rostedt@goodmis.org, eranian@google.com, bp@suse.de, fweisbec@gmail.com, dzickus@redhat.com, efault@gmx.de, hpa@zytor.com, mingo@kernel.org, adrian.hunter@intel.com, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, dsahern@gmail.com, jolsa@redhat.com Reply-To: fweisbec@gmail.com, bp@suse.de, eranian@google.com, dzickus@redhat.com, tglx@linutronix.de, rostedt@goodmis.org, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, peterz@infradead.org, adrian.hunter@intel.com, jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org, hpa@zytor.com, efault@gmx.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Introduce trace_seq_do_fprintf function Git-Commit-ID: 402bb4e6ec6507ccbb2e556d7996bbc989db7f27 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 402bb4e6ec6507ccbb2e556d7996bbc989db7f27 Gitweb: http://git.kernel.org/tip/402bb4e6ec6507ccbb2e556d7996bbc989db7f27 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 3 Feb 2015 12:44:09 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Steven Rostedt Link: http://lkml.kernel.org/n/tip-a49bhdrx8851f04hppn8bqxq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.h | 2 ++ tools/lib/traceevent/trace-seq.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index 7a3873f..5b4efc0 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -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); diff --git a/tools/lib/traceevent/trace-seq.c b/tools/lib/traceevent/trace-seq.c index ec3bd16..292dc9f 100644 --- a/tools/lib/traceevent/trace-seq.c +++ b/tools/lib/traceevent/trace-seq.c @@ -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); +}