Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: fix clib_mem_destroy
[vpp.git]
/
src
/
vppinfra
/
ring.h
diff --git
a/src/vppinfra/ring.h
b/src/vppinfra/ring.h
index
2f90b82
..
8527fdb
100644
(file)
--- a/
src/vppinfra/ring.h
+++ b/
src/vppinfra/ring.h
@@
-37,12
+37,11
@@
clib_ring_new_inline (void **p, u32 elt_bytes, u32 size, u32 align)
{
void *v;
clib_ring_header_t *h;
{
void *v;
clib_ring_header_t *h;
+ vec_attr_t va = { .elt_sz = elt_bytes,
+ .hdr_sz = sizeof (clib_ring_header_t),
+ .align = align };
- v = _vec_resize ((void *) 0,
- /* length increment */ size,
- /* data bytes */ elt_bytes * size,
- /* header bytes */ sizeof (h[0]),
- /* data align */ align);
+ v = _vec_alloc_internal (size, &va);
h = clib_ring_header (v);
h->next = 0;
h = clib_ring_header (v);
h->next = 0;
@@
-56,7
+55,7
@@
clib_ring_new_inline (void **p, u32 elt_bytes, u32 size, u32 align)
#define clib_ring_new(ring, size) \
{ clib_ring_new_inline ((void **)&(ring), sizeof(ring[0]), size, 0);}
#define clib_ring_new(ring, size) \
{ clib_ring_new_inline ((void **)&(ring), sizeof(ring[0]), size, 0);}
-#define clib_ring_free(f) vec_free
_h((f), sizeof(clib_ring_header_t
))
+#define clib_ring_free(f) vec_free
((f
))
always_inline u32
clib_ring_n_enq (void *v)
always_inline u32
clib_ring_n_enq (void *v)