projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change uid_t, gid_t, and id_t to unsigned types
[musl]
/
src
/
malloc
/
malloc.c
diff --git
a/src/malloc/malloc.c
b/src/malloc/malloc.c
index
39c7d05
..
1a6d149
100644
(file)
--- a/
src/malloc/malloc.c
+++ b/
src/malloc/malloc.c
@@
-9,6
+9,10
@@
#include "atomic.h"
#include "pthread_impl.h"
#include "atomic.h"
#include "pthread_impl.h"
+#if defined(__GNUC__) && defined(__PIC__)
+#define inline inline __attribute__((always_inline))
+#endif
+
uintptr_t __brk(uintptr_t);
void *__mmap(void *, size_t, int, int, int, off_t);
int __munmap(void *, size_t);
uintptr_t __brk(uintptr_t);
void *__mmap(void *, size_t, int, int, int, off_t);
int __munmap(void *, size_t);
@@
-58,20
+62,20
@@
static struct {
/* Synchronization tools */
/* Synchronization tools */
-static void lock(volatile int *lk)
+static
inline
void lock(volatile int *lk)
{
if (!libc.threads_minus_1) return;
while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1);
}
{
if (!libc.threads_minus_1) return;
while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1);
}
-static void unlock(volatile int *lk)
+static
inline
void unlock(volatile int *lk)
{
if (!libc.threads_minus_1) return;
a_store(lk, 0);
if (lk[1]) __wake(lk, 1, 1);
}
{
if (!libc.threads_minus_1) return;
a_store(lk, 0);
if (lk[1]) __wake(lk, 1, 1);
}
-static void lock_bin(int i)
+static
inline
void lock_bin(int i)
{
if (libc.threads_minus_1)
lock(mal.bins[i].lock);
{
if (libc.threads_minus_1)
lock(mal.bins[i].lock);
@@
-79,7
+83,7
@@
static void lock_bin(int i)
mal.bins[i].head = mal.bins[i].tail = BIN_TO_CHUNK(i);
}
mal.bins[i].head = mal.bins[i].tail = BIN_TO_CHUNK(i);
}
-static void unlock_bin(int i)
+static
inline
void unlock_bin(int i)
{
if (!libc.threads_minus_1) return;
unlock(mal.bins[i].lock);
{
if (!libc.threads_minus_1) return;
unlock(mal.bins[i].lock);
@@
-192,7
+196,11
@@
static int init_malloc(size_t n)
return 0;
}
return 0;
}
- mal.brk = __brk(0) + 2*SIZE_ALIGN-1 & -SIZE_ALIGN;
+ mal.brk = __brk(0);
+#ifdef SHARED
+ mal.brk = mal.brk + PAGE_SIZE-1 & -PAGE_SIZE;
+#endif
+ mal.brk = mal.brk + 2*SIZE_ALIGN-1 & -SIZE_ALIGN;
c = expand_heap(n);
c = expand_heap(n);