git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: remove useless check on x86 TSC reliability
[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
d215ace
..
d9b3080
100644
(file)
--- a/
lib/librte_ring/rte_ring.c
+++ b/
lib/librte_ring/rte_ring.c
@@
-30,6
+30,7
@@
#include <rte_errno.h>
#include <rte_string_fns.h>
#include <rte_spinlock.h>
#include <rte_errno.h>
#include <rte_string_fns.h>
#include <rte_spinlock.h>
+#include <rte_tailq.h>
#include "rte_ring.h"
#include "rte_ring.h"
@@
-62,6
+63,13
@@
rte_ring_get_memsize(unsigned count)
return sz;
}
return sz;
}
+void
+rte_ring_reset(struct rte_ring *r)
+{
+ r->prod.head = r->cons.head = 0;
+ r->prod.tail = r->cons.tail = 0;
+}
+
int
rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
unsigned flags)
int
rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
unsigned flags)
@@
-78,7
+86,7
@@
rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
/* init the ring structure */
memset(r, 0, sizeof(*r));
/* init the ring structure */
memset(r, 0, sizeof(*r));
- ret = s
nprintf(r->name, sizeof(r->name), "%s", name
);
+ ret = s
trlcpy(r->name, name, sizeof(r->name)
);
if (ret < 0 || ret >= (int)sizeof(r->name))
return -ENAMETOOLONG;
r->flags = flags;
if (ret < 0 || ret >= (int)sizeof(r->name))
return -ENAMETOOLONG;
r->flags = flags;
@@
-147,7
+155,7
@@
rte_ring_create(const char *name, unsigned count, int socket_id,
return NULL;
}
return NULL;
}
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
/* reserve a memory zone for this ring. If we can't get rte_config or
* we are secondary process, the memzone_reserve function will set
/* reserve a memory zone for this ring. If we can't get rte_config or
* we are secondary process, the memzone_reserve function will set
@@
-169,7
+177,7
@@
rte_ring_create(const char *name, unsigned count, int socket_id,
RTE_LOG(ERR, RING, "Cannot reserve memory\n");
rte_free(te);
}
RTE_LOG(ERR, RING, "Cannot reserve memory\n");
rte_free(te);
}
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
return r;
}
return r;
}
@@
-189,7
+197,8
@@
rte_ring_free(struct rte_ring *r)
* therefore, there is no memzone to free.
*/
if (r->memzone == NULL) {
* therefore, there is no memzone to free.
*/
if (r->memzone == NULL) {
- RTE_LOG(ERR, RING, "Cannot free ring (not created with rte_ring_create()");
+ RTE_LOG(ERR, RING,
+ "Cannot free ring, not created with rte_ring_create()\n");
return;
}
return;
}
@@
-199,7
+208,7
@@
rte_ring_free(struct rte_ring *r)
}
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
}
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
/* find out tailq entry */
TAILQ_FOREACH(te, ring_list, next) {
/* find out tailq entry */
TAILQ_FOREACH(te, ring_list, next) {
@@
-208,13
+217,13
@@
rte_ring_free(struct rte_ring *r)
}
if (te == NULL) {
}
if (te == NULL) {
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
return;
}
TAILQ_REMOVE(ring_list, te, next);
return;
}
TAILQ_REMOVE(ring_list, te, next);
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_free(te);
}
rte_free(te);
}
@@
-244,13
+253,13
@@
rte_ring_list_dump(FILE *f)
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
- rte_
rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_lock(
);
TAILQ_FOREACH(te, ring_list, next) {
rte_ring_dump(f, (struct rte_ring *) te->data);
}
TAILQ_FOREACH(te, ring_list, next) {
rte_ring_dump(f, (struct rte_ring *) te->data);
}
- rte_
rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_unlock(
);
}
/* search a ring from its name */
}
/* search a ring from its name */
@@
-263,7
+272,7
@@
rte_ring_lookup(const char *name)
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
ring_list = RTE_TAILQ_CAST(rte_ring_tailq.head, rte_ring_list);
- rte_
rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_lock(
);
TAILQ_FOREACH(te, ring_list, next) {
r = (struct rte_ring *) te->data;
TAILQ_FOREACH(te, ring_list, next) {
r = (struct rte_ring *) te->data;
@@
-271,7
+280,7
@@
rte_ring_lookup(const char *name)
break;
}
break;
}
- rte_
rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_unlock(
);
if (te == NULL) {
rte_errno = ENOENT;
if (te == NULL) {
rte_errno = ENOENT;