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
Fix a bug making that the simulation ran longer than expected
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
3f1ceb9
..
1ca32d0
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-30,10
+30,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
SD_global_t sd_global = NULL;
SD_global_t sd_global = NULL;
-XBT_LOG_EXTERNAL_CATEGORY(sd_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(sd_task);
-XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
-
/**
* \brief Initialises SD internal data
*
/**
* \brief Initialises SD internal data
*
@@
-54,12
+50,6
@@
void SD_init(int *argc, char **argv)
xbt_assert(sd_global == NULL, "SD_init() already called");
xbt_assert(sd_global == NULL, "SD_init() already called");
- /* Connect our log channels: that must be done manually under windows */
- XBT_LOG_CONNECT(sd_kernel, sd);
- XBT_LOG_CONNECT(sd_task, sd);
- XBT_LOG_CONNECT(sd_workstation, sd);
-
-
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstation_list = NULL;
sd_global->link_list = NULL;
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstation_list = NULL;
sd_global->link_list = NULL;
@@
-186,12
+176,12
@@
void SD_create_environment(const char *platform_file)
/* now let's create the SD wrappers for workstations and links */
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
/* now let's create the SD wrappers for workstations and links */
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
-
if(surf_workstation[SURF_WKS_LEVEL])
-
__SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
+ if(surf_workstation[SURF_WKS_LEVEL])
+ __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
}
xbt_lib_foreach(link_lib, cursor, name, surf_link) {
}
xbt_lib_foreach(link_lib, cursor, name, surf_link) {
-
if(surf_link[SURF_LINK_LEVEL])
+ if(surf_link[SURF_LINK_LEVEL])
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
@@
-214,7
+204,7
@@
void SD_create_environment(const char *platform_file)
* Then you can call SD_simulate() again.
*
* \param how_long maximum duration of the simulation (a negative value means no time limit)
* Then you can call SD_simulate() again.
*
* \param how_long maximum duration of the simulation (a negative value means no time limit)
- * \return a
NULL-terminated array
of \ref SD_task_t whose state has changed.
+ * \return a
dynar
of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
* \see SD_task_schedule(), SD_task_watch()
*/
@@
-268,7
+258,7
@@
xbt_swag_t SD_simulate_swag(double how_long) {
XBT_DEBUG("Total time: %f", total_time);
XBT_DEBUG("Total time: %f", total_time);
- elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
+ elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long
- total_time
: -1.0);
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
@@
-351,15
+341,15
@@
xbt_swag_t SD_simulate_swag(double how_long) {
if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
XBT_WARN("Simulation is finished but %d tasks are still not done",
(sd_global->task_number - xbt_swag_size(sd_global->done_task_set)));
if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
XBT_WARN("Simulation is finished but %d tasks are still not done",
(sd_global->task_number - xbt_swag_size(sd_global->done_task_set)));
- xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
+
xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
-
}
-
xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
+ }
+ xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
-
}
- xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
+ }
+
xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
-
}
+ }
}
}
}
}
@@
-411,15
+401,16
@@
void SD_exit(void)
xbt_swag_free(sd_global->failed_task_set);
xbt_swag_free(sd_global->return_set);
xbt_swag_free(sd_global->failed_task_set);
xbt_swag_free(sd_global->return_set);
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
XBT_DEBUG("Exiting Surf...");
surf_exit();
xbt_free(sd_global);
sd_global = NULL;
XBT_DEBUG("Exiting Surf...");
surf_exit();
xbt_free(sd_global);
sd_global = NULL;
-#ifdef HAVE_TRACING
- TRACE_end();
-#endif
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();