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
Make SIMIX_req_host_execution_wait to also destroy the execution action when done.
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
ad9b625
..
26bfeea
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-115,14
+115,15
@@
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},
- {"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},
{"LV08",
"Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
NULL, surf_network_model_init_LegrandVelho},
+ {"LV08_im",
+ "Realistic network model with IMPROVED ACTION MANAGEMENT and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
+ NULL, im_surf_network_model_init_LegrandVelho},
{"SMPI",
"Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
NULL, surf_network_model_init_SMPI},
@@
-308,10
+309,8
@@
void surf_init(int *argc, char **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();
-#endif
}
#ifdef _XBT_WIN32
@@
-467,10
+466,14
@@
double surf_solve(double max_date)
xbt_dynar_foreach(model_list, iter, model)
model->model_private->update_actions_state(NOW, min);
+#ifdef HAVE_TRACING
+ TRACE_paje_dump_buffer (0);
+#endif
+
return min;
}
-double surf_get_clock(void)
+
XBT_INLINE
double surf_get_clock(void)
{
return NOW;
}