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 2bdec29..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
@@ -68,23 +68,43 @@ void rte_free(void *addr)
  * Allocate memory on specified heap.
  */
 void *
-rte_malloc_socket(const char *type, size_t size, unsigned align, int socket)
+rte_malloc_socket(const char *type, size_t size, unsigned align, int socket_arg)
 {
        struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       int socket, i;
+       void *ret;
 
        /* return NULL if size is 0 or alignment is not power-of-2 */
        if (size == 0 || !rte_is_power_of_2(align))
                return NULL;
 
-       if (socket == SOCKET_ID_ANY)
+       if (socket_arg == SOCKET_ID_ANY)
                socket = malloc_get_numa_socket();
+       else
+               socket = socket_arg;
 
        /* Check socket parameter */
        if (socket >= RTE_MAX_NUMA_NODES)
                return NULL;
 
-       return malloc_heap_alloc(&mcfg->malloc_heaps[socket], type,
-                       size, align == 0 ? 1 : align);
+       ret = malloc_heap_alloc(&mcfg->malloc_heaps[socket], type,
+                               size, align == 0 ? 1 : align);
+       if (ret != NULL || socket_arg != SOCKET_ID_ANY)
+               return ret;
+
+       /* try other heaps */
+       for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
+               /* we already tried this one */
+               if (i == socket)
+                       continue;
+
+               ret = malloc_heap_alloc(&mcfg->malloc_heaps[i], type,
+                                       size, align == 0 ? 1 : align);
+               if (ret != NULL)
+                       return ret;
+       }
+
+       return NULL;
 }
 
 /*
@@ -149,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)
@@ -197,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;
@@ -206,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;
 }