X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_malloc%2Fmalloc_heap.c;h=6e9925195b939f619e75a4a0e5978fe53157ba84;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=375f212eb4351fa703e2ad307401cff0b18c3449;hpb=eeeebe4cd99469dffd99f802afa7022440d34592;p=dpdk.git

diff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c
index 375f212eb4..6e9925195b 100644
--- a/lib/librte_malloc/malloc_heap.c
+++ b/lib/librte_malloc/malloc_heap.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
@@ -122,33 +122,6 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align)
 	return 0;
 }
 
-/*
- * initialise a malloc heap object. The heap is locked with a private
- * lock while being initialised. This function should only be called the
- * first time a thread calls malloc - if even then, as heaps are per-socket
- * not per-thread.
- */
-static void
-malloc_heap_init(struct malloc_heap *heap)
-{
-	struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
-
-	rte_eal_mcfg_wait_complete(mcfg);
-	while (heap->initialised != INITIALISED) {
-		if (rte_atomic32_cmpset(
-				(volatile uint32_t*)&heap->initialised,
-				NOT_INITIALISED, INITIALISING)) {
-
-			heap->free_head = NULL;
-			heap->mz_count = 0;
-			heap->alloc_count = 0;
-			heap->total_size = 0;
-			rte_spinlock_init(&heap->lock);
-			heap->initialised = INITIALISED;
-		}
-	}
-}
-
 /*
  * Iterates through the freelist for a heap to find a free element
  * which can store data of the required size and with the requested alignment.
@@ -193,9 +166,6 @@ void *
 malloc_heap_alloc(struct malloc_heap *heap,
 		const char *type __attribute__((unused)), size_t size, unsigned align)
 {
-	if (!heap->initialised)
-		malloc_heap_init(heap);
-
 	size = CACHE_LINE_ROUNDUP(size);
 	align = CACHE_LINE_ROUNDUP(align);
 	rte_spinlock_lock(&heap->lock);
@@ -223,9 +193,6 @@ int
 malloc_heap_get_stats(const struct malloc_heap *heap,
 		struct rte_malloc_socket_stats *socket_stats)
 {
-	if (!heap->initialised)
-		return -1;
-
 	struct malloc_elem *elem = heap->free_head;
 
 	/* Initialise variables for heap */