lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Cloud Wu
2024-06-24 23:15:20 +08:00
parent f214c68ff3
commit aa20f7642b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
skynet-src/malloc_hook.c
View File

@@ -199,8 +199,8 @@ void *
skynet_realloc(void *ptr, size_t size) { skynet_realloc(void *ptr, size_t size) {
if (ptr == NULL) return skynet_malloc(size); if (ptr == NULL) return skynet_malloc(size);
void* rawptr = clean_prefix(ptr);
uint32_t cookie_size = get_cookie_size(ptr); uint32_t cookie_size = get_cookie_size(ptr);
void* rawptr = clean_prefix(ptr);
void *newptr = je_realloc(rawptr, size+cookie_size); void *newptr = je_realloc(rawptr, size+cookie_size);
if(!newptr) malloc_oom(size); if(!newptr) malloc_oom(size);
return fill_prefix(newptr, size, cookie_size); return fill_prefix(newptr, size, cookie_size);
@@ -216,10 +216,9 @@ skynet_free(void *ptr) {
void * void *
skynet_calloc(size_t nmemb, size_t size) { skynet_calloc(size_t nmemb, size_t size) {
uint32_t cookie_n = (PREFIX_SIZE+size-1)/size; uint32_t cookie_n = (PREFIX_SIZE+size-1)/size;
uint32_t n = nmemb + cookie_n; void* ptr = je_calloc(nmemb + cookie_n, size);
void* ptr = je_calloc(n, size); if(!ptr) malloc_oom(nmemb * size);
if(!ptr) malloc_oom(n * size); return fill_prefix(ptr, nmemb * size, cookie_n * size);
return fill_prefix(ptr, n * size, cookie_n * size);
} }
static inline uint32_t static inline uint32_t