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
*
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;
/* 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) {
- if(surf_link[SURF_LINK_LEVEL])
+ if(surf_link[SURF_LINK_LEVEL])
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
* 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()
*/
unsigned int iter, depcnt;
static int first_time = 1;
- if (first_time) {
- XBT_VERB("Starting simulation...");
+ if (first_time) {
+ XBT_VERB("Starting simulation...");
- surf_presolve(); /* Takes traces into account */
- first_time = 0;
- }
+ surf_presolve(); /* Takes traces into account */
+ first_time = 0;
+ }
+ XBT_VERB("Run simulation for %f seconds", how_long);
sd_global->watch_point_reached = 0;
xbt_swag_reset(sd_global->return_set);
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
- (how_long < 0.0 || total_time < how_long) &&
+ (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
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;
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_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_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_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;
-#ifdef HAVE_TRACING
- TRACE_end();
-#endif
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();