ring: remove split cacheline build setting

[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 4e78e14..4bc6da1 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -122,13 +122,13 @@ int
 rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        unsigned flags)
 {
+       int ret;
+
        /* 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
@@ -140,7 +140,9 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
 
        /* init the ring structure */
        memset(r, 0, sizeof(*r));
-       snprintf(r->name, sizeof(r->name), "%s", name);
+       ret = snprintf(r->name, sizeof(r->name), "%s", name);
+       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);
@@ -165,6 +167,7 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
        ssize_t ring_size;
        int mz_flags = 0;
        struct rte_ring_list* ring_list = NULL;
+       int ret;
 
        ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
 
@@ -174,6 +177,13 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
                return NULL;
        }
 
+       ret = snprintf(mz_name, sizeof(mz_name), "%s%s",
+               RTE_RING_MZ_PREFIX, name);
+       if (ret < 0 || ret >= (int)sizeof(mz_name)) {
+               rte_errno = ENAMETOOLONG;
+               return NULL;
+       }
+
        te = rte_zmalloc("RING_TAILQ_ENTRY", sizeof(*te), 0);
        if (te == NULL) {
                RTE_LOG(ERR, RING, "Cannot reserve memory for tailq\n");
@@ -181,8 +191,6 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
                return NULL;
        }
 
-       snprintf(mz_name, sizeof(mz_name), "%s%s", RTE_RING_MZ_PREFIX, name);
-
        rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
 
        /* reserve a memory zone for this ring. If we can't get rte_config or
@@ -209,6 +217,51 @@ rte_ring_create(const char *name, unsigned count, int socket_id,
        return r;
 }
 
+/* free the ring */
+void
+rte_ring_free(struct rte_ring *r)
+{
+       struct rte_ring_list *ring_list = NULL;
+       struct rte_tailq_entry *te;
+
+       if (r == NULL)
+               return;
+
+       /*
+        * Ring was not created with rte_ring_create,
+        * therefore, there is no memzone to free.
+        */
+       if (r->memzone == NULL) {
+               RTE_LOG(ERR, RING, "Cannot free ring (not created with rte_ring_create()");
+               return;
+       }
+
+       if (rte_memzone_free(r->memzone) != 0) {
+               RTE_LOG(ERR, RING, "Cannot free memory\n");
+               return;
+       }
+
+       ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
+       rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+       /* find out tailq entry */
+       TAILQ_FOREACH(te, ring_list, next) {
+               if (te->data == (void *) r)
+                       break;
+       }
+
+       if (te == NULL) {
+               rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+               return;
+       }
+
+       TAILQ_REMOVE(ring_list, te, next);
+
+       rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+
+       rte_free(te);
+}
+
 /*
  * change the high water mark. If *count* is 0, water marking is
  * disabled