Imported Upstream version 17.05

[deb_dpdk.git] / lib / librte_ring / rte_ring.c

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index ca0a108..5f98c33 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -127,18 +127,10 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        /* compilation-time checks */
        RTE_BUILD_BUG_ON((sizeof(struct rte_ring) &
                          RTE_CACHE_LINE_MASK) != 0);
-#ifdef RTE_RING_SPLIT_PROD_CONS
        RTE_BUILD_BUG_ON((offsetof(struct rte_ring, cons) &
                          RTE_CACHE_LINE_MASK) != 0);
-#endif
        RTE_BUILD_BUG_ON((offsetof(struct rte_ring, prod) &
                          RTE_CACHE_LINE_MASK) != 0);
-#ifdef RTE_LIBRTE_RING_DEBUG
-       RTE_BUILD_BUG_ON((sizeof(struct rte_ring_debug_stats) &
-                         RTE_CACHE_LINE_MASK) != 0);
-       RTE_BUILD_BUG_ON((offsetof(struct rte_ring, stats) &
-                         RTE_CACHE_LINE_MASK) != 0);
-#endif
 
        /* init the ring structure */
        memset(r, 0, sizeof(*r));
@@ -146,11 +138,10 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        if (ret < 0 || ret >= (int)sizeof(r->name))
                return -ENAMETOOLONG;
        r->flags = flags;
-       r->prod.watermark = count;
-       r->prod.sp_enqueue = !!(flags & RING_F_SP_ENQ);
-       r->cons.sc_dequeue = !!(flags & RING_F_SC_DEQ);
-       r->prod.size = r->cons.size = count;
-       r->prod.mask = r->cons.mask = count-1;
+       r->prod.single = (flags & RING_F_SP_ENQ) ? __IS_SP : __IS_MP;
+       r->cons.single = (flags & RING_F_SC_DEQ) ? __IS_SC : __IS_MC;
+       r->size = count;
+       r->mask = count - 1;
        r->prod.head = r->cons.head = 0;
        r->prod.tail = r->cons.tail = 0;
 
@@ -264,76 +255,19 @@ rte_ring_free(struct rte_ring *r)
        rte_free(te);
 }
 
-/*
- * change the high water mark. If *count* is 0, water marking is
- * disabled
- */
-int
-rte_ring_set_water_mark(struct rte_ring *r, unsigned count)
-{
-       if (count >= r->prod.size)
-               return -EINVAL;
-
-       /* if count is 0, disable the watermarking */
-       if (count == 0)
-               count = r->prod.size;
-
-       r->prod.watermark = count;
-       return 0;
-}
-
 /* dump the status of the ring on the console */
 void
 rte_ring_dump(FILE *f, const struct rte_ring *r)
 {
-#ifdef RTE_LIBRTE_RING_DEBUG
-       struct rte_ring_debug_stats sum;
-       unsigned lcore_id;
-#endif
-
        fprintf(f, "ring <%s>@%p\n", r->name, r);
        fprintf(f, "  flags=%x\n", r->flags);
-       fprintf(f, "  size=%"PRIu32"\n", r->prod.size);
+       fprintf(f, "  size=%"PRIu32"\n", r->size);
        fprintf(f, "  ct=%"PRIu32"\n", r->cons.tail);
        fprintf(f, "  ch=%"PRIu32"\n", r->cons.head);
        fprintf(f, "  pt=%"PRIu32"\n", r->prod.tail);
        fprintf(f, "  ph=%"PRIu32"\n", r->prod.head);
        fprintf(f, "  used=%u\n", rte_ring_count(r));
        fprintf(f, "  avail=%u\n", rte_ring_free_count(r));
-       if (r->prod.watermark == r->prod.size)
-               fprintf(f, "  watermark=0\n");
-       else
-               fprintf(f, "  watermark=%"PRIu32"\n", r->prod.watermark);
-
-       /* sum and dump statistics */
-#ifdef RTE_LIBRTE_RING_DEBUG
-       memset(&sum, 0, sizeof(sum));
-       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
-               sum.enq_success_bulk += r->stats[lcore_id].enq_success_bulk;
-               sum.enq_success_objs += r->stats[lcore_id].enq_success_objs;
-               sum.enq_quota_bulk += r->stats[lcore_id].enq_quota_bulk;
-               sum.enq_quota_objs += r->stats[lcore_id].enq_quota_objs;
-               sum.enq_fail_bulk += r->stats[lcore_id].enq_fail_bulk;
-               sum.enq_fail_objs += r->stats[lcore_id].enq_fail_objs;
-               sum.deq_success_bulk += r->stats[lcore_id].deq_success_bulk;
-               sum.deq_success_objs += r->stats[lcore_id].deq_success_objs;
-               sum.deq_fail_bulk += r->stats[lcore_id].deq_fail_bulk;
-               sum.deq_fail_objs += r->stats[lcore_id].deq_fail_objs;
-       }
-       fprintf(f, "  size=%"PRIu32"\n", r->prod.size);
-       fprintf(f, "  enq_success_bulk=%"PRIu64"\n", sum.enq_success_bulk);
-       fprintf(f, "  enq_success_objs=%"PRIu64"\n", sum.enq_success_objs);
-       fprintf(f, "  enq_quota_bulk=%"PRIu64"\n", sum.enq_quota_bulk);
-       fprintf(f, "  enq_quota_objs=%"PRIu64"\n", sum.enq_quota_objs);
-       fprintf(f, "  enq_fail_bulk=%"PRIu64"\n", sum.enq_fail_bulk);
-       fprintf(f, "  enq_fail_objs=%"PRIu64"\n", sum.enq_fail_objs);
-       fprintf(f, "  deq_success_bulk=%"PRIu64"\n", sum.deq_success_bulk);
-       fprintf(f, "  deq_success_objs=%"PRIu64"\n", sum.deq_success_objs);
-       fprintf(f, "  deq_fail_bulk=%"PRIu64"\n", sum.deq_fail_bulk);
-       fprintf(f, "  deq_fail_objs=%"PRIu64"\n", sum.deq_fail_objs);
-#else
-       fprintf(f, "  no statistics available\n");
-#endif
 }
 
 /* dump the status of all rings on the console */