From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id EF5E3A0562;
Fri, 3 Apr 2020 17:39:08 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 2F0A51C1C4;
Fri, 3 Apr 2020 17:37:35 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 4901B1C1C4
for <dev@dpdk.org>; Fri, 3 Apr 2020 17:37:34 +0200 (CEST)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
033FaPHr029227; Fri, 3 Apr 2020 08:37:33 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0818;
bh=MR5rY+KVxdgm7gNRKXaHfWSSpB14QqT2rHD/8dtUbC0=;
b=k1dd84tBqXM+/OoDGzwGzH2Pn9NAtDNDOm5HHOzqe9VH5o69yb48FKr8eIr6jfa03RZ6
ZFhh/lXa2+U4fO+8abTH3V5cChnUPhe99yDTVZo4Gt1IvNdzp+WFKcFFutDBeXwv1kPi
leGoJ8rrNKtM/AlA30/mcj0zcvQejMgQZE7fRqzLQTdEIurEiTJ2rZgOtWMAW1+wpms/
onUwWbwr2kTHsp2tMuyKVmwtWSUAnJtMSKolILU+suOPdKCT/Xz4o4Sbiv/5Eb0ltUFJ
WrM+BqY1L7Njyq2EGB3mFzn73ZXv81+iflGS35qyuM79YMRdNNAkPOmaiZaAmhWpwBFr 8w==
Received: from sc-exch02.marvell.com ([199.233.58.182])
by mx0a-0016f401.pphosted.com with ESMTP id 304855y7e3-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Fri, 03 Apr 2020 08:37:33 -0700
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com
(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Fri, 3 Apr 2020 08:37:32 -0700
Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2;
Fri, 3 Apr 2020 08:37:31 -0700
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com
(10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Fri, 3 Apr 2020 08:37:31 -0700
Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])
by maili.marvell.com (Postfix) with ESMTP id 5662A3F703F;
Fri, 3 Apr 2020 08:37:29 -0700 (PDT)
From: <jerinj@marvell.com>
To: Jerin Jacob <jerinj@marvell.com>, Sunil Kumar Kori <skori@marvell.com>
CC: <dev@dpdk.org>, <thomas@monjalon.net>, <bruce.richardson@intel.com>,
<david.marchand@redhat.com>, <mattias.ronnblom@ericsson.com>
Date: Fri, 3 Apr 2020 21:06:45 +0530
Message-ID: <20200403153709.3703448-10-jerinj@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200403153709.3703448-1-jerinj@marvell.com>
References: <20200329144342.1543749-1-jerinj@marvell.com>
<20200403153709.3703448-1-jerinj@marvell.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676
definitions=2020-04-03_11:2020-04-03,
2020-04-03 signatures=0
Subject: [dpdk-dev] [PATCH v4 09/33] eal/trace: handle CTF keyword collision
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Sunil Kumar Kori <skori@marvell.com>
Some of the keyword like align, event, "." and "->" etc will be
used in CTF metadata syntax. This patch support for handling
those keywords with DPDK events name.
Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
---
lib/librte_eal/common/eal_common_trace_ctf.c | 119 +++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/librte_eal/common/eal_common_trace_ctf.c
index 5ad44cc8d..c4f00bf22 100644
--- a/lib/librte_eal/common/eal_common_trace_ctf.c
+++ b/lib/librte_eal/common/eal_common_trace_ctf.c
@@ -215,12 +215,131 @@ meta_stream_emit(char **meta, int *offset)
return meta_copy(meta, offset, str, rc);
}
+static void
+string_fixed_replace(char *input, const char *search, const char *replace)
+{
+ char *found;
+ size_t len;
+
+ found = strstr(input, search);
+ if (found == NULL)
+ return;
+
+ if (strlen(found) != strlen(search))
+ return;
+
+ len = strlen(replace);
+ memcpy(found, replace, len);
+ found[len] = '\0';
+}
+
+static void
+ctf_fixup_align(char *str)
+{
+ string_fixed_replace(str, "align", "_align");
+}
+
+static void
+ctf_fixup_arrow_deref(char *str)
+{
+ const char *replace = "_";
+ const char *search = "->";
+ char *found;
+ size_t len;
+
+ found = strstr(str, search);
+ if (found == NULL)
+ return;
+
+ do {
+ memcpy(found, replace, strlen(replace));
+ len = strlen(found + 2);
+ memcpy(found + 1, found + 2, len);
+ found[len + 1] = '\0';
+ found = strstr(str, search);
+ } while (found != NULL);
+}
+
+static void
+ctf_fixup_dot_deref(char *str)
+{
+ const char *replace = "_";
+ const char *search = ".";
+ char *found;
+ size_t len;
+
+ found = strstr(str, search);
+ if (found == NULL)
+ return;
+
+ len = strlen(replace);
+ do {
+ memcpy(found, replace, len);
+ found = strstr(str, search);
+ } while (found != NULL);
+}
+
+static void
+ctf_fixup_event(char *str)
+{
+ string_fixed_replace(str, "event", "_event");
+}
+
+static int
+ctf_fixup_keyword(char *str)
+{
+ char dup_str[TRACE_CTF_FIELD_SIZE];
+ char input[TRACE_CTF_FIELD_SIZE];
+ const char *delim = ";";
+ char *from;
+ int len;
+
+ if (str == NULL)
+ return 0;
+
+ len = strlen(str);
+ if (len >= TRACE_CTF_FIELD_SIZE) {
+ trace_err("ctf_field reached its maximum limit");
+ return -EMSGSIZE;
+ }
+
+ /* Create duplicate string */
+ strcpy(dup_str, str);
+
+ len = 0;
+ from = strtok(dup_str, delim);
+ while (from != NULL) {
+ strcpy(input, from);
+ ctf_fixup_align(input);
+ ctf_fixup_dot_deref(input);
+ ctf_fixup_arrow_deref(input);
+ ctf_fixup_event(input);
+
+ strcpy(&input[strlen(input)], delim);
+ if ((len + strlen(input)) >= TRACE_CTF_FIELD_SIZE) {
+ trace_err("ctf_field reached its maximum limit");
+ return -EMSGSIZE;
+ }
+
+ strcpy(str + len, input);
+ len += strlen(input);
+ from = strtok(NULL, delim);
+ }
+
+ return 0;
+}
+
static int
meta_event_emit(char **meta, int *offset, struct trace_point *tp)
{
char *str = NULL;
int rc;
+ /* Fixup ctf field string in case it using reserved ctf keywords */
+ rc = ctf_fixup_keyword(tp->ctf_field);
+ if (rc)
+ return rc;
+
rc = metadata_printf(&str,
"event {\n"
" id = %d;\n"
--
2.25.1