JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add prototype to _malloc_lock() and *unlock() to malloc.h, and inlude this from nano-mallocr.c

Browse Source
This commit is contained in:
Jaap de Wolff
2018-02-12 12:23:42 +01:00
committed by Corinna Vinschen
parent fdc5f52808
commit 337cee51ca
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/include/malloc.h
View File

@@ -133,6 +133,10 @@ extern int malloc_trim (size_t);
extern int _malloc_trim_r (struct _reent *, size_t); extern int _malloc_trim_r (struct _reent *, size_t);
#endif #endif
extern void __malloc_lock(struct _reent *);
extern void __malloc_unlock(struct _reent *);
/* A compatibility routine for an earlier version of the allocator. */ /* A compatibility routine for an earlier version of the allocator. */
extern void mstats (char *); extern void mstats (char *);

16
newlib/libc/stdlib/nano-mallocr.c
View File

@@ -35,6 +35,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <malloc.h>
#if DEBUG #if DEBUG
#include <assert.h> #include <assert.h>
@@ -150,20 +151,6 @@ typedef struct malloc_chunk
struct malloc_chunk * next; struct malloc_chunk * next;
}chunk; }chunk;
/* Copied from malloc.h */
struct mallinfo
{
size_t arena; /* total space allocated from system */
size_t ordblks; /* number of non-inuse chunks */
size_t smblks; /* unused -- always zero */
size_t hblks; /* number of mmapped regions */
size_t hblkhd; /* total space in mmapped regions */
size_t usmblks; /* unused -- always zero */
size_t fsmblks; /* unused -- always zero */
size_t uordblks; /* total allocated space */
size_t fordblks; /* total non-inuse space */
size_t keepcost; /* top-most, releasable (via malloc_trim) space */
};
#define CHUNK_OFFSET ((malloc_size_t)(&(((struct malloc_chunk *)0)->next))) #define CHUNK_OFFSET ((malloc_size_t)(&(((struct malloc_chunk *)0)->next)))
@@ -181,7 +168,6 @@ extern void * nano_malloc(RARG malloc_size_t);
extern void nano_free (RARG void * free_p); extern void nano_free (RARG void * free_p);
extern void nano_cfree(RARG void * ptr); extern void nano_cfree(RARG void * ptr);
extern void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem); extern void * nano_calloc(RARG malloc_size_t n, malloc_size_t elem);
extern struct mallinfo nano_mallinfo(RONEARG);
extern void nano_malloc_stats(RONEARG); extern void nano_malloc_stats(RONEARG);
extern malloc_size_t nano_malloc_usable_size(RARG void * ptr); extern malloc_size_t nano_malloc_usable_size(RARG void * ptr);
extern void * nano_realloc(RARG void * ptr, malloc_size_t size); extern void * nano_realloc(RARG void * ptr, malloc_size_t size);