add prefix to cache line macros

[dpdk.git] / lib / librte_malloc / rte_malloc.c

diff --git a/lib/librte_malloc/rte_malloc.c b/lib/librte_malloc/rte_malloc.c
index a30bf4c..b966fc7 100644 (file)
--- a/lib/librte_malloc/rte_malloc.c
+++ b/lib/librte_malloc/rte_malloc.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. 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:
- * 
+ *
  *     * 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.
- * 
+ *
  *   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
@@ -169,7 +169,7 @@ rte_realloc(void *ptr, size_t size, unsigned align)
        if (elem == NULL)
                rte_panic("Fatal error: memory corruption detected\n");
 
-       size = CACHE_LINE_ROUNDUP(size), align = CACHE_LINE_ROUNDUP(align);
+       size = RTE_CACHE_LINE_ROUNDUP(size), align = RTE_CACHE_LINE_ROUNDUP(align);
        /* check alignment matches first, and if ok, see if we can resize block */
        if (RTE_PTR_ALIGN(ptr,align) == ptr &&
                        malloc_elem_resize(elem, size) == 0)
@@ -217,7 +217,7 @@ rte_malloc_get_socket_stats(int socket,
  * Print stats on memory type. If type is NULL, info on all types is printed
  */
 void
-rte_malloc_dump_stats(__rte_unused const char *type)
+rte_malloc_dump_stats(FILE *f, __rte_unused const char *type)
 {
        unsigned int socket;
        struct rte_malloc_socket_stats sock_stats;
@@ -226,14 +226,14 @@ rte_malloc_dump_stats(__rte_unused const char *type)
                if ((rte_malloc_get_socket_stats(socket, &sock_stats) < 0))
                        continue;
 
-               printf("Socket:%u\n", socket);
-               printf("\tHeap_size:%zu,\n", sock_stats.heap_totalsz_bytes);
-               printf("\tFree_size:%zu,\n", sock_stats.heap_freesz_bytes);
-               printf("\tAlloc_size:%zu,\n", sock_stats.heap_allocsz_bytes);
-               printf("\tGreatest_free_size:%zu,\n",
+               fprintf(f, "Socket:%u\n", socket);
+               fprintf(f, "\tHeap_size:%zu,\n", sock_stats.heap_totalsz_bytes);
+               fprintf(f, "\tFree_size:%zu,\n", sock_stats.heap_freesz_bytes);
+               fprintf(f, "\tAlloc_size:%zu,\n", sock_stats.heap_allocsz_bytes);
+               fprintf(f, "\tGreatest_free_size:%zu,\n",
                                sock_stats.greatest_free_size);
-               printf("\tAlloc_count:%u,\n",sock_stats.alloc_count);
-               printf("\tFree_count:%u,\n", sock_stats.free_count);
+               fprintf(f, "\tAlloc_count:%u,\n",sock_stats.alloc_count);
+               fprintf(f, "\tFree_count:%u,\n", sock_stats.free_count);
        }
        return;
 }