#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/config.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
#ifdef HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
sd_global->task_number = 0;
surf_init(argc, argv);
+
xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model",
"ptask_L07");
+
+#ifdef HAVE_TRACING
+ TRACE_start ();
+#endif
}
/**
DEBUG2("Workstation number: %d, link number: %d",
SD_workstation_get_number(), SD_link_get_number());
-
-#ifdef HAVE_TRACING
- TRACE_surf_save_onelink();
-#endif
}
/**
* \brief Launches the simulation.
*
* The function will execute the \ref SD_RUNNABLE runnable tasks.
- * The simulation will be stopped when its time reaches \a how_long,
- * when a watch point is reached, or when no more task can be executed.
+ * If \a how_long is positive, then the simulation will be stopped either
+ * when time reaches \a how_long or when a watch point is reached.
+ * A nonpositive value for \a how_long means no time limit, in which case
+ * the simulation will be stopped either when a watch point is reached or
+ * when no more task can be executed.
* Then you can call SD_simulate() again.
*
* \param how_long maximum duration of the simulation (a negative value means no time limit)
SD_CHECK_INIT_DONE();
- VERB0("Starting simulation...");
+ if (first_time) {
+ VERB0("Starting simulation...");
- if (first_time) {
surf_presolve(); /* Takes traces into account */
first_time = 0;
}
- if (how_long > 0) {
- surf_timer_model->extension.timer.set(surf_get_clock() + how_long,
- NULL, NULL);
- }
sd_global->watch_point_reached = 0;
/* explore the runnable tasks */
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
- void *fun = NULL;
- void *arg = NULL;
DEBUG1("Total time: %f", total_time);
- elapsed_time = surf_solve();
+ elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
DEBUG1("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
xbt_dynar_push(changed_tasks, &task);
}
}
+ }
- while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
+ if (!sd_global->watch_point_reached && how_long<0){
+ if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
+ WARN0("Simulation is finished but some tasks are still not done");
+ xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
+ WARN1("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
+ }
+ xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
+ WARN1("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
+ }
+ xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
+ WARN1("%s is in SD_SCHEDULED state", SD_task_get_name(task));
+ }
}
}
- VERB0("Simulation finished");
DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
elapsed_time, total_time, sd_global->watch_point_reached);
DEBUG1("current time = %f", surf_get_clock());
xbt_free(sd_global);
sd_global = NULL;
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
DEBUG0("Exiting Surf...");
surf_exit();
} else {