From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752135AbcF2Jp2 (ORCPT ); Wed, 29 Jun 2016 05:45:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34552 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbcF2JpX (ORCPT ); Wed, 29 Jun 2016 05:45:23 -0400 Date: Wed, 29 Jun 2016 02:45:07 -0700 From: tip-bot for Wang Nan Message-ID: Cc: lizefan@huawei.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, tglx@linutronix.de, jolsa@kernel.org, mingo@kernel.org, hpa@zytor.com, acme@redhat.com Reply-To: tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, lizefan@huawei.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org In-Reply-To: <1466767332-114472-2-git-send-email-wangnan0@huawei.com> References: <1466767332-114472-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf data ctf: Add value_set_string() helper Git-Commit-ID: 069ee5c488d161f539bb897b1bc64b83f9773221 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: 069ee5c488d161f539bb897b1bc64b83f9773221 Gitweb: http://git.kernel.org/tip/069ee5c488d161f539bb897b1bc64b83f9773221 Author: Wang Nan AuthorDate: Fri, 24 Jun 2016 11:22:06 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Jun 2016 10:54:55 -0300 perf data ctf: Add value_set_string() helper There are many value_set_##x helper for integer, but only for integer. This patch adds value_set_string() helper to help following commits create string fields. Signed-off-by: Wang Nan Acked-by: Jiri Olsa Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1466767332-114472-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/data-convert-bt.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c index 7b1bc24..4b68e7b 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -141,6 +141,36 @@ FUNC_VALUE_SET(s64) FUNC_VALUE_SET(u64) __FUNC_VALUE_SET(u64_hex, u64) +static int string_set_value(struct bt_ctf_field *field, const char *string); +static __maybe_unused int +value_set_string(struct ctf_writer *cw, struct bt_ctf_event *event, + const char *name, const char *string) +{ + struct bt_ctf_field_type *type = cw->data.string; + struct bt_ctf_field *field; + int ret = 0; + + field = bt_ctf_field_create(type); + if (!field) { + pr_err("failed to create a field %s\n", name); + return -1; + } + + ret = string_set_value(field, string); + if (ret) { + pr_err("failed to set value %s\n", name); + goto err_put_field; + } + + ret = bt_ctf_event_set_payload(event, name, field); + if (ret) + pr_err("failed to set payload %s\n", name); + +err_put_field: + bt_ctf_field_put(field); + return ret; +} + static struct bt_ctf_field_type* get_tracepoint_field_type(struct ctf_writer *cw, struct format_field *field) {