#include "private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/ex.h" /* ex_backtrace_display */
+#include "xbt/str.h"
+#include "xbt/ex.h" /* ex_backtrace_display */
+XBT_LOG_EXTERNAL_CATEGORY(simix);
+XBT_LOG_EXTERNAL_CATEGORY(simix_action);
+XBT_LOG_EXTERNAL_CATEGORY(simix_deployment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_host);
+XBT_LOG_EXTERNAL_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+XBT_LOG_EXTERNAL_CATEGORY(simix_context);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
- "Logging specific to SIMIX (kernel)");
+ "Logging specific to SIMIX (kernel)");
SIMIX_Global_t simix_global = NULL;
-/********************************* SIMIX **************************************/
-static void __simix_config_helper(const char *name, ...)
-{
- va_list pa;
- va_start(pa, name);
- SIMIX_config(name, pa);
-
- va_end(pa);
-}
+/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
+#include <signal.h>
-static void simix_cfg_control_set(const char *control_string)
+static void _XBT_CALL inthandler(int ignored)
{
- /* To split the string in commands, and the cursors */
- xbt_dynar_t set_strings;
- char *str;
- int cpt;
-
- if (!control_string)
- return;
- DEBUG1("Parse log settings '%s'", 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! */
- xbt_dynar_free(&set_strings);
- return;
- }
- /* Parse each entry and either use it right now (if the category was already
- created), or store it for further use */
- xbt_dynar_foreach(set_strings, cpt, str) {
- char *control_string, *control_string_sav, *name, *value;
-
-
- control_string = control_string_sav = strdup(str);
- control_string += strspn(control_string, " ");
- name = control_string;
- control_string += strcspn(str, ":=");
- value = control_string;
- *value = 0;
- value++;
-
- xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'",
- name);
- xbt_assert1(strlen(value) != 0,
- "Invalid value for configuration: '%s'", value);
- INFO2("setting '%s' to '%s'", name, value);
-
- __simix_config_helper(name, value);
-
- free(control_string_sav);
- }
- xbt_dynar_free(&set_strings);
+ INFO0("CTRL-C pressed. Displaying status and bailing out");
+ SIMIX_display_process_status();
+ exit(1);
}
-static void simix_cfg_init(int *argc, char **argv)
-{
- int i, j;
- char *opt;
-
- for (i = 1; i < *argc; i++) {
- if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
- opt = strchr(argv[i], '=');
- opt++;
-
- simix_cfg_control_set(opt);
- DEBUG1("Did apply '%s' as config setting", opt);
- /*remove this from argv */
-
- for (j = i + 1; j < *argc; j++) {
- argv[j - 1] = argv[j];
- }
-
- argv[j - 1] = NULL;
- (*argc)--;
- i--; /* compensate effect of next loop incrementation */
- }
- }
-}
+/********************************* SIMIX **************************************/
/**
- * \brief Initialize some SIMIX internal data.
+ * \brief Initialize SIMIX internal data.
*
* \param argc Argc
* \param argv Argv
s_smx_process_t proc;
if (!simix_global) {
- surf_init(argc, argv); /* Initialize some common structures. Warning, it sets simix_global=NULL */
- simix_cfg_init(argc, argv);
+ /* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(simix_action, simix);
+ XBT_LOG_CONNECT(simix_deployment, simix);
+ XBT_LOG_CONNECT(simix_environment, simix);
+ XBT_LOG_CONNECT(simix_host, simix);
+ XBT_LOG_CONNECT(simix_kernel, simix);
+ XBT_LOG_CONNECT(simix_process, simix);
+ XBT_LOG_CONNECT(simix_synchro, simix);
+ XBT_LOG_CONNECT(simix_context, simix);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
- simix_global->host = xbt_fifo_new();
+ 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->process_to_destroy =
+ xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
+
simix_global->current_process = NULL;
+ simix_global->maestro_process = NULL;
simix_global->registered_functions = xbt_dict_new();
simix_global->create_process_function = NULL;
simix_global->kill_process_function = NULL;
simix_global->cleanup_process_function = SIMIX_process_cleanup;
+
+ SIMIX_context_mod_init();
+ __SIMIX_create_maestro_process();
+
+ /* Prepare to display some more info when dying on Ctrl-C pressing */
+ signal(SIGINT, inthandler);
+ surf_init(argc, argv); /* Initialize SURF structures */
}
}
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: \"<process> on <host>: <status>.\"");
+ ("Legend of the following listing: \"<process> on <host>: <status>.\"");
xbt_swag_foreach(process, simix_global->process_list) {
- smx_simdata_process_t p_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,
+ process->smx_host->name,
+ (process->blocked) ? "[BLOCKED] "
+ : ((process->suspended) ? "[SUSPENDED] " : ""));
- if (p_simdata->mutex) {
- who2 = bprintf("%s Blocked on mutex %p", who, p_simdata->mutex);
+ if (process->mutex) {
+ who2 =
+ bprintf("%s Blocked on mutex %p", who,
+ (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+ process->mutex : (void *) 0xdead);
free(who);
who = who2;
- } else if (p_simdata->cond) {
+ } else if (process->cond) {
who2 =
- bprintf
- ("%s Blocked on condition %p; Waiting for the following actions:",
- who, p_simdata->cond);
+ bprintf
+ ("%s Blocked on condition %p; Waiting for the following actions:",
+ who,
+ (XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_verbose)) ?
+ process->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,act);
- free(who);
- who = who2;
+ xbt_fifo_foreach(process->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;
}
} 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;
}
}
}
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
-
-static void _XBT_CALL inthandler(int ignored)
-{
- INFO0("CTRL-C pressed. Displaying status and bailing out");
- SIMIX_display_process_status();
- exit(1);
-}
/**
* \brief Launch the SIMIX simulation, debug purpose
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);
-
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
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->smx_host->name);
+ }
+ SIMIX_cond_broadcast(cond);
+ /* remove conditional from action */
+ SIMIX_unregister_action_to_condition(smx_action, cond);
}
}
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->smx_host->name);
+ }
+ SIMIX_cond_broadcast(cond);
+ /* remove conditional from action */
+ SIMIX_unregister_action_to_condition(smx_action, cond);
}
}
}
SIMIX_process_kill(p);
}
- xbt_context_empty_trash();
+ SIMIX_process_empty_trash();
- if (self) {
- xbt_context_yield();
+ if (self != simix_global->maestro_process) {
+ __SIMIX_process_yield();
}
return;
}
-/**
+/**
* \brief Clean the SIMIX simulation
*
- * This functions remove all memories needed to the SIMIX execution
+ * This functions remove the memory used by SIMIX
*/
void SIMIX_clean(void)
{
- xbt_fifo_item_t i = NULL;
- smx_host_t h = NULL;
- smx_process_t p = NULL;
-
- while ((p = xbt_swag_extract(simix_global->process_list))) {
- SIMIX_process_kill(p);
- }
+ /* Kill everyone (except maestro) */
+ SIMIX_process_killall();
- xbt_fifo_foreach(simix_global->host, i, h, smx_host_t) {
- __SIMIX_host_destroy(h);
- }
- xbt_fifo_free(simix_global->host);
+ /* Free the remaining data structures*/
xbt_swag_free(simix_global->process_to_run);
+ xbt_swag_free(simix_global->process_to_destroy);
xbt_swag_free(simix_global->process_list);
+ simix_global->process_list = NULL;
xbt_dict_free(&(simix_global->registered_functions));
- simix_config_finalize();
+ xbt_dict_free(&(simix_global->host));
+
+ /* Let's free maestro now */
+ SIMIX_context_free(simix_global->maestro_process->context);
+ free(simix_global->maestro_process);
+
+ /* Finish context module and SURF */
+ SIMIX_context_mod_exit();
+ surf_exit();
+
free(simix_global);
simix_global = NULL;
- surf_exit();
return;
}
return surf_get_clock();
}
+/**
+ * \brief Finish the simulation initialization
+ *
+ * Must be called before the first call to SIMIX_solve()
+ */
+void SIMIX_init(void)
+{
+ surf_presolve();
+}
+
/**
* \brief Does a turn of the simulation
*
- * Executes a step in the surf simulation, adding to the two lists all the actions that finished on this turn. Schedules all processus in the process_to_run list.
+ * Executes a step in the surf simulation, adding to the two lists all the actions that finished on this turn. Schedules all processus in the process_to_run list.
* \param actions_done List of actions done
* \param actions_failed List of actions failed
* \return The time spent to execute the simulation or -1 if the simulation ended
{
smx_process_t process = NULL;
- int i;
+ unsigned int iter;
double elapsed_time = 0.0;
static int state_modifications = 1;
- static int first = 1;
- xbt_context_empty_trash();
+ SIMIX_process_empty_trash();
if (xbt_swag_size(simix_global->process_to_run) && (elapsed_time > 0)) {
DEBUG0("**************************************************");
}
- if (first) {
- surf_solve(); /* Takes traces into account. Returns 0.0 */
- first = 0;
- }
+
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
- DEBUG2("Scheduling %s on %s",
- process->name, process->simdata->smx_host->name);
- simix_global->current_process = process;
- xbt_context_schedule(process->simdata->context);
- /* fflush(NULL); */
- simix_global->current_process = NULL;
+ DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
+ __SIMIX_process_schedule(process);
}
{
void *fun = NULL;
void *arg = NULL;
- xbt_dynar_foreach(model_list, i, 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;
+ xbt_dynar_foreach(model_list, iter, model) {
+ if (xbt_swag_size(model->states.failed_action_set)
+ || xbt_swag_size(model->states.done_action_set)) {
+ state_modifications = 1;
+ break;
}
}
DEBUG1("Elapsed_time %f", elapsed_time);
}
- while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
+ while (surf_timer_model->extension.timer.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);
- 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 (process && args->kill_time > SIMIX_get_clock()) {
+ surf_timer_model->extension.timer.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->smx_host->name);
+ SIMIX_process_kill(process);
}
}
/* Wake up all process waiting for the action finish */
- xbt_dynar_foreach(model_list, i, 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_dynar_foreach(model_list, iter, model) {
+ while ((action = xbt_swag_extract(model->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);
- }
+ while ((action = xbt_swag_extract(model->states.done_action_set))) {
+ smx_action = action->data;
+ if (smx_action) {
+ xbt_fifo_unshift(actions_done, smx_action);
+ }
}
}
}
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.");
}
*/
void SIMIX_timer_set(double date, void *function, void *arg)
{
- surf_timer_model->extension_public->set(date, function, arg);
+ surf_timer_model->extension.timer.set(date, function, arg);
}
int SIMIX_timer_get(void **function, void **arg)
{
- return surf_timer_model->extension_public->get(function, arg);
+ return surf_timer_model->extension.timer.get(function, arg);
}
/**
* \param function Create process function
*
*/
-void SIMIX_function_register_process_create(smx_creation_func_t * function)
+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;
}
* \param function Kill process function
*
*/
-void SIMIX_function_register_process_kill(void_f_pvoid_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;
}
* \param function cleanup process function
*
*/
-void SIMIX_function_register_process_cleanup(void_f_pvoid_t * function)
+void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
{
simix_global->cleanup_process_function = function;
}
