Skip to content

Add aco_mem_new macro #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
platipo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add aco_mem_new macro #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions aco.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,8 @@ aco_share_stack_t* aco_share_stack_new2(size_t sz, char guard_page_enabled){
}
}

aco_share_stack_t* p = (aco_share_stack_t*)malloc(sizeof(aco_share_stack_t));
assertalloc_ptr(p);
memset(p, 0, sizeof(aco_share_stack_t));
aco_share_stack_t* p;
aco_mem_calloc(p, 1);

if(guard_page_enabled != 0){
p->real_ptr = mmap(
Expand All @@ -263,8 +262,7 @@ aco_share_stack_t* aco_share_stack_new2(size_t sz, char guard_page_enabled){
} else {
//p->guard_page_enabled = 0;
p->sz = sz;
p->ptr = malloc(sz);
assertalloc_ptr(p->ptr);
aco_mem_new(p->ptr, sz);
}

p->owner = NULL;
Expand Down Expand Up @@ -308,9 +306,8 @@ aco_t* aco_create(
size_t save_stack_sz, aco_cofuncp_t fp, void* arg
){

aco_t* p = (aco_t*)malloc(sizeof(aco_t));
assertalloc_ptr(p);
memset(p, 0, sizeof(aco_t));
aco_t* p;
aco_mem_calloc(p, 1);

if(main_co != NULL){ // non-main co
assertptr(share_stack);
Expand Down Expand Up @@ -340,8 +337,7 @@ aco_t* aco_create(
if(save_stack_sz == 0){
save_stack_sz = 64;
}
p->save_stack.ptr = malloc(save_stack_sz);
assertalloc_ptr(p->save_stack.ptr);
aco_mem_new(p->save_stack.ptr, save_stack_sz);
p->save_stack.sz = save_stack_sz;
#if defined(__i386__) || defined(__x86_64__)
p->save_stack.valid_sz = 0;
Expand Down Expand Up @@ -399,8 +395,7 @@ void aco_resume(aco_t* resume_co){
break;
}
}
owner_co->save_stack.ptr = malloc(owner_co->save_stack.sz);
assertalloc_ptr(owner_co->save_stack.ptr);
aco_mem_new(owner_co->save_stack.ptr, owner_co->save_stack.sz);
}
// TODO: optimize the performance penalty of memcpy function call
// for very short memory span
Expand Down
13 changes: 13 additions & 0 deletions aco.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,19 @@ extern void aco_destroy(aco_t* co);
aco_exit1(aco_gtls_co); \
} while(0)

#ifdef __cplusplus
# error "Malloc break C++ code"
#else
# define aco_mem_new(ptr, size) do { \
ptr = malloc(size); \
assertalloc_ptr(ptr); \
} while (0);
# define aco_mem_calloc(ptr, count) do { \
ptr = calloc(count, sizeof(*ptr)); \
assertalloc_ptr(ptr); \
} while (0);
#endif

#ifdef __cplusplus
}
#endif
Expand Down