From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754725AbcBEOLU (ORCPT ); Fri, 5 Feb 2016 09:11:20 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:11466 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754269AbcBEOFG (ORCPT ); Fri, 5 Feb 2016 09:05:06 -0500 From: Wang Nan To: Alexei Starovoitov , Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo , Brendan Gregg CC: Adrian Hunter , Cody P Schafer , "David S. Miller" , He Kuang , =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= , Jiri Olsa , Kirill Smelkov , Li Zefan , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , , Wang Nan , Subject: [PATCH 53/54] perf record: Allow generate tracking events at the end of output Date: Fri, 5 Feb 2016 14:02:18 +0000 Message-ID: <1454680939-24963-54-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1454680939-24963-1-git-send-email-wangnan0@huawei.com> References: <1454680939-24963-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56B4ABC7.0039,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 209b194add088a625dfca3132b0a803f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before this patch tracking events are generated based on information in /proc before all samples. However, with the introducing of overwrite evsel in perf record, it becomes inconvenience: 'perf record' now can executed as a daemon for sereval hours and only capture the last snapshot when it receives SIGUSR2. The tracking events generated at the head of output 'perf.data' becomes too old, but most of tracking events during 'perf record' running are dropped. This patch generates tracking events at the end of output. The output events series would better reflecting status of system when SIGUSR2 received. Signed-off-by: Wang Nan Signed-off-by: He Kuang Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/builtin-record.c | 62 +++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f9ce659..8221512 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -63,6 +63,7 @@ struct record { bool timestamp_filename; bool switch_output; enum overwrite_evt_state overwrite_evt_state; + bool tail_tracking; unsigned long long samples; }; @@ -685,6 +686,26 @@ record__finish_output(struct record *rec) static int record__synthesize(struct record *rec); +static void record__synthesize_target(struct record *rec) +{ + if (target__none(&rec->opts.target)) { + struct { + struct thread_map map; + struct thread_map_data map_data; + } thread_map; + + thread_map.map.nr = 1; + thread_map.map.map[0].pid = rec->evlist->workload.pid; + thread_map.map.map[0].comm = NULL; + perf_event__synthesize_thread_map(&rec->tool, + &thread_map.map, + process_synthesized_event, + &rec->session->machines.host, + rec->opts.sample_address, + rec->opts.proc_map_timeout); + } +} + static int record__switch_output(struct record *rec, bool at_exit) { @@ -694,6 +715,11 @@ record__switch_output(struct record *rec, bool at_exit) /* Same Size: "2015122520103046"*/ char timestamp[] = "InvalidTimestamp"; + if (rec->tail_tracking) { + record__synthesize(rec); + record__synthesize_target(rec); + } + rec->samples = 0; record__finish_output(rec); err = fetch_current_timestamp(timestamp, sizeof(timestamp)); @@ -720,23 +746,10 @@ record__switch_output(struct record *rec, bool at_exit) machines__init(&rec->session->machines); perf_session__create_kernel_maps(rec->session); perf_session__set_id_hdr_size(rec->session); - record__synthesize(rec); - if (target__none(&rec->opts.target)) { - struct { - struct thread_map map; - struct thread_map_data map_data; - } thread_map; - - thread_map.map.nr = 1; - thread_map.map.map[0].pid = rec->evlist->workload.pid; - thread_map.map.map[0].comm = NULL; - perf_event__synthesize_thread_map(&rec->tool, - &thread_map.map, - process_synthesized_event, - &rec->session->machines.host, - rec->opts.sample_address, - rec->opts.proc_map_timeout); + if (!rec->tail_tracking) { + record__synthesize(rec); + record__synthesize_target(rec); } } return fd; @@ -932,9 +945,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) machine = &session->machines.host; - err = record__synthesize(rec); - if (err < 0) - goto out_child; + if (!rec->tail_tracking) { + err = record__synthesize(rec); + if (err < 0) + goto out_child; + } if (rec->realtime_prio) { struct sched_param param; @@ -1075,6 +1090,13 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) disabled = true; } } + + if (rec->tail_tracking) { + err = record__synthesize(rec); + if (err < 0) + goto out_child; + } + auxtrace_snapshot_disable(); if (forks && workload_exec_errno) { @@ -1501,6 +1523,8 @@ struct option __record_options[] = { "append timestamp to output filename"), OPT_BOOLEAN(0, "switch-output", &record.switch_output, "Switch output when receive SIGUSR2"), + OPT_BOOLEAN(0, "tail-tracking", &record.tail_tracking, + "Generate tracking events at the end of output"), OPT_END() }; -- 1.8.3.4