-/* $Id$ */
+/* $Id: smx_global.c 5483 2008-05-21 09:53:01Z alegrand $ */
/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
All rights reserved. */
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));
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();
-
+
simix_global->create_process_function = NULL;
simix_global->kill_process_function = NULL;
simix_global->cleanup_process_function = SIMIX_process_cleanup;
: ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
if (p_simdata->mutex) {
- who2 = bprintf("%s Blocked on mutex %p", who, 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);
free(who);
who = who2;
} else if (p_simdata->cond) {
who2 =
bprintf
("%s Blocked on condition %p; Waiting for the following actions:",
- who, p_simdata->cond);
+ 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,act);
+ who2 = bprintf("%s '%s'(%p)", who, act->name,(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?act:(void*)0xdead);
free(who);
who = who2;
}
*/
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);
}
- xbt_fifo_foreach(simix_global->host, i, h, smx_host_t) {
- __SIMIX_host_destroy(h);
- }
- xbt_fifo_free(simix_global->host);
+ xbt_dict_free(&(simix_global->host));
xbt_swag_free(simix_global->process_to_run);
xbt_swag_free(simix_global->process_list);
xbt_dict_free(&(simix_global->registered_functions));
simix_config_finalize();
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
*
unsigned int iter;
double elapsed_time = 0.0;
static int state_modifications = 1;
- static int first = 1;
xbt_context_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);