add prefix to cache line macros

[dpdk.git] / app / test / test_malloc.c

diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
index 63e6b32..8c53132 100644 (file)
--- a/app/test/test_malloc.c
+++ b/app/test/test_malloc.c
@@ -300,9 +300,9 @@ test_big_alloc(void)
        size_t size =rte_str_to_size(MALLOC_MEMZONE_SIZE)*2;
        int align = 0;
 #ifndef RTE_LIBRTE_MALLOC_DEBUG
-       int overhead = CACHE_LINE_SIZE + CACHE_LINE_SIZE;
+       int overhead = RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE;
 #else
-       int overhead = CACHE_LINE_SIZE + CACHE_LINE_SIZE + CACHE_LINE_SIZE;
+       int overhead = RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE + RTE_CACHE_LINE_SIZE;
 #endif
 
        rte_malloc_get_socket_stats(socket, &pre_stats);
@@ -356,9 +356,9 @@ test_multi_alloc_statistics(void)
 #ifndef RTE_LIBRTE_MALLOC_DEBUG
        int trailer_size = 0;
 #else
-       int trailer_size = CACHE_LINE_SIZE;
+       int trailer_size = RTE_CACHE_LINE_SIZE;
 #endif
-       int overhead = CACHE_LINE_SIZE + trailer_size;
+       int overhead = RTE_CACHE_LINE_SIZE + trailer_size;
 
        rte_malloc_get_socket_stats(socket, &pre_stats);
 
@@ -481,13 +481,13 @@ test_realloc(void)
        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;
        }
        snprintf(ptr1, size1, "%s" ,hello_str);
-       char *ptr2 = rte_realloc(ptr1, size2, CACHE_LINE_SIZE);
+       char *ptr2 = rte_realloc(ptr1, size2, RTE_CACHE_LINE_SIZE);
        if (!ptr2){
                rte_free(ptr1);
                printf("NULL pointer returned from rte_realloc\n");
@@ -511,7 +511,7 @@ test_realloc(void)
        /* 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);
@@ -526,7 +526,7 @@ test_realloc(void)
                }
        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);
@@ -538,7 +538,7 @@ test_realloc(void)
                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);
@@ -549,12 +549,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;
-       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;
        }
-       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);
@@ -569,8 +569,8 @@ test_realloc(void)
 
        /* 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");
@@ -597,18 +597,18 @@ test_realloc(void)
         */
        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;
        }
-       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);
-       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);
@@ -625,7 +625,7 @@ test_realloc(void)
         * 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;
@@ -698,7 +698,7 @@ test_rte_malloc_validate(void)
 {
        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;
@@ -773,7 +773,7 @@ test_zero_aligned_alloc(void)
        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;
@@ -789,7 +789,7 @@ test_malloc_bad_params(void)
 {
        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);