projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release notes for 0.9.7
[musl]
/
src
/
malloc
/
malloc.c
diff --git
a/src/malloc/malloc.c
b/src/malloc/malloc.c
index
db4287e
..
88a31ae
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);
@@
-43,8
+47,8
@@
static struct {
#define DONTCARE 16
#define RECLAIM 163840
#define DONTCARE 16
#define RECLAIM 163840
-#define CHUNK_SIZE(c) ((c)->csize &
SIZE_MASK
)
-#define CHUNK_PSIZE(c) ((c)->psize &
SIZE_MASK
)
+#define CHUNK_SIZE(c) ((c)->csize &
-2
)
+#define CHUNK_PSIZE(c) ((c)->psize &
-2
)
#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c)))
#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c)))
#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c)))
#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c)))
#define MEM_TO_CHUNK(p) (struct chunk *)((char *)(p) - OVERHEAD)
@@
-52,28
+56,26
@@
static struct {
#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
#define C_INUSE ((size_t)1)
#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
#define C_INUSE ((size_t)1)
-#define C_FLAGS ((size_t)3)
-#define C_SIZE SIZE_MASK
#define IS_MMAPPED(c) !((c)->csize & (C_INUSE))
/* Synchronization tools */
#define IS_MMAPPED(c) !((c)->csize & (C_INUSE))
/* 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);
@@
-81,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);
@@
-394,7
+396,7
@@
void *realloc(void *p, size_t n)
size_t oldlen = n0 + extra;
size_t newlen = n + extra;
/* Crash on realloc of freed chunk */
size_t oldlen = n0 + extra;
size_t newlen = n + extra;
/* Crash on realloc of freed chunk */
- if (
(uintptr_t)base < mal.brk) *(volatile char *)0=0
;
+ if (
extra & 1) a_crash()
;
if (newlen < PAGE_SIZE && (new = malloc(n))) {
memcpy(new, p, n-OVERHEAD);
free(p);
if (newlen < PAGE_SIZE && (new = malloc(n))) {
memcpy(new, p, n-OVERHEAD);
free(p);
@@
-457,7
+459,7
@@
void free(void *p)
char *base = (char *)self - extra;
size_t len = CHUNK_SIZE(self) + extra;
/* Crash on double free */
char *base = (char *)self - extra;
size_t len = CHUNK_SIZE(self) + extra;
/* Crash on double free */
- if (
(uintptr_t)base < mal.brk) *(volatile char *)0=0
;
+ if (
extra & 1) a_crash()
;
__munmap(base, len);
return;
}
__munmap(base, len);
return;
}