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

use macro for replace malloc api (see skynet_malloc.h)

Browse Source
This commit is contained in:
Cloud Wu
2014-04-18 22:35:47 +08:00
parent 23cfb11954
commit 7d835d222b
23 changed files with 125 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
skynet-src/malloc_hook.c
View File

@@ -3,11 +3,11 @@
#include <assert.h>
#include "malloc_hook.h"
#include "jemalloc.h"
#include "skynet.h"
static size_t _used_memory = 0;
static size_t _memory_block = 0;
typedef struct _mem_data {
@@ -20,10 +20,6 @@ typedef struct _mem_data {
static mem_data mem_stats[SLOT_SIZE];
static void _init() {
memset(mem_stats, 0, sizeof(mem_stats));
}
static size_t*
get_allocated_field(handle) {
int h = (handle & SLOT_SIZE) - 1;
@@ -88,50 +84,6 @@ static void malloc_oom(size_t size) {
abort();
}
// hook : malloc, realloc, memalign, free, calloc
void *
malloc(size_t size) {
void* ptr = je_malloc(size + PREFIX_SIZE);
if(!ptr) malloc_oom(size);
return fill_prefix(ptr);
}
void *
realloc(void *ptr, size_t size) {
if (ptr == NULL) return malloc(size);
void* rawptr = clean_prefix(ptr);
void *newptr = je_realloc(rawptr, size+PREFIX_SIZE);
if(!newptr) malloc_oom(size);
return fill_prefix(newptr);
}
#ifdef JEMALLOC_OVERRIDE_MEMALIGN
void *
memalign(size_t alignment, size_t size) {
void *ptr = je_memalign(alignment, size+PREFIX_SIZE);
if(!ptr) malloc_oom(size);
return fill_prefix(ptr);
}
#endif
void
free(void *ptr) {
if (ptr == NULL) return;
void* rawptr = clean_prefix(ptr);
je_free(rawptr);
}
void *
calloc(size_t nmemb,size_t size) {
void* ptr = je_calloc(nmemb + ((PREFIX_SIZE+size-1)/size), size );
if(!ptr) malloc_oom(size);
return fill_prefix(ptr);
}
size_t
malloc_used_memory(void) {
return _used_memory;
@@ -190,10 +142,54 @@ dump_c_mem() {
printf("+total: %zdkb\n",total >> 10);
}
/*
* init
*/
void __attribute__ ((constructor)) malloc_hook_init(void){
_init();
// hook : malloc, realloc, memalign, free, calloc
void *
skynet_malloc(size_t size) {
void* ptr = je_malloc(size + PREFIX_SIZE);
if(!ptr) malloc_oom(size);
return fill_prefix(ptr);
}
void *
skynet_realloc(void *ptr, size_t size) {
if (ptr == NULL) return malloc(size);
void* rawptr = clean_prefix(ptr);
void *newptr = je_realloc(rawptr, size+PREFIX_SIZE);
if(!newptr) malloc_oom(size);
return fill_prefix(newptr);
}
void
skynet_free(void *ptr) {
if (ptr == NULL) return;
void* rawptr = clean_prefix(ptr);
je_free(rawptr);
}
void *
skynet_calloc(size_t nmemb,size_t size) {
void* ptr = je_calloc(nmemb + ((PREFIX_SIZE+size-1)/size), size );
if(!ptr) malloc_oom(size);
return fill_prefix(ptr);
}
char *
skynet_strdup(const char *str) {
size_t sz = strlen(str);
char * ret = skynet_malloc(sz+1);
memcpy(ret, str, sz+1);
return ret;
}
void *
skynet_lalloc(void *ud, void *ptr, size_t osize, size_t nsize) {
if (nsize == 0) {
skynet_free(ptr);
return NULL;
} else {
return skynet_realloc(ptr, nsize);
}
}