A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce log appenders
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
5742d2b
..
9bcb36d
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-113,7
+113,7
@@
void SIMIX_global_init(int *argc, char **argv)
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
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 =
simix_global->process_to_run =
xbt_swag_new(xbt_swag_offset(proc, synchro_hookup));
simix_global->process_list =
@@
-153,18
+153,18
@@
void SIMIX_display_process_status(void)
: ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
if (p_simdata->mutex) {
: ((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:",
free(who);
who = who2;
} else if (p_simdata->cond) {
who2 =
bprintf
("%s Blocked on condition %p; Waiting for the following actions:",
- who,
p_simdata->con
d);
+ who,
(XBT_LOG_ISENABLED(simix_kernel,xbt_log_priority_verbose))?p_simdata->cond:(void*)0xdea
d);
free(who);
who = who2;
xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
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;
}
free(who);
who = who2;
}
@@
-278,18
+278,13
@@
void SIMIX_process_killall()
*/
void SIMIX_clean(void)
{
*/
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);
}
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));
xbt_swag_free(simix_global->process_to_run);
xbt_swag_free(simix_global->process_list);
xbt_dict_free(&(simix_global->registered_functions));
@@
-313,6
+308,15
@@
double SIMIX_get_clock(void)
return surf_get_clock();
}
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
*
/**
* \brief Does a turn of the simulation
*
@@
-328,16
+332,12
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
unsigned int iter;
double elapsed_time = 0.0;
static int state_modifications = 1;
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("**************************************************");
}
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);
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
DEBUG2("Scheduling %s on %s",
process->name, process->simdata->smx_host->name);