event/sw: fix xstats reset value

[dpdk.git] / drivers / event / sw / sw_evdev_xstats.c

diff --git a/drivers/event/sw/sw_evdev_xstats.c b/drivers/event/sw/sw_evdev_xstats.c
index 9bbee7d..9066490 100644 (file)
--- a/drivers/event/sw/sw_evdev_xstats.c
+++ b/drivers/event/sw/sw_evdev_xstats.c
@@ -4,7 +4,7 @@
 
 #include <rte_event_ring.h>
 #include "sw_evdev.h"
-#include "iq_ring.h"
+#include "iq_chunk.h"
 
 enum xstats_type {
        /* common stats */
@@ -25,7 +25,6 @@ enum xstats_type {
        pkt_cycles,
        poll_return, /* for zero-count and used also for port bucket loop */
        /* qid_specific */
-       iq_size,
        iq_used,
        /* qid port mapping specific */
        pinned,
@@ -116,7 +115,6 @@ get_qid_stat(const struct sw_evdev *sw, uint16_t obj_idx,
                        return infl;
                } while (0);
                break;
-       case iq_size: return RTE_DIM(qid->iq[0]->ring);
        default: return -1;
        }
 }
@@ -129,7 +127,7 @@ get_qid_iq_stat(const struct sw_evdev *sw, uint16_t obj_idx,
        const int iq_idx = extra_arg;
 
        switch (type) {
-       case iq_used: return iq_ring_count(qid->iq[iq_idx]);
+       case iq_used: return iq_count(&qid->iq[iq_idx]);
        default: return -1;
        }
 }
@@ -208,13 +206,13 @@ sw_xstats_init(struct sw_evdev *sw)
        /* all bucket dequeues are allowed to be reset, handled in loop below */
 
        static const char * const qid_stats[] = {"rx", "tx", "drop",
-                       "inflight", "iq_size"
+                       "inflight"
        };
        static const enum xstats_type qid_types[] = { rx, tx, dropped,
-                       inflight, iq_size
+                       inflight
        };
        static const uint8_t qid_reset_allowed[] = {1, 1, 1,
-                       0, 0
+                       0
        };
 
        static const char * const qid_iq_stats[] = { "used" };
@@ -493,7 +491,7 @@ sw_xstats_update(struct sw_evdev *sw, enum rte_event_dev_xstats_mode mode,
                        values[xidx] = val;
 
                if (xs->reset_allowed && reset)
-                       xs->reset_value = val;
+                       xs->reset_value += val;
 
                xidx++;
        }
@@ -546,8 +544,7 @@ sw_xstats_reset_range(struct sw_evdev *sw, uint32_t start, uint32_t num)
                if (!xs->reset_allowed)
                        continue;
 
-               uint64_t val = xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg)
-                                       - xs->reset_value;
+               uint64_t val = xs->fn(sw, xs->obj_idx, xs->stat, xs->extra_arg);
                xs->reset_value = val;
        }
 }