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 374D6A04EF;
Wed, 3 Jun 2020 01:05:02 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3EAF51C0D9;
Wed, 3 Jun 2020 01:04:00 +0200 (CEST)
Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com
[209.85.208.195]) by dpdk.org (Postfix) with ESMTP id 444F51C0D8
for <dev@dpdk.org>; Wed, 3 Jun 2020 01:03:59 +0200 (CEST)
Received: by mail-lj1-f195.google.com with SMTP id b6so346589ljj.1
for <dev@dpdk.org>; Tue, 02 Jun 2020 16:03:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=dVcxVkYcX4IdEsRf5bHPXaga+vGMrVzMkh75QGfZRIc=;
b=f+64AO6PEOFKB458Y182LdeZs+ZH0rT4EpWGk0Oh5UPMs/+9PjKrLi0dnMZEl4GKgQ
svlmlNKogn1K569RDHC0ZCTa3JQWSNgON+LSRE0+D+Y7CH/CnrFRE9Z7oVV6/baefvZ0
7gnV9eQdAkd8QWsUYnkUOj7zabZstZEurt8E9q+Xk6I5WXd7C1b7IHAVR5e19pqKbh3W
iHhcXcm3DWLirvPhkFkk5NUeillwQjEauaYBiFvLfDKe5Ft6IpEG4GPpNrotmG3tdWOR
9Zc7u3JyxYdCS3zpsSHHQERteF472zH1xfSZ6L4zoArUtGu1jJLGUMG9u82Be3Kh2HYe
s/JQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=dVcxVkYcX4IdEsRf5bHPXaga+vGMrVzMkh75QGfZRIc=;
b=GK5DnqvaFQwEpOyjn00LW0oBDc5EVPpsrg1zdCmDTy1PtdJjzp334CWxrVaSizsliH
aP0HLbR4nDCREa5HuUCM07DfZsQBC8jwnIDByuuGnoXCBe/6lztVWyqAYU4w9XvvzSG6
ODOmnf/obdDzQccOBxFq01H+eCqcV0sLrXrjYgq0WfY9kHh2L9kLgL1nBTwlLVk95lXf
TdxSRQ39UYdUaCavmprghOIBN4lbTQRAB+gDp+m9CyLsXzlALHbU6UAnX4ELARkeCT0w
oIluqsMjA5lAfO1oyziMCkKxezUCRwXn6dtXXkVijfypCWNt1PdZkAwpEQgKoUxaYDX3
xJaw==
X-Gm-Message-State: AOAM532FkblPwxRkHXo+ETjFL52YymnupMtBzgicCIB46IVyH9d8MuWa
kQDL4qVz9BvjGq6xEW9L0bS+NsEcXIAqCQ==
X-Google-Smtp-Source: ABdhPJz6OILR+G/EbgA9LCYv7I+eebRE8TYFh6AXRiiBkpWNXY0MnaIG6C0V/eZOaYAZNDavIjd4RA==
X-Received: by 2002:a05:651c:30e:: with SMTP id
a14mr632605ljp.311.1591139036483;
Tue, 02 Jun 2020 16:03:56 -0700 (PDT)
Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru.
[37.110.65.23])
by smtp.gmail.com with ESMTPSA id s18sm67471ljj.63.2020.06.02.16.03.54
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 02 Jun 2020 16:03:54 -0700 (PDT)
From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: dev@dpdk.org
Cc: Dmitry Malloy <dmitrym@microsoft.com>,
Narcisa Ana Maria Vasile <Narcisa.Vasile@microsoft.com>,
Fady Bader <fady@mellanox.com>, Tal Shnaiderman <talshn@mellanox.com>,
Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
Jerin Jacob <jerinj@marvell.com>, Sunil Kumar Kori <skori@marvell.com>,
Olivier Matz <olivier.matz@6wind.com>,
Andrew Rybchenko <arybchenko@solarflare.com>
Date: Wed, 3 Jun 2020 02:03:24 +0300
Message-Id: <20200602230329.17838-7-dmitry.kozliuk@gmail.com>
X-Mailer: git-send-email 2.25.4
In-Reply-To: <20200602230329.17838-1-dmitry.kozliuk@gmail.com>
References: <20200525003720.6410-1-dmitry.kozliuk@gmail.com>
<20200602230329.17838-1-dmitry.kozliuk@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v6 06/11] trace: add size_t field emitter
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>
It is not guaranteed that sizeof(long) == sizeof(size_t). On Windows,
sizeof(long) == 4 and sizeof(size_t) == 8 for 64-bit programs.
Tracepoints using "long" field emitter are therefore invalid there.
Add dedicated field emitter for size_t and use it to store size_t values
in all existing tracepoints.
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
lib/librte_eal/include/rte_eal_trace.h | 8 ++++----
lib/librte_eal/include/rte_trace_point.h | 3 +++
lib/librte_mempool/rte_mempool_trace.h | 10 +++++-----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/lib/librte_eal/include/rte_eal_trace.h b/lib/librte_eal/include/rte_eal_trace.h
index 1ebb2905a..bcfef0cfa 100644
--- a/lib/librte_eal/include/rte_eal_trace.h
+++ b/lib/librte_eal/include/rte_eal_trace.h
@@ -143,7 +143,7 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
int socket, void *ptr),
rte_trace_point_emit_string(type);
- rte_trace_point_emit_long(size);
+ rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
rte_trace_point_emit_int(socket);
rte_trace_point_emit_ptr(ptr);
@@ -154,7 +154,7 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
int socket, void *ptr),
rte_trace_point_emit_string(type);
- rte_trace_point_emit_long(size);
+ rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
rte_trace_point_emit_int(socket);
rte_trace_point_emit_ptr(ptr);
@@ -164,7 +164,7 @@ RTE_TRACE_POINT(
rte_eal_trace_mem_realloc,
RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,
void *ptr),
- rte_trace_point_emit_long(size);
+ rte_trace_point_emit_size_t(size);
rte_trace_point_emit_u32(align);
rte_trace_point_emit_int(socket);
rte_trace_point_emit_ptr(ptr);
@@ -183,7 +183,7 @@ RTE_TRACE_POINT(
unsigned int flags, unsigned int align, unsigned int bound,
const void *mz),
rte_trace_point_emit_string(name);
- rte_trace_point_emit_long(len);
+ rte_trace_point_emit_size_t(len);
rte_trace_point_emit_int(socket_id);
rte_trace_point_emit_u32(flags);
rte_trace_point_emit_u32(align);
diff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h
index b45171275..377c2414a 100644
--- a/lib/librte_eal/include/rte_trace_point.h
+++ b/lib/librte_eal/include/rte_trace_point.h
@@ -138,6 +138,8 @@ _tp _args \
#define rte_trace_point_emit_int(val)
/** Tracepoint function payload for long datatype */
#define rte_trace_point_emit_long(val)
+/** Tracepoint function payload for size_t datatype */
+#define rte_trace_point_emit_size_t(val)
/** Tracepoint function payload for float datatype */
#define rte_trace_point_emit_float(val)
/** Tracepoint function payload for double datatype */
@@ -395,6 +397,7 @@ do { \
#define rte_trace_point_emit_i8(in) __rte_trace_point_emit(in, int8_t)
#define rte_trace_point_emit_int(in) __rte_trace_point_emit(in, int32_t)
#define rte_trace_point_emit_long(in) __rte_trace_point_emit(in, long)
+#define rte_trace_point_emit_size_t(in) __rte_trace_point_emit(in, size_t)
#define rte_trace_point_emit_float(in) __rte_trace_point_emit(in, float)
#define rte_trace_point_emit_double(in) __rte_trace_point_emit(in, double)
#define rte_trace_point_emit_ptr(in) __rte_trace_point_emit(in, uintptr_t)
diff --git a/lib/librte_mempool/rte_mempool_trace.h b/lib/librte_mempool/rte_mempool_trace.h
index e776df0a6..087c913c8 100644
--- a/lib/librte_mempool/rte_mempool_trace.h
+++ b/lib/librte_mempool/rte_mempool_trace.h
@@ -72,7 +72,7 @@ RTE_TRACE_POINT(
rte_trace_point_emit_string(mempool->name);
rte_trace_point_emit_ptr(vaddr);
rte_trace_point_emit_u64(iova);
- rte_trace_point_emit_long(len);
+ rte_trace_point_emit_size_t(len);
rte_trace_point_emit_ptr(free_cb);
rte_trace_point_emit_ptr(opaque);
)
@@ -84,8 +84,8 @@ RTE_TRACE_POINT(
rte_trace_point_emit_ptr(mempool);
rte_trace_point_emit_string(mempool->name);
rte_trace_point_emit_ptr(addr);
- rte_trace_point_emit_long(len);
- rte_trace_point_emit_long(pg_sz);
+ rte_trace_point_emit_size_t(len);
+ rte_trace_point_emit_size_t(pg_sz);
rte_trace_point_emit_ptr(free_cb);
rte_trace_point_emit_ptr(opaque);
)
@@ -126,7 +126,7 @@ RTE_TRACE_POINT(
RTE_TRACE_POINT_ARGS(struct rte_mempool *mempool, size_t pg_sz),
rte_trace_point_emit_ptr(mempool);
rte_trace_point_emit_string(mempool->name);
- rte_trace_point_emit_long(pg_sz);
+ rte_trace_point_emit_size_t(pg_sz);
)
RTE_TRACE_POINT(
@@ -139,7 +139,7 @@ RTE_TRACE_POINT(
rte_trace_point_emit_u32(max_objs);
rte_trace_point_emit_ptr(vaddr);
rte_trace_point_emit_u64(iova);
- rte_trace_point_emit_long(len);
+ rte_trace_point_emit_size_t(len);
rte_trace_point_emit_ptr(obj_cb);
rte_trace_point_emit_ptr(obj_cb_arg);
)
--
2.25.4