move declarations for malloc internals to malloc_impl.h

This commit is contained in:
Rich Felker 2018-09-06 16:32:49 -04:00
parent 18bf0829a7
commit 55a1c9c890
5 changed files with 7 additions and 7 deletions

View File

@ -20,6 +20,7 @@
#include "pthread_impl.h"
#include "libc.h"
#include "dynlink.h"
#include "malloc_impl.h"
static void error(const char *, ...);
@ -500,7 +501,6 @@ static void redo_lazy_relocs()
static void reclaim(struct dso *dso, size_t start, size_t end)
{
void __malloc_donate(char *, char *);
if (start >= dso->relro_start && start < dso->relro_end) start = dso->relro_end;
if (end >= dso->relro_start && end < dso->relro_end) end = dso->relro_start;
if (start >= end) return;

View File

@ -8,6 +8,10 @@ int __munmap(void *, size_t);
void *__mremap(void *, size_t, size_t, int, ...);
int __madvise(void *, size_t, int);
void *__expand_heap(size_t *);
void __malloc_donate(char *, char *);
struct chunk {
size_t psize, csize;
struct chunk *next, *prev;

View File

@ -4,6 +4,7 @@
#include <sys/mman.h>
#include "libc.h"
#include "syscall.h"
#include "malloc_impl.h"
/* This function returns true if the interval [old,new]
* intersects the 'len'-sized interval below &libc.auxv
@ -27,8 +28,6 @@ static int traverses_stack_p(uintptr_t old, uintptr_t new)
return 0;
}
void *__mmap(void *, size_t, int, int, int, off_t);
/* Expand the heap in-place if brk can be used, or otherwise via mmap,
* using an exponential lower bound on growth by mmap to make
* fragmentation asymptotically irrelevant. The size argument is both

View File

@ -3,11 +3,10 @@
#include <limits.h>
#include <errno.h>
#include "libc.h"
#include "malloc_impl.h"
#define ALIGN 16
void *__expand_heap(size_t *);
static void *__simple_malloc(size_t n)
{
static char *cur, *end;

View File

@ -123,8 +123,6 @@ void __dump_heap(int x)
}
#endif
void *__expand_heap(size_t *);
static struct chunk *expand_heap(size_t n)
{
static int heap_lock[2];