OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

coroutine-sigaltstack: use helper for allocating stack memory 

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Peter Lieven 2016-09-27 11:58:44 +02:00 committed by Kevin Wolf
parent ddba15919b
commit 2f4aa23299
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/coroutine-sigaltstack.c
View File

@ -33,6 +33,7 @@
typedef struct { typedef struct {
Coroutine base; Coroutine base;
void *stack; void *stack;
size_t stack_size;
sigjmp_buf env; sigjmp_buf env;
} CoroutineSigAltStack; } CoroutineSigAltStack;
@ -143,7 +144,6 @@ static void coroutine_trampoline(int signal)
Coroutine *qemu_coroutine_new(void) Coroutine *qemu_coroutine_new(void)
{ {
const size_t stack_size = COROUTINE_STACK_SIZE;
CoroutineSigAltStack *co; CoroutineSigAltStack *co;
CoroutineThreadState *coTS; CoroutineThreadState *coTS;
struct sigaction sa; struct sigaction sa;
@ -164,7 +164,8 @@ Coroutine *qemu_coroutine_new(void)
*/ */
co = g_malloc0(sizeof(*co)); co = g_malloc0(sizeof(*co));
co->stack = g_malloc(stack_size); co->stack_size = COROUTINE_STACK_SIZE;
co->stack = qemu_alloc_stack(&co->stack_size);
co->base.entry_arg = &old_env; /* stash away our jmp_buf */ co->base.entry_arg = &old_env; /* stash away our jmp_buf */
coTS = coroutine_get_thread_state(); coTS = coroutine_get_thread_state();
@ -189,7 +190,7 @@ Coroutine *qemu_coroutine_new(void)
* Set the new stack. * Set the new stack.
*/ */
ss.ss_sp = co->stack; ss.ss_sp = co->stack;
ss.ss_size = stack_size; ss.ss_size = co->stack_size;
ss.ss_flags = 0; ss.ss_flags = 0;
if (sigaltstack(&ss, &oss) < 0) { if (sigaltstack(&ss, &oss) < 0) {
abort(); abort();
@ -253,7 +254,7 @@ void qemu_coroutine_delete(Coroutine *co_)
{ {
CoroutineSigAltStack *co = DO_UPCAST(CoroutineSigAltStack, base, co_); CoroutineSigAltStack *co = DO_UPCAST(CoroutineSigAltStack, base, co_);
g_free(co->stack); qemu_free_stack(co->stack, co->stack_size);
g_free(co); g_free(co);
} }