XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
typedef struct s_smx_ctx_sysv {
- SMX_CTX_BASE_T;
+ s_smx_ctx_base_t super; /* Fields of super implementation */
ucontext_t uc; /* the thread that execute the code */
char stack[STACK_SIZE]; /* the thread stack size */
- struct s_smx_ctx_sysv *prev; /* the previous process */
#ifdef HAVE_VALGRIND_VALGRIND_H
unsigned int valgrind_stack_id; /* the valgrind stack id */
#endif
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);
static void smx_ctx_sysv_free(smx_context_t context);
-
-static void smx_ctx_sysv_start(smx_context_t context);
-
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);
+static void smx_ctx_sysv_resume(smx_context_t new_context);
static void smx_ctx_sysv_wrapper(void);
(*factory)->create_context = smx_ctx_sysv_factory_create_context;
(*factory)->finalize = smx_ctx_sysv_factory_finalize;
(*factory)->free = smx_ctx_sysv_free;
- (*factory)->start = smx_ctx_sysv_start;
(*factory)->stop = smx_ctx_sysv_stop;
(*factory)->suspend = smx_ctx_sysv_suspend;
(*factory)->resume = smx_ctx_sysv_resume;
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;
+ context->super.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;
- context->argv = argv;
- context->cleanup_func = cleanup_func;
- context->cleanup_arg = cleanup_arg;
+ context->super.argc = argc;
+ context->super.argv = argv;
+ context->super.cleanup_func = cleanup_func;
+ context->super.cleanup_arg = cleanup_arg;
+
+ makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
}
-
+
return (smx_context_t)context;
}
#endif /* HAVE_VALGRIND_VALGRIND_H */
/* free argv */
- if (context->argv) {
- for (i = 0; i < context->argc; i++)
- if (context->argv[i])
- free(context->argv[i]);
+ if (context->super.argv) {
+ for (i = 0; i < context->super.argc; i++)
+ if (context->super.argv[i])
+ free(context->super.argv[i]);
- free(context->argv);
+ free(context->super.argv);
}
-
+
/* destroy the context */
free(context);
}
}
-static void smx_ctx_sysv_start(smx_context_t context)
-{
- makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
-}
-
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);
+ if (context->super.cleanup_func)
+ (*context->super.cleanup_func) (context->super.cleanup_arg);
+
+ smx_ctx_sysv_suspend(pcontext);
}
static void smx_ctx_sysv_wrapper()
{
- /*FIXME: I would like to avoid accesing simix_global to get the current
+ /*FIXME: I would like to avoid accessing simix_global to get the current
context by passing it as an argument of the wrapper function. The problem
is that this function is called from smx_ctx_sysv_start, and uses
makecontext for calling it, and the stupid posix specification states that
in 64-bit architectures where pointers are 64 bit long.
*/
smx_ctx_sysv_t context =
- (smx_ctx_sysv_t)simix_global->current_process->context;
-
- (context->code) (context->argc, context->argv);
-
+ (smx_ctx_sysv_t)simix_global->current_process->context;
+
+ (context->super.code) (context->super.argc, context->super.argv);
+
smx_ctx_sysv_stop((smx_context_t)context);
}
-static void smx_ctx_sysv_suspend(smx_context_t context)
-{
+static void smx_ctx_sysv_suspend(smx_context_t context) {
int rv;
+ ucontext_t maestro_ctx = ((smx_ctx_sysv_t)simix_global->maestro_process->context)->uc;
- smx_ctx_sysv_t prev_context = ((smx_ctx_sysv_t) context)->prev;
-
- ((smx_ctx_sysv_t) context)->prev = NULL;
-
- rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &prev_context->uc);
+ rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
xbt_assert0((rv == 0), "Context swapping failure");
}
static void
-smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context)
-{
+smx_ctx_sysv_resume(smx_context_t new_context) {
int rv;
+ smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->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);
+ rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
