[dpdk-dev] [PATCH v5 13/15] examples/rxtx_callbacks: switch timestamp to dynamic field

[Thomas Monjalon]

The mbuf timestamp is moved to a dynamic field
in order to allow removal of the deprecated static field.

Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
 examples/rxtx_callbacks/main.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/examples/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c
index 1a8e7d47d9..b1869a5ce8 100644
--- a/examples/rxtx_callbacks/main.c
+++ b/examples/rxtx_callbacks/main.c
@@ -19,6 +19,15 @@
 #define MBUF_CACHE_SIZE 250
 #define BURST_SIZE 32
 
+static int hwts_dynfield_offset = -1;
+
+static inline rte_mbuf_timestamp_t *
+hwts_field(struct rte_mbuf *mbuf)
+{
+       return RTE_MBUF_DYNFIELD(mbuf,
+                       hwts_dynfield_offset, rte_mbuf_timestamp_t *);
+}
+
 typedef uint64_t tsc_t;
 static int tsc_dynfield_offset = -1;
 
@@ -77,7 +86,7 @@ calc_latency(uint16_t port, uint16_t qidx __rte_unused,
        for (i = 0; i < nb_pkts; i++) {
                cycles += now - *tsc_field(pkts[i]);
                if (hw_timestamping)
-                       queue_ticks += ticks - pkts[i]->timestamp;
+                       queue_ticks += ticks - *hwts_field(pkts[i]);
        }
 
        latency_numbers.total_cycles += cycles;
@@ -141,6 +150,12 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)
                        return -1;
                }
                port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
+               hwts_dynfield_offset = rte_mbuf_dynfield_lookup(
+                               RTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL);
+               if (hwts_dynfield_offset < 0) {
+                       printf("ERROR: Failed to lookup timestamp field\n");
+                       return -rte_errno;
+               }
        }
 
        retval = rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf);
-- 
2.28.0