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: remove GNU Indent directives
[vpp.git]
/
src
/
vppinfra
/
test_heap.c
diff --git
a/src/vppinfra/test_heap.c
b/src/vppinfra/test_heap.c
index
3d5171b
..
da3ad24
100644
(file)
--- a/
src/vppinfra/test_heap.c
+++ b/
src/vppinfra/test_heap.c
@@
-46,6
+46,12
@@
static int verbose;
#define if_verbose(format,args...) \
if (verbose) { clib_warning(format, ## args); }
#define if_verbose(format,args...) \
if (verbose) { clib_warning(format, ## args); }
+u32
+vl (void *p)
+{
+ return (vec_len (p));
+}
+
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{
@@
-55,12
+61,13
@@
main (int argc, char *argv[])
uword *objects = 0;
uword *handles = 0;
uword objects_used;
uword *objects = 0;
uword *handles = 0;
uword objects_used;
- uword align, fixed_size;
+ uword align;
+
+ clib_mem_init (0, 10 << 20);
n = 10;
seed = (u32) getpid ();
check_mask = 0;
n = 10;
seed = (u32) getpid ();
check_mask = 0;
- fixed_size = 0;
if (argc > 1)
{
if (argc > 1)
{
@@
-86,19
+93,12
@@
main (int argc, char *argv[])
fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
vec_resize (objects, 1000);
fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
vec_resize (objects, 1000);
- if (vec_bytes (objects)
)
/* stupid warning be gone */
- memset (objects, ~0, vec_bytes (objects));
+ if (vec_bytes (objects)
> 0)
/* stupid warning be gone */
+
clib_
memset (objects, ~0, vec_bytes (objects));
vec_resize (handles, vec_len (objects));
objects_used = 0;
vec_resize (handles, vec_len (objects));
objects_used = 0;
- if (fixed_size)
- {
- uword max_len = 1024 * 1024;
- void *memory = clib_mem_alloc (max_len * sizeof (h[0]));
- h = heap_create_from_memory (memory, max_len, sizeof (h[0]));
- }
-
for (i = 0; i < n; i++)
{
while (1)
for (i = 0; i < n; i++)
{
while (1)
@@
-175,14
+175,11
@@
main (int argc, char *argv[])
heap_free (h);
if (verbose)
fformat (stderr, "%U\n", format_heap, h, 1);
heap_free (h);
if (verbose)
fformat (stderr, "%U\n", format_heap, h, 1);
- ASSERT (objects_used == 0);
+
//
ASSERT (objects_used == 0);
vec_free (objects);
vec_free (handles);
vec_free (objects);
vec_free (handles);
- if (fixed_size)
- vec_free_h (h, sizeof (heap_header_t));
-
if (verbose)
fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);
if (verbose)
fformat (stderr, "%U\n", format_clib_mem_usage, /* verbose */ 0);