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

bugfix: use memcpy for unalign memory

Browse Source
This commit is contained in:
Cloud Wu
2014-04-18 17:48:17 +08:00
parent ac1a0a4c99
commit 072b603c1c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/cmemory.lua
View File

@@ -7,4 +7,4 @@ memory.dump()
print("Total memory:", memory.total()) print("Total memory:", memory.total())
print("Total block:", memory.block()) print("Total block:", memory.block())
skynet.exit() skynet.start(function() skynet.exit() end)

5
skynet-src/malloc_hook.c
View File

@@ -66,7 +66,7 @@ fill_prefix(char* ptr) {
uint32_t handle = skynet_current_handle(); uint32_t handle = skynet_current_handle();
size_t size = je_malloc_usable_size(ptr); size_t size = je_malloc_usable_size(ptr);
uint32_t *p = (uint32_t *)(ptr + size - sizeof(uint32_t)); uint32_t *p = (uint32_t *)(ptr + size - sizeof(uint32_t));
*p = handle; memcpy(p, &handle, sizeof(handle));
update_xmalloc_stat_alloc(handle, size); update_xmalloc_stat_alloc(handle, size);
return ptr; return ptr;
@@ -77,7 +77,8 @@ clean_prefix(char* ptr) {
uint32_t* rawptr = (uint32_t*)ptr - 1; uint32_t* rawptr = (uint32_t*)ptr - 1;
size_t size = je_malloc_usable_size(rawptr); size_t size = je_malloc_usable_size(rawptr);
uint32_t *p = (uint32_t *)(ptr + size - sizeof(uint32_t)); uint32_t *p = (uint32_t *)(ptr + size - sizeof(uint32_t));
uint32_t handle = *p; uint32_t handle;
memcpy(&handle, p, sizeof(handle));
update_xmalloc_stat_free(handle, size); update_xmalloc_stat_free(handle, size);
return ptr; return ptr;
} }