linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, Franck Bui-Huu <fbuihuu@gmail.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 25/29] perf record: auto detect when stdout is a pipe
Date: Tue, 25 Jan 2011 15:21:48 -0200	[thread overview]
Message-ID: <1295976112-2796-26-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1295976112-2796-1-git-send-email-acme@infradead.org>

From: Franck Bui-Huu <fbuihuu@gmail.com>

This patch gives the ability to 'perf record' to detect when its stdout
has been redirected to a pipe. There's now no more need to add '-o -'
switch in this case.

However '-o <path>' option has always precedence, that is if specified
and stdout has been connected via a pipe then the output will go into
the specified output.

LKML-Reference: <m3ipxo966i.fsf@gmail.com>
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-record.c |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 45a3689..1346d42 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -48,7 +48,7 @@ static unsigned int		user_freq 			= UINT_MAX;
 static int			freq				=   1000;
 static int			output;
 static int			pipe_output			=      0;
-static const char		*output_name			= "perf.data";
+static const char		*output_name			= NULL;
 static int			group				=      0;
 static int			realtime_prio			=      0;
 static bool			nodelay				=  false;
@@ -497,18 +497,26 @@ static int __cmd_record(int argc, const char **argv)
 		exit(-1);
 	}
 
-	if (!strcmp(output_name, "-"))
-		pipe_output = 1;
-	else if (!stat(output_name, &st) && st.st_size) {
-		if (write_mode == WRITE_FORCE) {
-			char oldname[PATH_MAX];
-			snprintf(oldname, sizeof(oldname), "%s.old",
-				 output_name);
-			unlink(oldname);
-			rename(output_name, oldname);
+	if (!output_name) {
+		if (!fstat(STDOUT_FILENO, &st) && S_ISFIFO(st.st_mode))
+			pipe_output = 1;
+		else
+			output_name = "perf.data";
+	}
+	if (output_name) {
+		if (!strcmp(output_name, "-"))
+			pipe_output = 1;
+		else if (!stat(output_name, &st) && st.st_size) {
+			if (write_mode == WRITE_FORCE) {
+				char oldname[PATH_MAX];
+				snprintf(oldname, sizeof(oldname), "%s.old",
+					 output_name);
+				unlink(oldname);
+				rename(output_name, oldname);
+			}
+		} else if (write_mode == WRITE_APPEND) {
+			write_mode = WRITE_FORCE;
 		}
-	} else if (write_mode == WRITE_APPEND) {
-		write_mode = WRITE_FORCE;
 	}
 
 	flags = O_CREAT|O_RDWR;
-- 
1.6.2.5


  parent reply	other threads:[~2011-01-25 17:27 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-25 17:21 [GIT PULL 00/29] perf/core improvements for 2.6.39 Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 01/29] perf evsel: Introduce perf_evlist Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 02/29] perf evlist: Adopt the pollfd array Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 03/29] perf evsel: Support event groups Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 04/29] perf evsel: Allow specifying if the inherit bit should be set Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 05/29] perf top: Use perf_evsel__open Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 06/29] perf record: " Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 07/29] perf evsel: Introduce mmap support Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 08/29] perf record: Use struct perf_mmap and helpers Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 09/29] perf record: Move perf_mmap__write_tail to perf.h Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 10/29] perf evlist: Move the mmap array from perf_evsel Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 11/29] perf record: Use perf_evlist__mmap Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 12/29] perf tools: Add missing cpu_map__delete() Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 13/29] perf test: Check counts on all cpus in test__open_syscall_event_on_all_cpus Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 14/29] perf test: check if cpu_map__new() return NULL Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 15/29] perf evlist: Steal mmap reading routine from 'perf top' Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 16/29] perf test: Add test for the evlist mmap routines Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 17/29] perf callchain: Feed callchains into a cursor Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 18/29] perf callchain: Rename cumul_hits into callchain_cumul_hits Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 19/29] perf callchain: Rename register_callchain_param into callchain_register_param Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 20/29] perf callchain: Don't give arbitrary gender to callchain tree nodes Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 21/29] perf top: Add native_safe_halt to skip symbols Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 22/29] perf probe: Introduce lines walker interface Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 23/29] perf probe: Enable to put probe inline function call site Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 24/29] perf probe: Add --funcs to show available functions in symtab Arnaldo Carvalho de Melo
2011-01-25 17:21 ` Arnaldo Carvalho de Melo [this message]
2011-01-25 17:21 ` [PATCH 26/29] perf tools: Pass the struct opt to the wildcard parsing routine Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 27/29] perf threads: Move thread_map to separate file Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 28/29] perf tools: Move event__parse_sample to evsel.c Arnaldo Carvalho de Melo
2011-01-25 17:21 ` [PATCH 29/29] perf evsel: Introduce perf_evsel__{in,ex}it Arnaldo Carvalho de Melo
2011-01-26  6:52 ` [GIT PULL 00/29] perf/core improvements for 2.6.39 Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295976112-2796-26-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=fbuihuu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).