OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rm the unused calloc wrapper from memory_region

Browse Source 
it doesn't actually call calloc, so it's fairly pointless
This commit is contained in:
Daniel Micay 2013-02-14 18:28:04 -05:00
parent 2e0614750c
commit 1a41b484bf
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rt/memory_region.cpp
View File

@ -121,8 +121,10 @@ memory_region::realloc(void *mem, size_t orig_size) {
} }
void * void *
memory_region::malloc(size_t size, const char *tag, bool zero) { memory_region::malloc(size_t size, const char *tag) {
# if RUSTRT_TRACK_ALLOCATIONS >= 1
size_t old_size = size; size_t old_size = size;
# endif
size += HEADER_SIZE; size += HEADER_SIZE;
alloc_header *mem = (alloc_header *)::malloc(size); alloc_header *mem = (alloc_header *)::malloc(size);
if (mem == NULL) { if (mem == NULL) {
@ -143,18 +145,9 @@ memory_region::malloc(size_t size, const char *tag, bool zero) {
void *data = get_data(mem); void *data = get_data(mem);
claim_alloc(data); claim_alloc(data);
if(zero) {
memset(data, 0, old_size);
}
return data; return data;
} }
void *
memory_region::calloc(size_t size, const char *tag) {
return malloc(size, tag, true);
}
memory_region::~memory_region() { memory_region::~memory_region() {
if (_synchronized) { _lock.lock(); } if (_synchronized) { _lock.lock(); }
if (_live_allocations == 0 && !_detailed_leaks) { if (_live_allocations == 0 && !_detailed_leaks) {

3
src/rt/memory_region.h
View File

@ -77,8 +77,7 @@ private:
public: public:
memory_region(rust_env *env, bool synchronized); memory_region(rust_env *env, bool synchronized);
memory_region(memory_region *parent); memory_region(memory_region *parent);
void *malloc(size_t size, const char *tag, bool zero = true); void *malloc(size_t size, const char *tag);
void *calloc(size_t size, const char *tag);
void *realloc(void *mem, size_t size); void *realloc(void *mem, size_t size);
void free(void *mem); void free(void *mem);
~memory_region(); ~memory_region();

2
src/rt/rust_stack.cpp
View File

@ -58,7 +58,7 @@ check_stack_canary(stk_seg *stk) {
stk_seg * stk_seg *
create_stack(memory_region *region, size_t sz) { create_stack(memory_region *region, size_t sz) {
size_t total_sz = sizeof(stk_seg) + sz; size_t total_sz = sizeof(stk_seg) + sz;
stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack", false); stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack");
memset(stk, 0, sizeof(stk_seg)); memset(stk, 0, sizeof(stk_seg));
stk->end = (uintptr_t) &stk->data[sz]; stk->end = (uintptr_t) &stk->data[sz];
add_stack_canary(stk); add_stack_canary(stk);

5
src/rt/rust_task.cpp
View File

@ -450,11 +450,6 @@ rust_task::backtrace() {
#endif #endif
} }
void *
rust_task::calloc(size_t size, const char *tag) {
return local_region.calloc(size, tag);
}
size_t size_t
rust_task::get_next_stack_size(size_t min, size_t current, size_t requested) { rust_task::get_next_stack_size(size_t min, size_t current, size_t requested) {
LOG(this, mem, "calculating new stack size for 0x%" PRIxPTR, this); LOG(this, mem, "calculating new stack size for 0x%" PRIxPTR, this);