summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
dd53c45)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9006
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-static xbt_tpool_t tpool;
+static xbt_tpool_t tpool;
static smx_context_t
smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
static smx_context_t
smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
sizeof(void*)/sizeof(int), context);
makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
sizeof(void*)/sizeof(int), context);
+ }else{
+ maestro_context = context;
}
return (smx_context_t) context;
}
return (smx_context_t) context;
void smx_ctx_sysv_stop(smx_context_t context)
{
smx_ctx_base_stop(context);
void smx_ctx_sysv_stop(smx_context_t context)
{
smx_ctx_base_stop(context);
smx_ctx_sysv_suspend(context);
}
smx_ctx_sysv_suspend(context);
}
void smx_ctx_sysv_suspend(smx_context_t context)
{
void smx_ctx_sysv_suspend(smx_context_t context)
{
- ucontext_t maestro_ctx =
- ((smx_ctx_sysv_t) simix_global->maestro_process->context)->uc;
-
- int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
+ smx_current_context = (smx_context_t)maestro_context;
+ int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_context->uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
xbt_assert0((rv == 0), "Context swapping failure");
}
-void smx_ctx_sysv_resume(smx_context_t new_context)
+void smx_ctx_sysv_resume(smx_context_t context)
- smx_ctx_sysv_t maestro =
- (smx_ctx_sysv_t) simix_global->maestro_process->context;
-
- int rv =
- swapcontext(&(maestro->uc), &((smx_ctx_sysv_t) new_context)->uc);
+ smx_current_context = context;
+ int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
void smx_ctx_sysv_runall(xbt_swag_t processes)
{
xbt_assert0((rv == 0), "Context swapping failure");
}
void smx_ctx_sysv_runall(xbt_swag_t processes)
{
- smx_context_t old_context;
- while ((process = xbt_swag_extract(processes))) {
- old_context = smx_current_context;
- smx_current_context = process->context;
- smx_ctx_sysv_resume(smx_current_context);
- smx_current_context = old_context;
- }
+ while ((process = xbt_swag_extract(processes)))
+ smx_ctx_sysv_resume(process->context);
}
void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
}
void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
while((process = xbt_swag_extract(processes))){
xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context);
}
while((process = xbt_swag_extract(processes))){
xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context);
}
-}
\ No newline at end of file
char stack[CONTEXT_STACK_SIZE]; /* the thread stack size */
} s_smx_ctx_sysv_t, *smx_ctx_sysv_t;
char stack[CONTEXT_STACK_SIZE]; /* the thread stack size */
} s_smx_ctx_sysv_t, *smx_ctx_sysv_t;
+smx_ctx_sysv_t maestro_context;
+
void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory);
int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory);
void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory);
int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory);