lby/mkrtos-real
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新u_malloc分配器

Browse Source
This commit is contained in:
zhangzheng
2025-03-09 23:53:18 +08:00
parent 66b79ce2ea
commit 79d4d1cad3
25 changed files with 677 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mkrtos_user/lib/libc_backend/src/armv7_8m/mm_backend.c
View File

@@ -208,10 +208,12 @@ long be_munmap(void *start, size_t len)
assert(info);
void *heap_addr = (void *)((umword_t)TASK_RAM_BASE() + info->i.heap_offset - info->i.data_offset);
if (len & (PAGE_SIZE - 1))
{
return -EINVAL;
}
len = ALIGN(len, MK_PAGE_SIZE);
// if (len & (PAGE_SIZE - 1))
// {
// return -EINVAL;
// }
// printf("munmap 0x%x, 0x%x.\n", start, len);
tag = u_vmam_free(VMA_PROT, (addr_t)(start), len);
if (msg_tag_get_val(tag) < 0)

2
mkrtos_user/lib/libc_backend/src/be_exit.c
View File

@@ -65,7 +65,7 @@ void be_exit(long exit_code)
while (1)
{
// thread_ipc_wait(ipc_timeout_create2(0, 0), NULL, -1);
u_sleep_ms((umword_t)-1);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

7
mkrtos_user/lib/libc_backend/src/fs_backend.c
View File

@@ -384,6 +384,9 @@ long be_ioctl(long fd, long req, void *args)
ret = fs_ioctl(u_fd.priv_fd, req, args);
}
break;
default:
ret = -ENOSYS;
break;
}
return ret;
}
@@ -519,7 +522,7 @@ long be_poll(struct pollfd *fds, nfds_t n, int timeout)
if (timeout == -1)
{
again1:
ret = ioctl(fds[0].fd, FIONREAD, &len);
ret = be_ioctl(fds[0].fd, FIONREAD, &len);
if (ret < 0)
{
return ret;
@@ -534,7 +537,7 @@ long be_poll(struct pollfd *fds, nfds_t n, int timeout)
else
{
again:
ret = ioctl(fds[0].fd, FIONREAD, &len);
ret = be_ioctl(fds[0].fd, FIONREAD, &len);
if (ret < 0)
{
return ret;

3
mkrtos_user/lib/sys/inc/u_arch.h
View File

@@ -2,8 +2,9 @@
#include "u_types.h"
#include "u_arch_hard.h"
#ifndef PAGE_SIZE
#define PAGE_SIZE (1UL << CONFIG_PAGE_SHIFT)
#endif
#define MK_PAGE_SIZE (PAGE_SIZE)
#define WORD_BYTES (sizeof(void *))
#define WORD_BITS (WORD_BYTES * 8)

25
mkrtos_user/lib/util/inc/u_malloc.h
View File

@@ -1,14 +1,23 @@
#pragma once
#include <string.h>
// struct allocmem
// {
// void *ptr;
// size_t size;
// struct allocmem *next;
// };
struct allocmem
void *u_malloc(size_t n);
static inline void *u_calloc(size_t size, int nmemb)
{
void *ptr;
size_t size;
struct allocmem *next;
};
void *mem = u_malloc(size * nmemb);
void *u_malloc(size_t size);
void *u_calloc(size_t size, int nmemb);
if (mem)
{
memset(mem, 0, size * nmemb);
}
return mem;
}
void *u_realloc(void *old, size_t size);
void u_free(void *ptr);
void u_free(void *p);
// void spurge();

53
mkrtos_user/lib/util/src/aligned_alloc.c Normal file
View File

@@ -0,0 +1,53 @@
#include <stdlib.h>
#include <stdint.h>
#include <errno.h>
#include "malloc_impl.h"
void *aligned_alloc(size_t align, size_t len)
{
unsigned char *mem, *new;
if ((align & -align) != align) {
errno = EINVAL;
return 0;
}
if (len > SIZE_MAX - align ||
(__malloc_replaced && !__aligned_alloc_replaced)) {
errno = ENOMEM;
return 0;
}
if (align <= SIZE_ALIGN)
return malloc(len);
if (!(mem = malloc(len + align-1)))
return 0;
new = (void *)((uintptr_t)mem + align-1 & -align);
if (new == mem) return mem;
struct chunk *c = MEM_TO_CHUNK(mem);
struct chunk *n = MEM_TO_CHUNK(new);
if (IS_MMAPPED(c)) {
/* Apply difference between aligned and original
* address to the "extra" field of mmapped chunk. */
n->psize = c->psize + (new-mem);
n->csize = c->csize - (new-mem);
return new;
}
struct chunk *t = NEXT_CHUNK(c);
/* Split the allocated chunk into two chunks. The aligned part
* that will be used has the size in its footer reduced by the
* difference between the aligned and original addresses, and
* the resulting size copied to its header. A new header and
* footer are written for the split-off part to be freed. */
n->psize = c->csize = C_INUSE | (new-mem);
n->csize = t->psize -= new-mem;
__bin_chunk(c);
return new;
}

38
mkrtos_user/lib/util/src/malloc_impl.h Normal file
View File

@@ -0,0 +1,38 @@
#ifndef MALLOC_IMPL_H
#define MALLOC_IMPL_H
#include <sys/mman.h>
#include "dynlink.h"
struct chunk {
size_t psize, csize;
struct chunk *next, *prev;
};
struct bin {
volatile int lock[2];
struct chunk *head;
struct chunk *tail;
};
#define SIZE_ALIGN (4*sizeof(size_t))
#define SIZE_MASK (-SIZE_ALIGN)
#define OVERHEAD (2*sizeof(size_t))
#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN)
#define DONTCARE 16
#define RECLAIM 163840
#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 CHUNK_TO_MEM(c) (void *)((char *)(c) + OVERHEAD)
#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head))
#define C_INUSE ((size_t)1)
#define IS_MMAPPED(c) !((c)->csize & (C_INUSE))
#endif

9
mkrtos_user/lib/util/src/malloc_usable_size.c Normal file
View File

@@ -0,0 +1,9 @@
#include <malloc.h>
#include "malloc_impl.h"
hidden void *(*const __realloc_dep)(void *, size_t) = realloc;
size_t malloc_usable_size(void *p)
{
return p ? CHUNK_SIZE(MEM_TO_CHUNK(p)) - OVERHEAD : 0;
}

700
mkrtos_user/lib/util/src/u_malloc.c
View File

@@ -1,206 +1,558 @@
/**
* u_malloc.c: a simple memory allocator for use in MKRTOS.
* 使用缺页模拟申请内存，申请的内存不能用于栈内存。
*/
#define _GNU_SOURCE
#include <stdlib.h>
#include <sys/types.h>
#include <sys/shm.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <string.h>
#include <u_malloc.h>
#include <u_mutex.h>
#include <u_hd_man.h>
#include <assert.h>
#include <limits.h>
#include <stdint.h>
#include <errno.h>
#include <sys/mman.h>
#include "libc.h"
#include "atomic.h"
#include "pthread_impl.h"
#include "malloc_impl.h"
// #include "fork_impl.h"
static struct allocmem *memlocs = NULL;
static u_mutex_t lock_mutex = U_MUTEX_INIT;
void u_free(void *p);
static void __bin_chunk(struct chunk *self);
// #define malloc __libc_malloc_impl
// #define realloc __libc_realloc
// #define free __libc_free
static void alloc_lock(void)
#if defined(__GNUC__) && defined(__PIC__)
#define inline inline __attribute__((always_inline))
#endif
static struct {
volatile uint64_t binmap;
struct bin bins[64];
volatile int split_merge_lock[2];
} mal;
/* Synchronization tools */
static inline void lock(volatile int *lk)
{
obj_handler_t lock_hd;
if (lock_mutex.obj == HANDLER_INVALID)
{
lock_hd = handler_alloc();
assert(lock_hd != HANDLER_INVALID);
u_mutex_init(&lock_mutex, lock_hd);
}
u_mutex_lock(&lock_mutex, 0, NULL);
}
static void alloc_unlock(void)
{
assert(lock_mutex.obj != HANDLER_INVALID);
u_mutex_unlock(&lock_mutex);
int need_locks = libc.need_locks;
if (need_locks) {
while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1);
if (need_locks < 0) libc.need_locks = 0;
}
}
static struct allocmem *new_alloc_mem()
static inline void unlock(volatile int *lk)
{
struct allocmem *ptr;
if ((ptr = mmap(NULL, sizeof(struct allocmem), PROT_READ | PROT_WRITE | PROT_PFS, MAP_POPULATE | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)) == MAP_FAILED)
{
return NULL;
}
else
{
ptr->ptr = NULL;
ptr->size = 0;
ptr->next = NULL;
return ptr;
}
if (lk[0]) {
a_store(lk, 0);
if (lk[1]) __wake(lk, 1, 1);
}
}
static void free_alloc_mem(struct allocmem *ptr)
static inline void lock_bin(int i)
{
if (ptr != NULL)
{
munmap(ptr, sizeof(struct allocmem));
}
lock(mal.bins[i].lock);
if (!mal.bins[i].head)
mal.bins[i].head = mal.bins[i].tail = BIN_TO_CHUNK(i);
}
/// Pass a valid pointer (or NULL) to store the resultant into
struct allocmem *insert_end(struct allocmem *ptr, struct allocmem **outVar)
static inline void unlock_bin(int i)
{
if (ptr == NULL)
{
struct allocmem *outAble = new_alloc_mem();
if (outVar != NULL)
*outVar = outAble;
return (outAble);
}
else
{
ptr->next = insert_end(ptr->next, outVar);
return ptr;
}
unlock(mal.bins[i].lock);
}
struct allocmem *find(struct allocmem *ptr, void *searchPtr)
static int first_set(uint64_t x)
{
if (ptr == NULL)
{
return NULL;
}
if (ptr->ptr == searchPtr)
return ptr;
return find(ptr->next, searchPtr);
#if 1
return a_ctz_64(x);
#else
static const char debruijn64[64] = {
0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28,
62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11,
63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10,
51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12
};
static const char debruijn32[32] = {
0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
};
if (sizeof(long) < 8) {
uint32_t y = x;
if (!y) {
y = x>>32;
return 32 + debruijn32[(y&-y)*0x076be629 >> 27];
}
return debruijn32[(y&-y)*0x076be629 >> 27];
}
return debruijn64[(x&-x)*0x022fdd63cc95386dull >> 58];
#endif
}
struct allocmem *find_and_remove(struct allocmem *ptr, void *searchPtr)
static const unsigned char bin_tab[60] = {
32,33,34,35,36,36,37,37,38,38,39,39,
40,40,40,40,41,41,41,41,42,42,42,42,43,43,43,43,
44,44,44,44,44,44,44,44,45,45,45,45,45,45,45,45,
46,46,46,46,46,46,46,46,47,47,47,47,47,47,47,47,
};
static int bin_index(size_t x)
{
if (ptr == NULL)
{
return NULL;
}
if (ptr->ptr == searchPtr)
{
struct allocmem *nextUp = ptr->next;
free_alloc_mem(ptr);
return nextUp;
}
ptr->next = find_and_remove(ptr->next, searchPtr);
return ptr;
x = x / SIZE_ALIGN - 1;
if (x <= 32) return x;
if (x < 512) return bin_tab[x/8-4];
if (x > 0x1c00) return 63;
return bin_tab[x/128-4] + 16;
}
void *u_malloc(size_t size)
static int bin_index_up(size_t x)
{
struct allocmem *info = NULL;
alloc_lock();
memlocs = insert_end(memlocs, &info);
if (info == NULL)
{
/// Failed to initialize metadata info
alloc_unlock();
return NULL;
}
void *ptr;
if ((ptr = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_PFS, MAP_POPULATE | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)) == MAP_FAILED)
{
/// Failed to make data, revert changes
memlocs = find_and_remove(memlocs, NULL);
}
else
{
/// Got it together
info->ptr = ptr;
info->size = size;
/// Return this precious pointer
alloc_unlock();
return ptr;
}
alloc_unlock();
return NULL;
x = x / SIZE_ALIGN - 1;
if (x <= 32) return x;
x--;
if (x < 512) return bin_tab[x/8-4] + 1;
return bin_tab[x/128-4] + 17;
}
void *u_calloc(size_t size, int nmemb)
#if 0
void __dump_heap(int x)
{
size_t isOverFlow = size * nmemb;
if (size != isOverFlow / nmemb)
{
/// Overflow, dont try
return NULL;
}
void *newPtr = u_malloc(isOverFlow);
if (newPtr == NULL)
{
/// Failed to init
return NULL;
}
/// A character is a byte of data that can be managed
for (size_t loc = 0; loc < isOverFlow; loc++)
{
*(((char *)newPtr) + loc) = 0;
}
return newPtr;
struct chunk *c;
int i;
for (c = (void *)mal.heap; CHUNK_SIZE(c); c = NEXT_CHUNK(c))
fprintf(stderr, "base %p size %zu (%d) flags %d/%d\n",
c, CHUNK_SIZE(c), bin_index(CHUNK_SIZE(c)),
c->csize & 15,
NEXT_CHUNK(c)->psize & 15);
for (i=0; i<64; i++) {
if (mal.bins[i].head != BIN_TO_CHUNK(i) && mal.bins[i].head) {
fprintf(stderr, "bin %d: %p\n", i, mal.bins[i].head);
if (!(mal.binmap & 1ULL<<i))
fprintf(stderr, "missing from binmap!\n");
} else if (mal.binmap & 1ULL<<i)
fprintf(stderr, "binmap wrongly contains %d!\n", i);
}
}
void *u_realloc(void *old, size_t size)
{
struct allocmem *info;
size_t old_size;
void *new_mem = u_malloc(size);
#endif
if (!new_mem)
{
return NULL;
}
alloc_lock();
info = find(memlocs, old);
if (info == NULL)
{
alloc_unlock();
u_free(new_mem);
return NULL;
}
old_size = info->size;
alloc_unlock();
memcpy(new_mem, old, old_size);
u_free(old);
return new_mem;
}
void u_free(void *ptr)
/* This function returns true if the interval [old,new]
* intersects the 'len'-sized interval below &libc.auxv
* (interpreted as the main-thread stack) or below &b
* (the current stack). It is used to defend against
* buggy brk implementations that can cross the stack. */
static int traverses_stack_p(uintptr_t old, uintptr_t new)
{
if (ptr == NULL)
return;
alloc_lock();
struct allocmem *info = find(memlocs, ptr);
if (info == NULL)
{
alloc_unlock();
return;
}
munmap(info->ptr, info->size);
memlocs = find_and_remove(memlocs, ptr);
alloc_unlock();
const uintptr_t len = 8<<20;
uintptr_t a, b;
b = (uintptr_t)libc.auxv;
a = b > len ? b-len : 0;
if (new>a && old<b) return 1;
b = (uintptr_t)&b;
a = b > len ? b-len : 0;
if (new>a && old<b) return 1;
return 0;
}
/// Violently Remove Everything
// void spurge()
// {
// while (memlocs)
// {
// sfree(memlocs->ptr);
// }
// }
/* 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
* an input and an output, since the caller needs to know the size
* allocated, which will be larger than requested due to page alignment
* and mmap minimum size rules. The caller is responsible for locking
* to prevent concurrent calls. */
static void *__expand_heap(size_t *pn)
{
static uintptr_t brk;
static unsigned mmap_step;
size_t n = *pn;
if (n > SIZE_MAX/2 - PAGE_SIZE) {
errno = ENOMEM;
return 0;
}
n += -n & PAGE_SIZE-1;
if (!brk) {
brk = __syscall(SYS_brk, 0);
brk += -brk & PAGE_SIZE-1;
}
if (n < SIZE_MAX-brk && !traverses_stack_p(brk, brk+n)
&& __syscall(SYS_brk, brk+n)==brk+n) {
*pn = n;
brk += n;
return (void *)(brk-n);
}
size_t min = (size_t)PAGE_SIZE << mmap_step/2;
if (n < min) n = min;
void *area = __mmap(0, n, PROT_READ|PROT_WRITE|PROT_PFS,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if (area == MAP_FAILED) return 0;
*pn = n;
mmap_step++;
return area;
}
static struct chunk *expand_heap(size_t n)
{
static void *end;
void *p;
struct chunk *w;
/* The argument n already accounts for the caller's chunk
* overhead needs, but if the heap can't be extended in-place,
* we need room for an extra zero-sized sentinel chunk. */
n += SIZE_ALIGN;
p = __expand_heap(&n);
if (!p) return 0;
/* If not just expanding existing space, we need to make a
* new sentinel chunk below the allocated space. */
if (p != end) {
/* Valid/safe because of the prologue increment. */
n -= SIZE_ALIGN;
p = (char *)p + SIZE_ALIGN;
w = MEM_TO_CHUNK(p);
w->psize = 0 | C_INUSE;
}
/* Record new heap end and fill in footer. */
end = (char *)p + n;
w = MEM_TO_CHUNK(end);
w->psize = n | C_INUSE;
w->csize = 0 | C_INUSE;
/* Fill in header, which may be new or may be replacing a
* zero-size sentinel header at the old end-of-heap. */
w = MEM_TO_CHUNK(p);
w->csize = n | C_INUSE;
return w;
}
static int adjust_size(size_t *n)
{
/* Result of pointer difference must fit in ptrdiff_t. */
if (*n-1 > PTRDIFF_MAX - SIZE_ALIGN - PAGE_SIZE) {
if (*n) {
errno = ENOMEM;
return -1;
} else {
*n = SIZE_ALIGN;
return 0;
}
}
*n = (*n + OVERHEAD + SIZE_ALIGN - 1) & SIZE_MASK;
return 0;
}
static void unbin(struct chunk *c, int i)
{
if (c->prev == c->next)
a_and_64(&mal.binmap, ~(1ULL<<i));
c->prev->next = c->next;
c->next->prev = c->prev;
c->csize |= C_INUSE;
NEXT_CHUNK(c)->psize |= C_INUSE;
}
static void bin_chunk(struct chunk *self, int i)
{
self->next = BIN_TO_CHUNK(i);
self->prev = mal.bins[i].tail;
self->next->prev = self;
self->prev->next = self;
if (self->prev == BIN_TO_CHUNK(i))
a_or_64(&mal.binmap, 1ULL<<i);
}
static void trim(struct chunk *self, size_t n)
{
size_t n1 = CHUNK_SIZE(self);
struct chunk *next, *split;
if (n >= n1 - DONTCARE) return;
next = NEXT_CHUNK(self);
split = (void *)((char *)self + n);
split->psize = n | C_INUSE;
split->csize = n1-n;
next->psize = n1-n;
self->csize = n | C_INUSE;
int i = bin_index(n1-n);
lock_bin(i);
bin_chunk(split, i);
unlock_bin(i);
}
void *u_malloc(size_t n)
{
struct chunk *c;
int i, j;
uint64_t mask;
if (adjust_size(&n) < 0) return 0;
if (n > MMAP_THRESHOLD) {
size_t len = n + OVERHEAD + PAGE_SIZE - 1 & -PAGE_SIZE;
char *base = __mmap(0, len, PROT_READ|PROT_WRITE | PROT_PFS,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if (base == (void *)-1) return 0;
c = (void *)(base + SIZE_ALIGN - OVERHEAD);
c->csize = len - (SIZE_ALIGN - OVERHEAD);
c->psize = SIZE_ALIGN - OVERHEAD;
return CHUNK_TO_MEM(c);
}
i = bin_index_up(n);
if (i<63 && (mal.binmap & (1ULL<<i))) {
lock_bin(i);
c = mal.bins[i].head;
if (c != BIN_TO_CHUNK(i) && CHUNK_SIZE(c)-n <= DONTCARE) {
unbin(c, i);
unlock_bin(i);
return CHUNK_TO_MEM(c);
}
unlock_bin(i);
}
lock(mal.split_merge_lock);
for (mask = mal.binmap & -(1ULL<<i); mask; mask -= (mask&-mask)) {
j = first_set(mask);
lock_bin(j);
c = mal.bins[j].head;
if (c != BIN_TO_CHUNK(j)) {
unbin(c, j);
unlock_bin(j);
break;
}
unlock_bin(j);
}
if (!mask) {
c = expand_heap(n);
if (!c) {
unlock(mal.split_merge_lock);
return 0;
}
}
trim(c, n);
unlock(mal.split_merge_lock);
return CHUNK_TO_MEM(c);
}
#if 0
int __malloc_allzerop(void *p)
{
return IS_MMAPPED(MEM_TO_CHUNK(p));
}
#endif
void *u_realloc(void *p, size_t n)
{
struct chunk *self, *next;
size_t n0, n1;
void *new;
if (!p) return malloc(n);
if (adjust_size(&n) < 0) return 0;
self = MEM_TO_CHUNK(p);
n1 = n0 = CHUNK_SIZE(self);
if (n<=n0 && n0-n<=DONTCARE) return p;
if (IS_MMAPPED(self)) {
size_t extra = self->psize;
char *base = (char *)self - extra;
size_t oldlen = n0 + extra;
size_t newlen = n + extra;
/* Crash on realloc of freed chunk */
if (extra & 1) a_crash();
if (newlen < PAGE_SIZE && (new = malloc(n-OVERHEAD))) {
n0 = n;
goto copy_free_ret;
}
newlen = (newlen + PAGE_SIZE-1) & -PAGE_SIZE;
if (oldlen == newlen) return p;
base = __mremap(base, oldlen, newlen, MREMAP_MAYMOVE);
if (base == (void *)-1)
goto copy_realloc;
self = (void *)(base + extra);
self->csize = newlen - extra;
return CHUNK_TO_MEM(self);
}
next = NEXT_CHUNK(self);
/* Crash on corrupted footer (likely from buffer overflow) */
if (next->psize != self->csize) a_crash();
if (n < n0) {
int i = bin_index_up(n);
int j = bin_index(n0);
if (i<j && (mal.binmap & (1ULL << i)))
goto copy_realloc;
struct chunk *split = (void *)((char *)self + n);
self->csize = split->psize = n | C_INUSE;
split->csize = next->psize = n0-n | C_INUSE;
__bin_chunk(split);
return CHUNK_TO_MEM(self);
}
lock(mal.split_merge_lock);
size_t nsize = next->csize & C_INUSE ? 0 : CHUNK_SIZE(next);
if (n0+nsize >= n) {
int i = bin_index(nsize);
lock_bin(i);
if (!(next->csize & C_INUSE)) {
unbin(next, i);
unlock_bin(i);
next = NEXT_CHUNK(next);
self->csize = next->psize = n0+nsize | C_INUSE;
trim(self, n);
unlock(mal.split_merge_lock);
return CHUNK_TO_MEM(self);
}
unlock_bin(i);
}
unlock(mal.split_merge_lock);
copy_realloc:
/* As a last resort, allocate a new chunk and copy to it. */
new = malloc(n-OVERHEAD);
if (!new) return 0;
copy_free_ret:
memcpy(new, p, (n<n0 ? n : n0) - OVERHEAD);
u_free(CHUNK_TO_MEM(self));
return new;
}
static void __bin_chunk(struct chunk *self)
{
struct chunk *next = NEXT_CHUNK(self);
/* Crash on corrupted footer (likely from buffer overflow) */
if (next->psize != self->csize) a_crash();
lock(mal.split_merge_lock);
size_t osize = CHUNK_SIZE(self), size = osize;
/* Since we hold split_merge_lock, only transition from free to
* in-use can race; in-use to free is impossible */
size_t psize = self->psize & C_INUSE ? 0 : CHUNK_PSIZE(self);
size_t nsize = next->csize & C_INUSE ? 0 : CHUNK_SIZE(next);
if (psize) {
int i = bin_index(psize);
lock_bin(i);
if (!(self->psize & C_INUSE)) {
struct chunk *prev = PREV_CHUNK(self);
unbin(prev, i);
self = prev;
size += psize;
}
unlock_bin(i);
}
if (nsize) {
int i = bin_index(nsize);
lock_bin(i);
if (!(next->csize & C_INUSE)) {
unbin(next, i);
next = NEXT_CHUNK(next);
size += nsize;
}
unlock_bin(i);
}
int i = bin_index(size);
lock_bin(i);
self->csize = size;
next->psize = size;
bin_chunk(self, i);
unlock(mal.split_merge_lock);
/* Replace middle of large chunks with fresh zero pages */
if (size > RECLAIM && (size^(size-osize)) > size-osize) {
uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE;
uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE;
int e = errno;
#if 1
__madvise((void *)a, b-a, MADV_DONTNEED);
#else
__mmap((void *)a, b-a, PROT_READ|PROT_WRITE | PROT_PFS,
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0);
#endif
errno = e;
}
unlock_bin(i);
}
static void unmap_chunk(struct chunk *self)
{
size_t extra = self->psize;
char *base = (char *)self - extra;
size_t len = CHUNK_SIZE(self) + extra;
/* Crash on double free */
if (extra & 1) a_crash();
int e = errno;
__munmap(base, len);
errno = e;
}
void u_free(void *p)
{
if (!p) return;
struct chunk *self = MEM_TO_CHUNK(p);
if (IS_MMAPPED(self))
unmap_chunk(self);
else
__bin_chunk(self);
}
#if 0
static void __malloc_donate(char *start, char *end)
{
size_t align_start_up = (SIZE_ALIGN-1) & (-(uintptr_t)start - OVERHEAD);
size_t align_end_down = (SIZE_ALIGN-1) & (uintptr_t)end;
/* Getting past this condition ensures that the padding for alignment
* and header overhead will not overflow and will leave a nonzero
* multiple of SIZE_ALIGN bytes between start and end. */
if (end - start <= OVERHEAD + align_start_up + align_end_down)
return;
start += align_start_up + OVERHEAD;
end -= align_end_down;
struct chunk *c = MEM_TO_CHUNK(start), *n = MEM_TO_CHUNK(end);
c->psize = n->csize = C_INUSE;
c->csize = n->psize = C_INUSE | (end-start);
__bin_chunk(c);
}
void __malloc_atfork(int who)
{
if (who<0) {
lock(mal.split_merge_lock);
for (int i=0; i<64; i++)
lock(mal.bins[i].lock);
} else if (!who) {
for (int i=0; i<64; i++)
unlock(mal.bins[i].lock);
unlock(mal.split_merge_lock);
} else {
for (int i=0; i<64; i++)
mal.bins[i].lock[0] = mal.bins[i].lock[1] = 0;
mal.split_merge_lock[1] = 0;
mal.split_merge_lock[0] = 0;
}
}
#endif

2
mkrtos_user/server/fs/appfs/main.c
View File

@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
#endif
while (1)
{
u_sleep_ms((umword_t)(-1));
u_sleep_ms(U_SLEEP_ALWAYS);
}
return 0;
}

2
mkrtos_user/server/init/src/init.c
View File

@@ -80,7 +80,7 @@ int main(int argc, char *args[])
// task_unmap(TASK_THIS, vpage_create_raw3(KOBJ_DELETE_RIGHT, 0, THREAD_MAIN));
while (1)
{
u_sleep_ms((umword_t)(-1));
u_sleep_ms(U_SLEEP_ALWAYS);
}
return 0;
}

2
mkrtos_user/server/init/src/tty.c
View File

@@ -98,7 +98,7 @@ static void console_read_func(void)
// handler_free_umap(cons_obj.hd_cons_read);
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/server/net/src/main.c
View File

@@ -135,7 +135,7 @@ again:
}
else
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}
return 0;

2
mkrtos_user/user/app/vi/heap_stack.c
View File

@@ -1,6 +1,6 @@
#define HEAP_SIZE (512)
#define STACK_SIZE (1024 * 2)
#define STACK_SIZE (1024 * 3)
#if defined(__CC_ARM)
#define HEAP_ATTR SECTION("HEAP") __attribute__((zero_init))

1
mkrtos_user/user/app/vi/vi-master/vi_utils.h
View File

@@ -21,7 +21,6 @@
#include <poll.h>
#include <sys/types.h>
#include <u_malloc.h>
#define BB_VER "latest: 2021-04-07"
#define BB_BT "busybox vi"

2
mkrtos_user/user/drv/ATSURFF437/eth/main.c
View File

@@ -102,6 +102,6 @@ int main(int argc, char *argv[])
meta_reg_svr_obj(&net_drv.svr, BLK_DRV_PROT);
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/user/drv/ATSURFF437/i2c/main.c
View File

@@ -49,6 +49,6 @@ int main(int argc, char *argv[])
ns_register("/i2c2", hd, 0);
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/user/drv/ATSURFF437/pca9555/main.c
View File

@@ -49,6 +49,6 @@ int main(int argc, char *argv[])
ns_register("/pca9555", hd, 0);
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/user/drv/ATSURFF437/snd/main.c
View File

@@ -93,6 +93,6 @@ int main(int argc, char *argv[])
meta_reg_svr_obj(&snd_drv.svr, BLK_DRV_PROT);
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/user/drv/STM32F205/block/main.c
View File

@@ -128,6 +128,6 @@ int main(int argc, char *argv[])
while (1)
{
// rpc_loop();
u_sleep_ms((umword_t)(-1));
u_sleep_ms(U_SLEEP_ALWAYS);
}
}

2
mkrtos_user/user/drv/common/ram_block/main.c
View File

@@ -159,6 +159,6 @@ int main(int argc, char *argv[])
while (1)
{
u_sleep_ms(0);
u_sleep_ms(U_SLEEP_ALWAYS);
}
}