Move include/malloc.h to include/gpxe/malloc.h, since everything in there

is now gPXE-specific.  (The standard malloc() et al have been in stdlib.h
for a while).

Add free memory counter.

diff --git a/src/core/heap.c b/src/core/heap.c
index f2c7e80b6a4cbb3685d2bf804ecbc2c142f372e3..4afd270b12419d575580c0b62122c379f3a05022 100644 (file)
--- a/src/core/heap.c
+++ b/src/core/heap.c
@@ -1,4 +1,4 @@
-#include <malloc.h>
+#include <gpxe/malloc.h>
 #include <gpxe/heap.h>
 
 /**

diff --git a/src/core/malloc.c b/src/core/malloc.c
index db2b500c92da93c58e7b4578d2d891aa3751c3f4..448080b4fe4706cf6e6a4f17513cdf8bf92adcc0 100644 (file)
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -22,7 +22,7 @@
 #include <strings.h>
 #include <io.h>
 #include <gpxe/list.h>
-#include <malloc.h>
+#include <gpxe/malloc.h>
 
 /** @file
  *
@@ -69,6 +69,9 @@ struct autosized_block {
 /** List of free memory blocks */
 static LIST_HEAD ( free_blocks );
 
+/** Total amount of free memory */
+size_t freemem;
+
 /**
  * Allocate a memory block
  *
@@ -134,6 +137,9 @@ void * alloc_memblock ( size_t size, size_t align ) {
                         */
                        if ( pre_size < MIN_MEMBLOCK_SIZE )
                                list_del ( &pre->list );
+                       /* Update total free memory */
+                       freemem -= size;
+                       /* Return allocated block */
                        DBG ( "Allocated [%p,%p)\n", block,
                              ( ( ( void * ) block ) + size ) );
                        return block;
@@ -206,6 +212,9 @@ void free_memblock ( void *ptr, size_t size ) {
                freeing->size += block->size;
                list_del ( &block->list );
        }
+
+       /* Update free memory counter */
+       freemem += size;
 }
 
 /**

diff --git a/src/include/malloc.h b/src/include/gpxe/malloc.h
similarity index 84%
rename from src/include/malloc.h
rename to src/include/gpxe/malloc.h
index b14ec78c8f25a563d8cc8bf37e97e27341d67c6b..0e18f6a35ca2092bd30acbc9d53164c34283dc1e 100644 (file)
--- a/src/include/malloc.h
+++ b/src/include/gpxe/malloc.h
@@ -1,5 +1,5 @@
-#ifndef _MALLOC_H
-#define _MALLOC_H
+#ifndef _GPXE_MALLOC_H
+#define _GPXE_MALLOC_H
 
 #include <stdint.h>
 
@@ -11,12 +11,14 @@
 
 /*
  * Prototypes for the standard functions (malloc() et al) are in
- * stdlib.h.  Include <malloc.h> only if you need the non-standard
- * functions, such as malloc_dma().
+ * stdlib.h.  Include <gpxe/malloc.h> only if you need the
+ * non-standard functions, such as malloc_dma().
  *
  */
 #include <stdlib.h>
 
+extern size_t freemem;
+
 extern void * alloc_memblock ( size_t size, size_t align );
 extern void free_memblock ( void *ptr, size_t size );
 extern void mpopulate ( void *start, size_t len );
@@ -52,4 +54,4 @@ static inline void free_dma ( void *ptr, size_t size ) {
        free_memblock ( ptr, size );
 }
 
-#endif /* _MALLOC_H */
+#endif /* _GPXE_MALLOC_H */

diff --git a/src/net/pkbuff.c b/src/net/pkbuff.c
index ac30883011c3dcad43b7b2ed55d466a66492dae4..63bc95f0f723222c78c1a83db2a74600497ec163 100644 (file)
--- a/src/net/pkbuff.c
+++ b/src/net/pkbuff.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdint.h>
-#include <malloc.h>
+#include <gpxe/malloc.h>
 #include <gpxe/pkbuff.h>
 
 /** @file