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
tailq: remove unneeded inclusions
[dpdk.git]
/
app
/
test
/
test_malloc.c
diff --git
a/app/test/test_malloc.c
b/app/test/test_malloc.c
index
98fe02a
..
ea6f651
100644
(file)
--- a/
app/test/test_malloc.c
+++ b/
app/test/test_malloc.c
@@
-1,13
+1,13
@@
/*-
* BSD LICENSE
/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-201
3
Intel Corporation. All rights reserved.
+ *
+ * Copyright(c) 2010-201
4
Intel Corporation. All rights reserved.
* All rights reserved.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
@@
-17,7
+17,7
@@
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@
-39,14
+39,11
@@
#include <stdlib.h>
#include <sys/queue.h>
#include <stdlib.h>
#include <sys/queue.h>
-#include <cmdline_parse.h>
-
#include <rte_common.h>
#include <rte_memory.h>
#include <rte_memzone.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
#include <rte_common.h>
#include <rte_memory.h>
#include <rte_memzone.h>
#include <rte_per_lcore.h>
#include <rte_launch.h>
-#include <rte_tailq.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
#include <rte_eal.h>
#include <rte_per_lcore.h>
#include <rte_lcore.h>
@@
-68,7
+65,7
@@
* ======
*
* Allocate some dynamic memory from heap (3 areas). Check that areas
* ======
*
* Allocate some dynamic memory from heap (3 areas). Check that areas
- * don't overlap an that alignment constraints match. This test is
+ * don't overlap an
d
that alignment constraints match. This test is
* done many times on different lcores simultaneously.
*/
* done many times on different lcores simultaneously.
*/
@@
-164,7
+161,7
@@
test_align_overlap_per_lcore(__attribute__((unused)) void *arg)
rte_free(p2);
rte_free(p3);
}
rte_free(p2);
rte_free(p3);
}
- rte_malloc_dump_stats("dummy");
+ rte_malloc_dump_stats(
stdout,
"dummy");
return ret;
}
return ret;
}
@@
-260,7
+257,7
@@
test_reordered_free_per_lcore(__attribute__((unused)) void *arg)
break;
}
}
break;
}
}
- rte_malloc_dump_stats("dummy");
+ rte_malloc_dump_stats(
stdout,
"dummy");
return ret;
}
return ret;
}
@@
-302,9
+299,9
@@
test_big_alloc(void)
size_t size =rte_str_to_size(MALLOC_MEMZONE_SIZE)*2;
int align = 0;
#ifndef RTE_LIBRTE_MALLOC_DEBUG
size_t size =rte_str_to_size(MALLOC_MEMZONE_SIZE)*2;
int align = 0;
#ifndef RTE_LIBRTE_MALLOC_DEBUG
- int overhead =
64 + 64
;
+ int overhead =
RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE
;
#else
#else
- int overhead =
64 + 64 + 64
;
+ int overhead =
RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE
;
#endif
rte_malloc_get_socket_stats(socket, &pre_stats);
#endif
rte_malloc_get_socket_stats(socket, &pre_stats);
@@
-315,9
+312,9
@@
test_big_alloc(void)
rte_malloc_get_socket_stats(socket,&post_stats);
/* Check statistics reported are correct */
rte_malloc_get_socket_stats(socket,&post_stats);
/* Check statistics reported are correct */
- /* Allocation
increase, cannot
be the same as before big allocation */
- if (post_stats.heap_totalsz_bytes
==
pre_stats.heap_totalsz_bytes) {
- printf("Malloc statistics are incorrect - heap_totalz_bytes\n");
+ /* Allocation
may increase, or may
be the same as before big allocation */
+ if (post_stats.heap_totalsz_bytes
<
pre_stats.heap_totalsz_bytes) {
+ printf("Malloc statistics are incorrect - heap_total
s
z_bytes\n");
return -1;
}
/* Check that allocated size adds up correctly */
return -1;
}
/* Check that allocated size adds up correctly */
@@
-338,7
+335,8
@@
test_big_alloc(void)
return -1;
}
/* New blocks now available - just allocated 1 but also 1 new free */
return -1;
}
/* New blocks now available - just allocated 1 but also 1 new free */
- if(post_stats.free_count != pre_stats.free_count ) {
+ if (post_stats.free_count != pre_stats.free_count &&
+ post_stats.free_count != pre_stats.free_count - 1) {
printf("Malloc statistics are incorrect - free_count\n");
return -1;
}
printf("Malloc statistics are incorrect - free_count\n");
return -1;
}
@@
-357,9
+355,9
@@
test_multi_alloc_statistics(void)
#ifndef RTE_LIBRTE_MALLOC_DEBUG
int trailer_size = 0;
#else
#ifndef RTE_LIBRTE_MALLOC_DEBUG
int trailer_size = 0;
#else
- int trailer_size =
64
;
+ int trailer_size =
RTE_CACHE_LINE_SIZE
;
#endif
#endif
- int overhead =
64
+ trailer_size;
+ int overhead =
RTE_CACHE_LINE_SIZE
+ trailer_size;
rte_malloc_get_socket_stats(socket, &pre_stats);
rte_malloc_get_socket_stats(socket, &pre_stats);
@@
-367,7
+365,7
@@
test_multi_alloc_statistics(void)
if (!p1)
return -1;
rte_free(p1);
if (!p1)
return -1;
rte_free(p1);
- rte_malloc_dump_stats("stats");
+ rte_malloc_dump_stats(
stdout,
"stats");
rte_malloc_get_socket_stats(socket,&post_stats);
/* Check statistics reported are correct */
rte_malloc_get_socket_stats(socket,&post_stats);
/* Check statistics reported are correct */
@@
-427,7
+425,7
@@
test_multi_alloc_statistics(void)
}
/* Make sure that we didn't touch our greatest chunk: 2 * 11M) */
}
/* Make sure that we didn't touch our greatest chunk: 2 * 11M) */
- if (
second
_stats.greatest_free_size != pre_stats.greatest_free_size) {
+ if (
post
_stats.greatest_free_size != pre_stats.greatest_free_size) {
printf("Incorrect heap statistics: Greatest free size \n");
return -1;
}
printf("Incorrect heap statistics: Greatest free size \n");
return -1;
}
@@
-468,7
+466,7
@@
test_rte_malloc_type_limits(void)
*/
const char *typename = "limit_test";
rte_malloc_set_limit(typename, 64 * 1024);
*/
const char *typename = "limit_test";
rte_malloc_set_limit(typename, 64 * 1024);
- rte_malloc_dump_stats(typename);
+ rte_malloc_dump_stats(
stdout,
typename);
return 0;
}
return 0;
}
@@
-482,13
+480,13
@@
test_realloc(void)
const unsigned size4 = size3 + 1024;
/* test data is the same even if element is moved*/
const unsigned size4 = size3 + 1024;
/* test data is the same even if element is moved*/
- char *ptr1 = rte_zmalloc(NULL, size1, CACHE_LINE_SIZE);
+ char *ptr1 = rte_zmalloc(NULL, size1,
RTE_
CACHE_LINE_SIZE);
if (!ptr1){
printf("NULL pointer returned from rte_zmalloc\n");
return -1;
}
if (!ptr1){
printf("NULL pointer returned from rte_zmalloc\n");
return -1;
}
-
rte_
snprintf(ptr1, size1, "%s" ,hello_str);
- char *ptr2 = rte_realloc(ptr1, size2, CACHE_LINE_SIZE);
+ snprintf(ptr1, size1, "%s" ,hello_str);
+ char *ptr2 = rte_realloc(ptr1, size2,
RTE_
CACHE_LINE_SIZE);
if (!ptr2){
rte_free(ptr1);
printf("NULL pointer returned from rte_realloc\n");
if (!ptr2){
rte_free(ptr1);
printf("NULL pointer returned from rte_realloc\n");
@@
-512,7
+510,7
@@
test_realloc(void)
/* now allocate third element, free the second
* and resize third. It should not move. (ptr1 is now invalid)
*/
/* now allocate third element, free the second
* and resize third. It should not move. (ptr1 is now invalid)
*/
- char *ptr3 = rte_zmalloc(NULL, size3, CACHE_LINE_SIZE);
+ char *ptr3 = rte_zmalloc(NULL, size3,
RTE_
CACHE_LINE_SIZE);
if (!ptr3){
printf("NULL pointer returned from rte_zmalloc\n");
rte_free(ptr2);
if (!ptr3){
printf("NULL pointer returned from rte_zmalloc\n");
rte_free(ptr2);
@@
-527,7
+525,7
@@
test_realloc(void)
}
rte_free(ptr2);
/* first resize to half the size of the freed block */
}
rte_free(ptr2);
/* first resize to half the size of the freed block */
- char *ptr4 = rte_realloc(ptr3, size4, CACHE_LINE_SIZE);
+ char *ptr4 = rte_realloc(ptr3, size4,
RTE_
CACHE_LINE_SIZE);
if (!ptr4){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr3);
if (!ptr4){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr3);
@@
-539,7
+537,7
@@
test_realloc(void)
return -1;
}
/* now resize again to the full size of the freed block */
return -1;
}
/* now resize again to the full size of the freed block */
- ptr4 = rte_realloc(ptr3, size3 + size2 + size1, CACHE_LINE_SIZE);
+ ptr4 = rte_realloc(ptr3, size3 + size2 + size1,
RTE_
CACHE_LINE_SIZE);
if (ptr3 != ptr4){
printf("Unexpected - ptr4 != ptr3 on second resize\n");
rte_free(ptr4);
if (ptr3 != ptr4){
printf("Unexpected - ptr4 != ptr3 on second resize\n");
rte_free(ptr4);
@@
-550,12
+548,12
@@
test_realloc(void)
/* now try a resize to a smaller size, see if it works */
const unsigned size5 = 1024;
const unsigned size6 = size5 / 2;
/* now try a resize to a smaller size, see if it works */
const unsigned size5 = 1024;
const unsigned size6 = size5 / 2;
- char *ptr5 = rte_malloc(NULL, size5, CACHE_LINE_SIZE);
+ char *ptr5 = rte_malloc(NULL, size5,
RTE_
CACHE_LINE_SIZE);
if (!ptr5){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
if (!ptr5){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
- char *ptr6 = rte_realloc(ptr5, size6, CACHE_LINE_SIZE);
+ char *ptr6 = rte_realloc(ptr5, size6,
RTE_
CACHE_LINE_SIZE);
if (!ptr6){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr5);
if (!ptr6){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr5);
@@
-570,8
+568,8
@@
test_realloc(void)
/* check for behaviour changing alignment */
const unsigned size7 = 1024;
/* check for behaviour changing alignment */
const unsigned size7 = 1024;
- const unsigned orig_align = CACHE_LINE_SIZE;
- unsigned new_align = CACHE_LINE_SIZE * 2;
+ const unsigned orig_align =
RTE_
CACHE_LINE_SIZE;
+ unsigned new_align =
RTE_
CACHE_LINE_SIZE * 2;
char *ptr7 = rte_malloc(NULL, size7, orig_align);
if (!ptr7){
printf("NULL pointer returned from rte_malloc\n");
char *ptr7 = rte_malloc(NULL, size7, orig_align);
if (!ptr7){
printf("NULL pointer returned from rte_malloc\n");
@@
-598,18
+596,18
@@
test_realloc(void)
*/
unsigned size9 = 1024, size10 = 1024;
unsigned size11 = size9 + size10 + 256;
*/
unsigned size9 = 1024, size10 = 1024;
unsigned size11 = size9 + size10 + 256;
- char *ptr9 = rte_malloc(NULL, size9, CACHE_LINE_SIZE);
+ char *ptr9 = rte_malloc(NULL, size9,
RTE_
CACHE_LINE_SIZE);
if (!ptr9){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
if (!ptr9){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
- char *ptr10 = rte_malloc(NULL, size10, CACHE_LINE_SIZE);
+ char *ptr10 = rte_malloc(NULL, size10,
RTE_
CACHE_LINE_SIZE);
if (!ptr10){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
rte_free(ptr9);
if (!ptr10){
printf("NULL pointer returned from rte_malloc\n");
return -1;
}
rte_free(ptr9);
- char *ptr11 = rte_realloc(ptr10, size11, CACHE_LINE_SIZE);
+ char *ptr11 = rte_realloc(ptr10, size11,
RTE_
CACHE_LINE_SIZE);
if (!ptr11){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr10);
if (!ptr11){
printf("NULL pointer returned from rte_realloc\n");
rte_free(ptr10);
@@
-626,7
+624,7
@@
test_realloc(void)
* We should get a malloc of the size requested*/
const size_t size12 = 1024;
size_t size12_check;
* We should get a malloc of the size requested*/
const size_t size12 = 1024;
size_t size12_check;
- char *ptr12 = rte_realloc(NULL, size12, CACHE_LINE_SIZE);
+ char *ptr12 = rte_realloc(NULL, size12,
RTE_
CACHE_LINE_SIZE);
if (!ptr12){
printf("NULL pointer returned from rte_realloc\n");
return -1;
if (!ptr12){
printf("NULL pointer returned from rte_realloc\n");
return -1;
@@
-699,7
+697,7
@@
test_rte_malloc_validate(void)
{
const size_t request_size = 1024;
size_t allocated_size;
{
const size_t request_size = 1024;
size_t allocated_size;
- char *data_ptr = rte_malloc(NULL, request_size, CACHE_LINE_SIZE);
+ char *data_ptr = rte_malloc(NULL, request_size,
RTE_
CACHE_LINE_SIZE);
#ifdef RTE_LIBRTE_MALLOC_DEBUG
int retval;
char *over_write_vals = NULL;
#ifdef RTE_LIBRTE_MALLOC_DEBUG
int retval;
char *over_write_vals = NULL;
@@
-774,7
+772,7
@@
test_zero_aligned_alloc(void)
char *p1 = rte_malloc(NULL,1024, 0);
if (!p1)
goto err_return;
char *p1 = rte_malloc(NULL,1024, 0);
if (!p1)
goto err_return;
- if (!rte_is_aligned(p1, CACHE_LINE_SIZE))
+ if (!rte_is_aligned(p1,
RTE_
CACHE_LINE_SIZE))
goto err_return;
rte_free(p1);
return 0;
goto err_return;
rte_free(p1);
return 0;
@@
-790,7
+788,7
@@
test_malloc_bad_params(void)
{
const char *type = NULL;
size_t size = 0;
{
const char *type = NULL;
size_t size = 0;
- unsigned align = CACHE_LINE_SIZE;
+ unsigned align =
RTE_
CACHE_LINE_SIZE;
/* rte_malloc expected to return null with inappropriate size */
char *bad_ptr = rte_malloc(type, size, align);
/* rte_malloc expected to return null with inappropriate size */
char *bad_ptr = rte_malloc(type, size, align);
@@
-925,7
+923,7
@@
test_alloc_socket(void)
return 0;
}
return 0;
}
-int
+
static
int
test_malloc(void)
{
unsigned lcore_id;
test_malloc(void)
{
unsigned lcore_id;
@@
-1038,11
+1036,17
@@
test_malloc(void)
ret = test_multi_alloc_statistics();
if (ret < 0) {
ret = test_multi_alloc_statistics();
if (ret < 0) {
- printf("test_muti_alloc_statistics() failed\n");
+ printf("test_mu
l
ti_alloc_statistics() failed\n");
return ret;
}
else
return ret;
}
else
- printf("test_muti_alloc_statistics() passed\n");
+ printf("test_mu
l
ti_alloc_statistics() passed\n");
return 0;
}
return 0;
}
+
+static struct test_command malloc_cmd = {
+ .command = "malloc_autotest",
+ .callback = test_malloc,
+};
+REGISTER_TEST_COMMAND(malloc_cmd);