Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755838AbcDNNga (ORCPT ); Thu, 14 Apr 2016 09:36:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55634 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755578AbcDNNg0 (ORCPT ); Thu, 14 Apr 2016 09:36:26 -0400 Date: Thu, 14 Apr 2016 06:36:10 -0700 From: tip-bot for Wang Nan Message-ID: Cc: hekuang@huawei.com, acme@redhat.com, tglx@linutronix.de, wangnan0@huawei.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, mhiramat@kernel.org, lizefan@huawei.com Reply-To: lizefan@huawei.com, mhiramat@kernel.org, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, tglx@linutronix.de, hekuang@huawei.com, acme@redhat.com In-Reply-To: <1460535673-159866-3-git-send-email-wangnan0@huawei.com> References: <1460535673-159866-3-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf data: Add perf_data_file__switch() helper Git-Commit-ID: 040f9915e99e604688c2880e0b1e5b59dbfefa54 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 Content-Length: 3026 Lines: 96 Commit-ID: 040f9915e99e604688c2880e0b1e5b59dbfefa54 Gitweb: http://git.kernel.org/tip/040f9915e99e604688c2880e0b1e5b59dbfefa54 Author: Wang Nan AuthorDate: Wed, 13 Apr 2016 08:21:05 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 14 Apr 2016 08:57:54 -0300 perf data: Add perf_data_file__switch() helper perf_data_file__switch() closes current output file, renames it, then open a new one to continue recording. It will be used by 'perf record' to split output into multiple perf.data files. Signed-off-by: Wang Nan Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1460535673-159866-3-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/data.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/data.h | 11 ++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index 1921942..be835161 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -136,3 +136,44 @@ ssize_t perf_data_file__write(struct perf_data_file *file, { return writen(file->fd, buf, size); } + +int perf_data_file__switch(struct perf_data_file *file, + const char *postfix, + size_t pos, bool at_exit) +{ + char *new_filepath; + int ret; + + if (check_pipe(file)) + return -EINVAL; + if (perf_data_file__is_read(file)) + return -EINVAL; + + if (asprintf(&new_filepath, "%s.%s", file->path, postfix) < 0) + return -ENOMEM; + + /* + * Only fire a warning, don't return error, continue fill + * original file. + */ + if (rename(file->path, new_filepath)) + pr_warning("Failed to rename %s to %s\n", file->path, new_filepath); + + if (!at_exit) { + close(file->fd); + ret = perf_data_file__open(file); + if (ret < 0) + goto out; + + if (lseek(file->fd, pos, SEEK_SET) == (off_t)-1) { + ret = -errno; + pr_debug("Failed to lseek to %zu: %s", + pos, strerror(errno)); + goto out; + } + } + ret = file->fd; +out: + free(new_filepath); + return ret; +} diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h index 2b15d0c..ae510ce 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -46,5 +46,14 @@ int perf_data_file__open(struct perf_data_file *file); void perf_data_file__close(struct perf_data_file *file); ssize_t perf_data_file__write(struct perf_data_file *file, void *buf, size_t size); - +/* + * If at_exit is set, only rename current perf.data to + * perf.data., continue write on original file. + * Set at_exit when flushing the last output. + * + * Return value is fd of new output. + */ +int perf_data_file__switch(struct perf_data_file *file, + const char *postfix, + size_t pos, bool at_exit); #endif /* __PERF_DATA_H */