From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941287AbcJXSyn (ORCPT ); Mon, 24 Oct 2016 14:54:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46426 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755412AbcJXSyi (ORCPT ); Mon, 24 Oct 2016 14:54:38 -0400 Date: Mon, 24 Oct 2016 11:54:26 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, adrian.hunter@intel.com Reply-To: jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, adrian.hunter@intel.com, dsahern@gmail.com, mingo@kernel.org, wangnan0@huawei.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Move captured info to generic header info Git-Commit-ID: f45f56151ac64aef687546d99b33df294faaa19c 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: f45f56151ac64aef687546d99b33df294faaa19c Gitweb: http://git.kernel.org/tip/f45f56151ac64aef687546d99b33df294faaa19c Author: Jiri Olsa AuthorDate: Mon, 10 Oct 2016 09:03:07 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 24 Oct 2016 11:07:33 -0300 perf report: Move captured info to generic header info It's not displayed in TUI now, putting it into generic part. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-5fk88kejqgi50ye7xdkhiloz@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 9 +++++++++ tools/perf/util/session.c | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 2f3eded..05f5627 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2250,9 +2250,18 @@ int perf_header__fprintf_info(struct perf_session *session, FILE *fp, bool full) struct header_print_data hd; struct perf_header *header = &session->header; int fd = perf_data_file__fd(session->file); + struct stat st; + int ret; + hd.fp = fp; hd.full = full; + ret = fstat(fd, &st); + if (ret == -1) + return -1; + + fprintf(fp, "# captured on: %s", ctime(&st.st_ctime)); + perf_header__process_sections(header, fd, &hd, perf_file_section__fprintf_info); return 0; diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 5d61242..f268201 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2025,20 +2025,10 @@ out_delete_map: void perf_session__fprintf_info(struct perf_session *session, FILE *fp, bool full) { - struct stat st; - int fd, ret; - if (session == NULL || fp == NULL) return; - fd = perf_data_file__fd(session->file); - - ret = fstat(fd, &st); - if (ret == -1) - return; - fprintf(fp, "# ========\n"); - fprintf(fp, "# captured on: %s", ctime(&st.st_ctime)); perf_header__fprintf_info(session, fp, full); fprintf(fp, "# ========\n#\n"); }