X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f49f36235140dd615cde7be572de6fb50721557e..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/simix/smx_global.c diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c index cf43c42af9..72126a7669 100644 --- a/src/simix/smx_global.c +++ b/src/simix/smx_global.c @@ -10,9 +10,9 @@ #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/str.h" -#include "xbt/ex.h" /* ex_backtrace_display */ +#include "xbt/ex.h" /* ex_backtrace_display */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, - "Logging specific to SIMIX (kernel)"); + "Logging specific to SIMIX (kernel)"); SIMIX_Global_t simix_global = NULL; @@ -41,7 +41,7 @@ static void simix_cfg_control_set(const char *control_string) /* split the string, and remove empty entries */ set_strings = xbt_str_split_quoted(control_string); - if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */ + if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */ xbt_dynar_free(&set_strings); return; } @@ -60,9 +60,9 @@ static void simix_cfg_control_set(const char *control_string) value++; xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'", - name); + name); xbt_assert1(strlen(value) != 0, - "Invalid value for configuration: '%s'", value); + "Invalid value for configuration: '%s'", value); INFO2("setting '%s' to '%s'", name, value); __simix_config_helper(name, value); @@ -87,12 +87,12 @@ static void simix_cfg_init(int *argc, char **argv) /*remove this from argv */ for (j = i + 1; j < *argc; j++) { - argv[j - 1] = argv[j]; + argv[j - 1] = argv[j]; } argv[j - 1] = NULL; (*argc)--; - i--; /* compensate effect of next loop incrementation */ + i--; /* compensate effect of next loop incrementation */ } } } @@ -119,16 +119,16 @@ void SIMIX_global_init(int *argc, char **argv) s_smx_process_t proc; if (!simix_global) { - surf_init(argc, argv); /* Initialize some common structures. Warning, it sets simix_global=NULL */ + surf_init(argc, argv); /* Initialize some common structures. Warning, it sets simix_global=NULL */ simix_cfg_init(argc, argv); simix_global = xbt_new0(s_SIMIX_Global_t, 1); simix_global->host = xbt_dict_new(); simix_global->process_to_run = - xbt_swag_new(xbt_swag_offset(proc, synchro_hookup)); + xbt_swag_new(xbt_swag_offset(proc, synchro_hookup)); simix_global->process_list = - xbt_swag_new(xbt_swag_offset(proc, process_hookup)); + xbt_swag_new(xbt_swag_offset(proc, process_hookup)); simix_global->current_process = NULL; simix_global->registered_functions = xbt_dict_new(); @@ -149,44 +149,50 @@ void SIMIX_display_process_status(void) smx_action_t act; int nbprocess = xbt_swag_size(simix_global->process_list); - INFO1("%d processes are still running, waiting for something.", - nbprocess); + INFO1("%d processes are still running, waiting for something.", nbprocess); /* List the process and their state */ INFO0 - ("Legend of the following listing: \" on : .\""); + ("Legend of the following listing: \" on : .\""); xbt_swag_foreach(process, simix_global->process_list) { smx_simdata_process_t p_simdata = - (smx_simdata_process_t) process->simdata; + (smx_simdata_process_t) process->simdata; // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata; char *who, *who2; asprintf(&who, "%s on %s: %s", - process->name, - p_simdata->smx_host->name, - (process->simdata->blocked) ? "[BLOCKED] " - : ((process->simdata->suspended) ? "[SUSPENDED] " : "")); + process->name, + p_simdata->smx_host->name, + (process->simdata->blocked) ? "[BLOCKED] " + : ((process->simdata->suspended) ? "[SUSPENDED] " : "")); if (p_simdata->mutex) { - who2 = bprintf("%s Blocked on mutex %p", who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->mutex:(void*)0xdead); + who2 = + bprintf("%s Blocked on mutex %p", who, + (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ? + p_simdata->mutex : (void *) 0xdead); free(who); who = who2; } else if (p_simdata->cond) { who2 = - bprintf - ("%s Blocked on condition %p; Waiting for the following actions:", - who, (XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->cond:(void*)0xdead); + bprintf + ("%s Blocked on condition %p; Waiting for the following actions:", + who, + (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ? + p_simdata->cond : (void *) 0xdead); free(who); who = who2; xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) { - who2 = bprintf("%s '%s'(%p)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:(void*)0xdead); - free(who); - who = who2; + who2 = + bprintf("%s '%s'(%p)", who, act->name, + (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) + ? act : (void *) 0xdead); + free(who); + who = who2; } } else { who2 = - bprintf - ("%s Blocked in an unknown status (please report this bug)", - who); + bprintf + ("%s Blocked in an unknown status (please report this bug)", who); free(who); who = who2; } @@ -222,13 +228,13 @@ void __SIMIX_main(void) DEBUG1("** %s failed **", smx_action->name); xbt_fifo_foreach(smx_action->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->smx_host->name); - } - SIMIX_cond_broadcast(cond); - /* remove conditional from action */ - SIMIX_unregister_action_to_condition(smx_action, cond); + xbt_swag_foreach(process, cond->sleeping) { + DEBUG2("\t preparing to wake up %s on %s", + process->name, process->simdata->smx_host->name); + } + SIMIX_cond_broadcast(cond); + /* remove conditional from action */ + SIMIX_unregister_action_to_condition(smx_action, cond); } } @@ -237,13 +243,13 @@ void __SIMIX_main(void) DEBUG1("** %s done **", smx_action->name); xbt_fifo_foreach(smx_action->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->smx_host->name); - } - SIMIX_cond_broadcast(cond); - /* remove conditional from action */ - SIMIX_unregister_action_to_condition(smx_action, cond); + xbt_swag_foreach(process, cond->sleeping) { + DEBUG2("\t preparing to wake up %s on %s", + process->name, process->simdata->smx_host->name); + } + SIMIX_cond_broadcast(cond); + /* remove conditional from action */ + SIMIX_unregister_action_to_condition(smx_action, cond); } } } @@ -315,8 +321,9 @@ double SIMIX_get_clock(void) * * Must be called before the first call to SIMIX_solve() */ -void SIMIX_init(void) { - surf_presolve(); +void SIMIX_init(void) +{ + surf_presolve(); } /** @@ -342,7 +349,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) while ((process = xbt_swag_extract(simix_global->process_to_run))) { DEBUG2("Scheduling %s on %s", - process->name, process->simdata->smx_host->name); + process->name, process->simdata->smx_host->name); simix_global->current_process = process; xbt_context_schedule(process->simdata->context); /* fflush(NULL); */ @@ -359,10 +366,9 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) xbt_dynar_foreach(model_list, iter, model) { if (xbt_swag_size(model->common_public->states.failed_action_set) - || xbt_swag_size(model->common_public->states. - done_action_set)) { - state_modifications = 1; - break; + || xbt_swag_size(model->common_public->states.done_action_set)) { + state_modifications = 1; + break; } } @@ -375,44 +381,44 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) { DEBUG2("got %p %p", fun, arg); if (fun == SIMIX_process_create) { - smx_process_arg_t args = arg; - DEBUG2("Launching %s on %s", args->name, args->hostname); - process = SIMIX_process_create(args->name, args->code, - args->data, args->hostname, - args->argc, args->argv, args->properties); - if (args->kill_time > SIMIX_get_clock()) { - surf_timer_model->extension_public->set(args->kill_time, - (void *) - &SIMIX_process_kill, - (void *) process); - } - xbt_free(args); + smx_process_arg_t args = arg; + DEBUG2("Launching %s on %s", args->name, args->hostname); + process = SIMIX_process_create(args->name, args->code, + args->data, args->hostname, + args->argc, args->argv, + args->properties); + if (args->kill_time > SIMIX_get_clock()) { + surf_timer_model->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->smx_host->name); - SIMIX_process_kill(process); + process = arg; + DEBUG2("Killing %s on %s", process->name, + process->simdata->smx_host->name); + SIMIX_process_kill(process); } } /* Wake up all process waiting for the action finish */ xbt_dynar_foreach(model_list, iter, model) { while ((action = - xbt_swag_extract(model->common_public->states. - failed_action_set))) { - smx_action = action->data; - if (smx_action) { - xbt_fifo_unshift(actions_failed, smx_action); - } + xbt_swag_extract(model->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(model->common_public->states. - done_action_set))) { - smx_action = action->data; - if (smx_action) { - xbt_fifo_unshift(actions_done, smx_action); - } + xbt_swag_extract(model->common_public-> + states.done_action_set))) { + smx_action = action->data; + if (smx_action) { + xbt_fifo_unshift(actions_done, smx_action); + } } } } @@ -425,9 +431,9 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed) 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(); + XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) { + DEBUG0("Aborting!"); + xbt_abort(); } INFO0("Return a Warning."); } @@ -464,7 +470,7 @@ int SIMIX_timer_get(void **function, void **arg) void SIMIX_function_register_process_create(smx_creation_func_t function) { xbt_assert0((simix_global->create_process_function == NULL), - "Data already set"); + "Data already set"); simix_global->create_process_function = function; } @@ -479,7 +485,7 @@ void SIMIX_function_register_process_create(smx_creation_func_t function) void SIMIX_function_register_process_kill(void_f_pvoid_t function) { xbt_assert0((simix_global->kill_process_function == NULL), - "Data already set"); + "Data already set"); simix_global->kill_process_function = function; }