#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>
DEBUG2("Workstation number: %d, link number: %d",
SD_workstation_get_number(), SD_link_get_number());
-
-#ifdef HAVE_TRACING
- TRACE_surf_save_onelink();
-#endif
}
/**
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){
xbt_free(sd_global);
sd_global = NULL;
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
DEBUG0("Exiting Surf...");
surf_exit();
} else {
WARN0("SD_exit() called, but SimDag is not running");
/* we cannot use exceptions here because xbt is not running! */
}
-#ifdef HAVE_TRACING
- TRACE_end();
-#endif
}
/**