Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: fix coverity warnings
[vpp.git]
/
src
/
vppinfra
/
mheap.c
diff --git
a/src/vppinfra/mheap.c
b/src/vppinfra/mheap.c
index
0a62943
..
b5566bd
100644
(file)
--- a/
src/vppinfra/mheap.c
+++ b/
src/vppinfra/mheap.c
@@
-41,6
+41,7
@@
#include <vppinfra/mheap.h>
#include <vppinfra/os.h>
#include <vppinfra/time.h>
#include <vppinfra/mheap.h>
#include <vppinfra/os.h>
#include <vppinfra/time.h>
+#include <vppinfra/lock.h>
#ifdef CLIB_UNIX
#include <vppinfra/elf_clib.h>
#ifdef CLIB_UNIX
#include <vppinfra/elf_clib.h>
@@
-64,7
+65,7
@@
mheap_maybe_lock (void *v)
}
while (clib_atomic_test_and_set (&h->lock))
}
while (clib_atomic_test_and_set (&h->lock))
- ;
+
CLIB_PAUSE ()
;
h->owner_cpu = my_cpu;
h->recursion_count = 1;
h->owner_cpu = my_cpu;
h->recursion_count = 1;
@@
-81,8
+82,7
@@
mheap_maybe_unlock (void *v)
if (--h->recursion_count == 0)
{
h->owner_cpu = ~0;
if (--h->recursion_count == 0)
{
h->owner_cpu = ~0;
- CLIB_MEMORY_BARRIER ();
- h->lock = 0;
+ clib_atomic_release (&h->lock);
}
}
}
}
}
}
@@
-935,7
+935,7
@@
mheap_alloc_with_flags (void *memory, uword memory_size, uword flags)
clib_mem_vm_map (h, sizeof (h[0]));
/* Zero vector header: both heap header and vector length. */
clib_mem_vm_map (h, sizeof (h[0]));
/* Zero vector header: both heap header and vector length. */
- memset (h, 0, sizeof (h[0]));
+
clib_
memset (h, 0, sizeof (h[0]));
_vec_len (v) = 0;
h->vm_alloc_offset_from_header = (void *) h - memory;
_vec_len (v) = 0;
h->vm_alloc_offset_from_header = (void *) h - memory;
@@
-953,8
+953,8
@@
mheap_alloc_with_flags (void *memory, uword memory_size, uword flags)
(clib_address_t) v, h->max_size);
/* Initialize free list heads to empty. */
(clib_address_t) v, h->max_size);
/* Initialize free list heads to empty. */
- memset (h->first_free_elt_uoffset_by_bin, 0xFF,
- sizeof (h->first_free_elt_uoffset_by_bin));
+
clib_
memset (h->first_free_elt_uoffset_by_bin, 0xFF,
+
sizeof (h->first_free_elt_uoffset_by_bin));
return v;
}
return v;
}
@@
-1236,7
+1236,7
@@
format_mheap (u8 * s, va_list * va)
mheap_elt_t *e;
uword i, n_hist;
mheap_elt_t *e;
uword i, n_hist;
- memset (hist, 0, sizeof (hist));
+
clib_
memset (hist, 0, sizeof (hist));
n_hist = 0;
for (e = v;
n_hist = 0;
for (e = v;
@@
-1536,7
+1536,7
@@
mheap_get_trace (void *v, uword offset, uword size)
mheap_trace_t trace;
/* Spurious Coverity warnings be gone. */
mheap_trace_t trace;
/* Spurious Coverity warnings be gone. */
- memset (&trace, 0, sizeof (trace));
+
clib_
memset (&trace, 0, sizeof (trace));
n_callers = clib_backtrace (trace.callers, ARRAY_LEN (trace.callers),
/* Skip mheap_get_aligned's frame */ 1);
n_callers = clib_backtrace (trace.callers, ARRAY_LEN (trace.callers),
/* Skip mheap_get_aligned's frame */ 1);
@@
-1630,7
+1630,7
@@
mheap_put_trace (void *v, uword offset, uword size)
{
hash_unset_mem (tm->trace_by_callers, t->callers);
vec_add1 (tm->trace_free_list, trace_index);
{
hash_unset_mem (tm->trace_by_callers, t->callers);
vec_add1 (tm->trace_free_list, trace_index);
- memset (t, 0, sizeof (t[0]));
+
clib_
memset (t, 0, sizeof (t[0]));
}
}
}
}