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
try a bit harder to get the simulated time without any function call
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
a31ee9b
..
a37608e
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-115,8
+115,6
@@
s_surf_model_description_t surf_network_model_description[] = {
{"Constant",
"Simplistic network model where all communication take a constant time (one second)",
NULL, surf_network_model_init_Constant},
{"Constant",
"Simplistic network model where all communication take a constant time (one second)",
NULL, surf_network_model_init_Constant},
- {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas",
- NULL, surf_network_model_init_Vivaldi},
{"CM02",
"Realistic network model with lmm_solve and no correction factors",
NULL, surf_network_model_init_CM02},
{"CM02",
"Realistic network model with lmm_solve and no correction factors",
NULL, surf_network_model_init_CM02},
@@
-308,10
+306,8
@@
void surf_init(int *argc, char **argv)
history = tmgr_history_new();
surf_config_init(argc, argv);
history = tmgr_history_new();
surf_config_init(argc, argv);
-#ifdef HAVE_MC
- if (_surf_do_model_check)
+ if (MC_IS_ENABLED)
MC_memory_init();
MC_memory_init();
-#endif
}
#ifdef _XBT_WIN32
}
#ifdef _XBT_WIN32
@@
-400,9
+396,9
@@
void surf_presolve(void)
model->model_private->update_actions_state(NOW, 0.0);
}
model->model_private->update_actions_state(NOW, 0.0);
}
-double surf_solve(
void
)
+double surf_solve(
double max_date
)
{
{
- double min = -1.0;
+ double min = -1.0;
/* duration */
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
@@
-411,7
+407,9
@@
double surf_solve(void)
tmgr_trace_event_t event = NULL;
unsigned int iter;
tmgr_trace_event_t event = NULL;
unsigned int iter;
- min = -1.0;
+ if (max_date != -1.0 && max_date != NOW) {
+ min = max_date - NOW;
+ }
DEBUG0("Looking for next action end");
xbt_dynar_foreach(model_list, iter, model) {
DEBUG0("Looking for next action end");
xbt_dynar_foreach(model_list, iter, model) {
@@
-451,6
+449,7
@@
double surf_solve(void)
}
}
}
}
+
/* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0.
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
* The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
/* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0.
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
* The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
@@
-467,7
+466,7
@@
double surf_solve(void)
return min;
}
return min;
}
-double surf_get_clock(void)
+
XBT_INLINE
double surf_get_clock(void)
{
return NOW;
}
{
return NOW;
}