XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
-int __stop_time = -1.0 ;
SIMIX_Global_t simix_global = NULL;
s_smx_process_t proc;
if (!simix_global) {
- surf_init(argc, argv); /* Initialize some common structures. Warning, it sets msg_global=NULL */
+ surf_init(argc, argv); /* Initialize some common structures. Warning, it sets simix_global=NULL */
simix_global = xbt_new0(s_SIMIX_Global_t,1);
- xbt_context_init();
simix_global->host = xbt_fifo_new();
- simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
+ simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,synchro_hookup));
simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
simix_global->current_process = NULL;
simix_global->registered_functions = xbt_dict_new();
void __SIMIX_display_process_status(void)
{
smx_process_t process = NULL;
- //xbt_fifo_item_t item = NULL;
- //int i;
+ xbt_fifo_item_t item = NULL;
+ smx_action_t act;
int nbprocess=xbt_swag_size(simix_global->process_list);
INFO1("SIMIX: %d processes are still running, waiting for something.",
asprintf(&who,"SIMIX: %s on %s: %s",
process->name,
p_simdata->host->name,
- (process->simdata->blocked)?"[blocked] "
- :((process->simdata->suspended)?"[suspended] ":""));
-
+ (process->simdata->blocked)?"[BLOCKED] "
+ :((process->simdata->suspended)?"[SUSPENDED] ":""));
+ if (p_simdata->mutex) {
+ DEBUG1("Block on a mutex: %s", who);
+ }
+ else if (p_simdata->cond) {
+ DEBUG1("Block on a condition: %s", who);
+ DEBUG0("Waiting actions:");
+ xbt_fifo_foreach(p_simdata->cond->actions,item, act, smx_action_t) {
+ DEBUG1("\t %s", act->name);
+ }
+ }
+ else DEBUG1("Unknown block status: %s", who);
free(who);
}
}
/** \ingroup msg_simulation
* \brief Launch the SIMIX simulation
*/
-SIMIX_error_t SIMIX_main(void)
+void __SIMIX_main(void)
{
smx_process_t process = NULL;
smx_cond_t cond = NULL;
- int i;
- double elapsed_time = 0.0;
- int state_modifications = 1;
+ smx_action_t smx_action;
+ xbt_fifo_t actions_done = xbt_fifo_new();
+ xbt_fifo_t actions_failed = xbt_fifo_new();
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT,inthandler);
fflush(stdout);
fflush(stderr);
- surf_solve(); /* Takes traces into account. Returns 0.0 */
+ //surf_solve(); /* Takes traces into account. Returns 0.0 */
/* xbt_fifo_size(msg_global->process_to_run) */
- while (1) {
- xbt_context_empty_trash();
- if(xbt_swag_size(simix_global->process_to_run) && (elapsed_time>0)) {
- DEBUG0("**************************************************");
- }
-
- if((__stop_time>0) && (SIMIX_get_clock() >= __stop_time)) {
- DEBUG0("Let's stop here!");
- }
- while ((process = xbt_swag_extract(simix_global->process_to_run))) {
- DEBUG2("Scheduling %s on %s",
- process->name,
- process->simdata->host->name);
- simix_global->current_process = process;
- xbt_context_schedule(process->simdata->context);
- /* fflush(NULL); */
- simix_global->current_process = NULL;
- }
+ while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
- {
- surf_action_t action = NULL;
- surf_resource_t resource = NULL;
- smx_action_t smx_action = NULL;
+ while ( (smx_action = xbt_fifo_pop(actions_failed)) ) {
- void *fun = NULL;
- void *arg = NULL;
+ xbt_fifo_item_t _cursor;
- xbt_dynar_foreach(resource_list, i, resource) {
- if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
- xbt_swag_size(resource->common_public->states.done_action_set))
- state_modifications = 1;
- }
-
- if(!state_modifications) {
- DEBUG1("%f : Calling surf_solve",SIMIX_get_clock());
- elapsed_time = surf_solve();
- DEBUG1("Elapsed_time %f",elapsed_time);
-
- if (elapsed_time<0.0) {
- /* fprintf(stderr, "We're done %g\n",elapsed_time); */
- break;
+ DEBUG1("** %s failed **",smx_action->name);
+ xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
+ xbt_swag_foreach(process,cond->sleeping) {
+ DEBUG2("\t preparing to wake up %s on %s",
+ process->name, process->simdata->host->name);
}
+ SIMIX_cond_broadcast(cond);
+ /* remove conditional from action */
+ xbt_fifo_remove(smx_action->simdata->cond_list,cond);
}
+ }
- while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
- DEBUG2("got %p %p", fun, arg);
- if(fun==SIMIX_process_create_with_arguments) {
- process_arg_t args = arg;
- DEBUG2("Launching %s on %s", args->name, args->host->name);
- process = SIMIX_process_create_with_arguments(args->name, args->code,
- args->data, args->host,
- args->argc,args->argv);
- if(args->kill_time > SIMIX_get_clock()) {
- surf_timer_resource->extension_public->set(args->kill_time,
- (void*) &SIMIX_process_kill,
- (void*) process);
- }
- xbt_free(args);
- }
- if(fun==SIMIX_process_kill) {
- process = arg;
- DEBUG2("Killing %s on %s", process->name,
- process->simdata->host->name);
- SIMIX_process_kill(process);
- }
- }
-
- /* Wake up all process waiting for the action finish */
- xbt_dynar_foreach(resource_list, i, resource) {
- while ((action =
- xbt_swag_extract(resource->common_public->states.
- failed_action_set))) {
- smx_action = action->data;
- if (smx_action) {
- xbt_fifo_item_t _cursor;
-
- DEBUG1("** %s failed **",smx_action->name);
- xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
- SIMIX_cond_broadcast(cond);
- xbt_swag_foreach(process,cond->sleeping) {
- DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->host->name);
- }
- }
- process=NULL;
- }
- }
- while ((action =
- xbt_swag_extract(resource->common_public->states.
- done_action_set))) {
- smx_action = action->data;
- if (smx_action) {
- xbt_fifo_item_t _cursor;
-
- DEBUG1("** %s done **",smx_action->name);
- xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
- SIMIX_cond_broadcast(cond);
- xbt_swag_foreach(process,cond->sleeping) {
- DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->host->name);
- }
- }
- process=NULL;
- }
+ while ( (smx_action = xbt_fifo_pop(actions_done)) ) {
+ xbt_fifo_item_t _cursor;
+ DEBUG1("** %s done **",smx_action->name);
+ xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
+ xbt_swag_foreach(process,cond->sleeping) {
+ DEBUG2("\t preparing to wake up %s on %s",
+ process->name, process->simdata->host->name);
}
+ SIMIX_cond_broadcast(cond);
+ /* remove conditional from action */
+ xbt_fifo_remove(smx_action->simdata->cond_list,cond);
}
}
- state_modifications = 0;
- }
-
- if (xbt_swag_size(simix_global->process_list) == 0) {
- INFO0("Congratulations ! Simulation terminated : all processes are over");
- return SIMIX_OK;
- } else {
- INFO0("Oops ! Deadlock or code not perfectly clean.");
- __SIMIX_display_process_status();
- if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
- XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
- DEBUG0("Aborting!");
- xbt_abort();
- }
-
- INFO0("Return a Warning.");
- return SIMIX_WARNING;
}
+ return;
}
/** \ingroup msg_simulation
/** \ingroup msg_simulation
* \brief Clean the SIMIX simulation
*/
-SIMIX_error_t SIMIX_clean(void)
+void SIMIX_clean(void)
{
xbt_fifo_item_t i = NULL;
smx_host_t h = NULL;
while((p=xbt_swag_extract(simix_global->process_list))) {
SIMIX_process_kill(p);
}
- xbt_context_exit();
xbt_fifo_foreach(simix_global->host,i,h,smx_host_t) {
__SIMIX_host_destroy(h);
free(simix_global);
surf_exit();
- return SIMIX_OK;
+ return ;
}
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
-double SIMIX_get_clock(void) {
+double SIMIX_get_clock(void)
+{
return surf_get_clock();
}
+
+double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
+{
+
+ smx_process_t process = NULL;
+ int i;
+ double elapsed_time = 0.0;
+ int state_modifications = 0;
+
+
+ //surf_solve(); /* Takes traces into account. Returns 0.0 I don't know what to do with this*/
+
+ xbt_context_empty_trash();
+ if(xbt_swag_size(simix_global->process_to_run) && (elapsed_time>0)) {
+ DEBUG0("**************************************************");
+ }
+
+ while ((process = xbt_swag_extract(simix_global->process_to_run))) {
+ DEBUG2("Scheduling %s on %s",
+ process->name,
+ process->simdata->host->name);
+ simix_global->current_process = process;
+ xbt_context_schedule(process->simdata->context);
+ /* fflush(NULL); */
+ simix_global->current_process = NULL;
+ }
+
+ {
+ surf_action_t action = NULL;
+ surf_resource_t resource = NULL;
+ smx_action_t smx_action = NULL;
+
+ void *fun = NULL;
+ void *arg = NULL;
+
+ xbt_dynar_foreach(resource_list, i, resource) {
+ if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
+ xbt_swag_size(resource->common_public->states.done_action_set))
+ state_modifications = 1;
+ }
+
+ if(!state_modifications) {
+ DEBUG1("%f : Calling surf_solve",SIMIX_get_clock());
+ elapsed_time = surf_solve();
+ DEBUG1("Elapsed_time %f",elapsed_time);
+ }
+
+ while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
+ DEBUG2("got %p %p", fun, arg);
+ if(fun==SIMIX_process_create_with_arguments) {
+ process_arg_t args = arg;
+ DEBUG2("Launching %s on %s", args->name, args->host->name);
+ process = SIMIX_process_create_with_arguments(args->name, args->code,
+ args->data, args->host,
+ args->argc,args->argv);
+ if(args->kill_time > SIMIX_get_clock()) {
+ surf_timer_resource->extension_public->set(args->kill_time,
+ (void*) &SIMIX_process_kill,
+ (void*) process);
+ }
+ xbt_free(args);
+ }
+ if(fun==SIMIX_process_kill) {
+ process = arg;
+ DEBUG2("Killing %s on %s", process->name,
+ process->simdata->host->name);
+ SIMIX_process_kill(process);
+ }
+ }
+
+ /* Wake up all process waiting for the action finish */
+ xbt_dynar_foreach(resource_list, i, resource) {
+ while ((action = xbt_swag_extract(resource->common_public->states.failed_action_set))) {
+ smx_action = action->data;
+ if (smx_action) {
+ xbt_fifo_unshift(actions_failed,smx_action);
+ }
+ }
+ while ((action =xbt_swag_extract(resource->common_public->states.done_action_set))) {
+ smx_action = action->data;
+ if (smx_action) {
+ xbt_fifo_unshift(actions_done,smx_action);
+ }
+ }
+ }
+ }
+
+ if (elapsed_time == -1) {
+ if (xbt_swag_size(simix_global->process_list) == 0) {
+ INFO0("Congratulations ! Simulation terminated : all processes are over");
+ } else {
+ INFO0("Oops ! Deadlock or code not perfectly clean.");
+ __SIMIX_display_process_status();
+ if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
+ XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
+ DEBUG0("Aborting!");
+ xbt_abort();
+ }
+ INFO0("Return a Warning.");
+ }
+ }
+ return elapsed_time;
+}
+
+
+void SIMIX_timer_set (double date, void *function, void *arg)
+{
+ surf_timer_resource->extension_public->set(date, function, arg);
+}
+
+int SIMIX_timer_get(void **function, void **arg)
+{
+ return surf_timer_resource->extension_public->get(function, arg);
+}
