diff --git a/src/plugins/input/dpdk/src/dpdk-ring.hpp b/src/plugins/input/dpdk/src/dpdk-ring.hpp index f1254792..596e9768 100644 --- a/src/plugins/input/dpdk/src/dpdk-ring.hpp +++ b/src/plugins/input/dpdk/src/dpdk-ring.hpp @@ -133,16 +133,16 @@ class DpdkRingReader : public InputPlugin { int dynfield_byte_index; }; - struct NfbTimestamp { + struct [[gnu::packed]] NfbTimestamp { uint32_t timestamp_ns; uint32_t timestamp_s; - } __rte_packed; + }; - struct NfbMetadata { + struct [[gnu::packed]] NfbMetadata { NfbTimestamp timestamp; uint16_t matched; uint32_t hash; - } __rte_packed; + }; telemetry::Content get_queue_telemetry(); void getDynfieldInfo(); diff --git a/src/plugins/input/dpdk/src/dpdkPortTelemetry.cpp b/src/plugins/input/dpdk/src/dpdkPortTelemetry.cpp index ea7ee01c..3de0d0a3 100644 --- a/src/plugins/input/dpdk/src/dpdkPortTelemetry.cpp +++ b/src/plugins/input/dpdk/src/dpdkPortTelemetry.cpp @@ -205,6 +205,7 @@ static telemetry::Dict getDeviceStatsByPortId(uint16_t portId) return statsDict; } +#if RTE_VERSION < RTE_VERSION_NUM(25, 0, 0, 0) static telemetry::Dict getDeviceQueueStatsByPortId(uint16_t portId) { struct rte_eth_stats stats; @@ -242,6 +243,7 @@ static telemetry::Dict getDeviceQueueStatsByPortId(uint16_t portId) return dict; } +#endif static telemetry::Dict getDeviceXStatsByPortId(uint16_t portId) { @@ -306,12 +308,14 @@ static std::vector getAppFsFiles(uint16_t portId) .read = [portId]() { return getDeviceStatsByPortId(portId); }, }, }, +#if RTE_VERSION < RTE_VERSION_NUM(25, 0, 0, 0) { .name = "devstats_queues", .ops = { .read = [portId]() { return getDeviceQueueStatsByPortId(portId); }, }, }, +#endif { .name = "devxstats", .ops = {