From 4751a74e25714fdbb34b98bf1a0dad40d073b868 Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 28 Jan 2010 15:51:36 +0000 Subject: [PATCH 1/1] reindent and cosmetics git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7037 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_context_sysv.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 7ad1d9829a..03e08ab854 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -33,7 +33,7 @@ typedef struct s_smx_ctx_sysv { static smx_context_t smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg); + void_f_pvoid_t cleanup_func, void* cleanup_arg); static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory); @@ -46,7 +46,7 @@ static void smx_ctx_sysv_stop(smx_context_t context); static void smx_ctx_sysv_suspend(smx_context_t context); static void - smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context); +smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context); static void smx_ctx_sysv_wrapper(void); @@ -73,31 +73,31 @@ static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory) static smx_context_t smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, - void_f_pvoid_t cleanup_func, void* cleanup_arg) + void_f_pvoid_t cleanup_func, void* cleanup_arg) { smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1); - + /* If the user provided a function for the process then use it otherwise is the context for maestro */ if(code){ context->code = code; xbt_assert2(getcontext(&(context->uc)) == 0, - "Error in context saving: %d (%s)", errno, strerror(errno)); + "Error in context saving: %d (%s)", errno, strerror(errno)); context->uc.uc_link = NULL; context->uc.uc_stack.ss_sp = - pth_skaddr_makecontext(context->stack, STACK_SIZE); + pth_skaddr_makecontext(context->stack, STACK_SIZE); context->uc.uc_stack.ss_size = - pth_sksize_makecontext(context->stack, STACK_SIZE); + pth_sksize_makecontext(context->stack, STACK_SIZE); #ifdef HAVE_VALGRIND_VALGRIND_H context->valgrind_stack_id = - VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp, - ((char *) context->uc.uc_stack.ss_sp) + - context->uc.uc_stack.ss_size); + VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp, + ((char *) context->uc.uc_stack.ss_sp) + + context->uc.uc_stack.ss_size); #endif /* HAVE_VALGRIND_VALGRIND_H */ context->argc = argc; @@ -105,7 +105,7 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, context->cleanup_func = cleanup_func; context->cleanup_arg = cleanup_arg; } - + return (smx_context_t)context; } @@ -127,7 +127,7 @@ static void smx_ctx_sysv_free(smx_context_t pcontext) free(context->argv); } - + /* destroy the context */ free(context); } @@ -141,11 +141,11 @@ static void smx_ctx_sysv_start(smx_context_t context) static void smx_ctx_sysv_stop(smx_context_t pcontext) { smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext; - + if (context->cleanup_func) (*context->cleanup_func) (context->cleanup_arg); - smx_ctx_sysv_suspend((smx_context_t)context); + smx_ctx_sysv_suspend(pcontext); } static void smx_ctx_sysv_wrapper() @@ -158,10 +158,10 @@ static void smx_ctx_sysv_wrapper() in 64-bit architectures where pointers are 64 bit long. */ smx_ctx_sysv_t context = - (smx_ctx_sysv_t)simix_global->current_process->context; - + (smx_ctx_sysv_t)simix_global->current_process->context; + (context->code) (context->argc, context->argv); - + smx_ctx_sysv_stop((smx_context_t)context); } @@ -186,7 +186,7 @@ smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context) ((smx_ctx_sysv_t) new_context)->prev = (smx_ctx_sysv_t)old_context; rv = swapcontext(&((smx_ctx_sysv_t)old_context)->uc, - &((smx_ctx_sysv_t)new_context)->uc); + &((smx_ctx_sysv_t)new_context)->uc); xbt_assert0((rv == 0), "Context swapping failure"); } -- 2.20.1