* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
+#include "instr/instr_interface.h"
#include "xbt/sysdep.h"
#include "xbt/dynar.h"
#include "surf/surf.h"
+#include "simgrid/sg_config.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/config.h"
-#include "instr/instr_private.h"
#include "surf/surfxml_parse.h"
#ifdef HAVE_LUA
#include <lua.h>
SD_global_t sd_global = NULL;
/**
- * \brief Initialises SD internal data
+ * \brief Initializes SD internal data
*
* This function must be called before any other SD function. Then you
* should call SD_create_environment().
surf_init(argc, argv);
- xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model",
+ xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model",
"ptask_L07");
#ifdef HAVE_TRACING
s_SD_task_t task;
- XBT_DEBUG("Recreating the swags...");
+ SD_task_t done_task, next_done_task;
+
+ XBT_DEBUG("Recreating the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
xbt_swag_free(sd_global->schedulable_task_set);
xbt_swag_free(sd_global->scheduled_task_set);
xbt_swag_free(sd_global->runnable_task_set);
xbt_swag_free(sd_global->in_fifo_task_set);
xbt_swag_free(sd_global->running_task_set);
- xbt_swag_free(sd_global->done_task_set);
xbt_swag_free(sd_global->failed_task_set);
sd_global->not_scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->schedulable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
+ if (xbt_dynar_is_empty(done_task->tasks_before)){
+ __SD_task_set_state(done_task, SD_SCHEDULABLE);
+ } else{
+ __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
+ done_task->unsatisfied_dependencies =
+ xbt_dynar_length(done_task->tasks_before);
+ done_task->is_not_ready = done_task->unsatisfied_dependencies;
+ }
+ }
+
+ xbt_swag_free(sd_global->done_task_set);
+
sd_global->scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->runnable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->task_number = 0;
+
#ifdef HAVE_JEDULE
jedule_sd_cleanup();
jedule_sd_init();
/**
* \brief Creates the environment
*
- * The environment (i.e. the \ref SD_workstation_management "workstations" and the
- * \ref SD_link_management "links") is created with the data stored in the given XML
- * platform file.
+ * The environment (i.e. the \ref SD_workstation_management "workstations"
+ * and the \ref SD_link_management "links") is created with the data stored
+ * in the given XML platform file.
*
* \param platform_file name of an XML file describing the environment to create
* \see SD_workstation_management, SD_link_management
* The function will execute the \ref SD_RUNNABLE runnable tasks.
* 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
+ * A non-positive 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.
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 (dst->is_not_ready > 0)
dst->is_not_ready--;
+ XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
+ SD_task_get_name(dst), dst->unsatisfied_dependencies,
+ dst->is_not_ready);
+
if (!(dst->unsatisfied_dependencies)) {
if (__SD_task_is_scheduled(dst))
__SD_task_set_state(dst, SD_RUNNABLE);
__SD_task_set_state(dst, SD_SCHEDULABLE);
}
+ if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) {
+ __SD_task_set_state(dst, SD_SCHEDULABLE);
+ }
+
if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
SD_dependency_t comm_dep;
SD_task_t comm_dst;
comm_dst->is_not_ready > 0) {
comm_dst->is_not_ready--;
+ XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
+ SD_task_get_name(dst), SD_task_get_name(comm_dst),
+ comm_dst->is_not_ready);
+
if (!(comm_dst->is_not_ready)) {
__SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
/**
* \brief Destroys all SD internal data
*
- * This function should be called when the simulation is over. Don't forget also to destroy
- * the tasks.
+ * This function should be called when the simulation is over. Don't forget
+ * to destroy too.
*
* \see SD_init(), SD_task_destroy()
*/
void SD_exit(void)
{
#ifdef HAVE_TRACING
- TRACE_surf_release();
+ TRACE_surf_resource_utilization_release();
#endif
xbt_mallocator_free(sd_global->task_mallocator);
