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
It's the least I can do in a cancel function...
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
deebe97
..
85ad156
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-114,7
+114,7
@@
xbt_dynar_t surf_path = NULL;
s_surf_model_description_t surf_network_model_description[] = {
{"Constant", NULL, surf_network_model_init_Constant},
{"CM02", NULL, surf_network_model_init_CM02},
s_surf_model_description_t surf_network_model_description[] = {
{"Constant", NULL, surf_network_model_init_Constant},
{"CM02", NULL, surf_network_model_init_CM02},
- {"L
egrandVelho
", NULL, surf_network_model_init_LegrandVelho},
+ {"L
V08
", NULL, surf_network_model_init_LegrandVelho},
#ifdef HAVE_GTNETS
{"GTNets", NULL, surf_network_model_init_GTNETS},
#endif
#ifdef HAVE_GTNETS
{"GTNets", NULL, surf_network_model_init_GTNETS},
#endif
@@
-125,7
+125,9
@@
s_surf_model_description_t surf_network_model_description[] = {
};
s_surf_model_description_t surf_cpu_model_description[] = {
};
s_surf_model_description_t surf_cpu_model_description[] = {
- {"Cas01", NULL, surf_cpu_model_init_Cas01},
+ {"Cas01_fullupdate", NULL, surf_cpu_model_init_Cas01},
+ {"Cas01", NULL, surf_cpu_model_init_Cas01_im},
+ {"CpuTI", NULL, surf_cpu_model_init_ti},
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
@@
-273,7
+275,7
@@
void surf_init(int *argc, char **argv)
#ifdef WIN32
# define FILE_DELIM "\\"
#else
#ifdef WIN32
# define FILE_DELIM "\\"
#else
-# define FILE_DELIM "/" /* FIXME: move to better location */
+# define FILE_DELIM "/"
/* FIXME: move to better location */
#endif
FILE *surf_fopen(const char *name, const char *mode)
#endif
FILE *surf_fopen(const char *name, const char *mode)
@@
-285,12
+287,12
@@
FILE *surf_fopen(const char *name, const char *mode)
xbt_assert(name);
xbt_assert(name);
- if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */
+ if (__surf_is_absolute_file_path(name))
/* don't mess with absolute file names */
return fopen(name, mode);
/* search relative files in the path */
xbt_dynar_foreach(surf_path, cpt, path_elm) {
return fopen(name, mode);
/* search relative files in the path */
xbt_dynar_foreach(surf_path, cpt, path_elm) {
- buff = bprintf("%s" FILE_DELIM "%s", path_elm,name);
+ buff = bprintf("%s" FILE_DELIM "%s", path_elm,
name);
file = fopen(buff, mode);
free(buff);
file = fopen(buff, mode);
free(buff);
@@
-382,13
+384,10
@@
double surf_solve(void)
}
DEBUG1("Next action end : %f", min);
}
DEBUG1("Next action end : %f", min);
- if (min < 0.0)
- return -1.0;
-
DEBUG0("Looking for next event");
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
DEBUG0("Looking for next event");
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
- DEBUG1("Next event : %f", next_event_date);
- if (
next_event_date > NOW + min
)
+ DEBUG1("Next
TRACE
event : %f", next_event_date);
+ if (
(min != -1.0) && (next_event_date > NOW + min)
)
break;
DEBUG0("Updating models");
while ((event =
break;
DEBUG0("Updating models");
while ((event =
@@
-401,12
+400,19
@@
double surf_solve(void)
}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
- resource->model->model_private->update_resource_state(resource,
- event, value,
- NOW + min);
+ DEBUG2("Calling update_resource_state for resource %s with min %lf",
+ resource->model->name, min);
+ resource->model->model_private->update_resource_state(resource, event,
+ value, NOW + min);
}
}
}
}
+ /* 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 */
+ if (min < 0.0)
+ return -1.0;
+
DEBUG1("Duration set to %f", min);
NOW = NOW + min;
DEBUG1("Duration set to %f", min);
NOW = NOW + min;