X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3227570daf9d253c6d0a79f3c20c04e50e33146c..87bc879019fc94e7ff1bc1ada77ecf85b0b588af:/src/simix/smx_context_raw.c diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index c78a6f8510..fd9058e7ce 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -327,8 +327,8 @@ smx_ctx_raw_create_context(xbt_main_func_t code, int argc, char **argv, } else { raw_maestro_context = context; - if(MC_IS_ENABLED) - MC_ignore(&(raw_maestro_context->stack_top), sizeof(raw_maestro_context->stack_top)); + if(MC_is_active()) + MC_ignore_heap(&(raw_maestro_context->stack_top), sizeof(raw_maestro_context->stack_top)); } @@ -490,30 +490,15 @@ void smx_ctx_raw_new_sr(void) */ static void smx_ctx_raw_runall_serial(void) { - if (!xbt_dynar_is_empty(simix_global->process_to_run)) { - smx_process_t first_process = - xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); - raw_process_index = 1; + smx_process_t first_process = + xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); + raw_process_index = 1; - /* execute the first process */ - smx_ctx_raw_resume_serial(first_process); - } + /* execute the first process */ + smx_ctx_raw_resume_serial(first_process); } #endif -/** - * \brief Stops a raw context. - * - * This function is called when the main function of the context if finished. - * - * \param context the context of the current worker thread - */ -static void smx_ctx_raw_stop_parallel(smx_context_t context) -{ - smx_ctx_base_stop(context); - smx_ctx_raw_suspend_parallel(context); -} - /** * \brief Suspends a running context and resumes another one or returns to * the main function of the current worker thread. @@ -577,6 +562,8 @@ static void smx_ctx_raw_runall_parallel(void) raw_threads_working = 0; xbt_parmap_apply(raw_parmap, (void_f_pvoid_t) smx_ctx_raw_resume_parallel, simix_global->process_to_run); +#else + xbt_die("You asked for a parallel execution, but you don't have any threads.") #endif }