#include "simgrid/host.h"
#include "src/simdag/simdag_private.h"
#include "src/surf/surf_interface.hpp"
+#include "simgrid/s4u/engine.hpp"
-#include "xbt/dynar.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
#endif
xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", "ptask_L07");
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_sd_init();
#endif
*/
void SD_create_environment(const char *platform_file)
{
- parse_platform_file(platform_file);
+ simgrid::s4u::Engine::instance()->loadPlatform(platform_file);
XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count());
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_setup_platform();
#endif
XBT_VERB("Starting simulation...");
xbt_dynar_t SD_simulate(double how_long) {
/* we stop the simulation when total_time >= how_long */
double total_time = 0.0;
- double elapsed_time = 0.0;
SD_task_t task, dst;
SD_dependency_t dependency;
surf_action_t action;
}
/* main loop */
- elapsed_time = 0.0;
+ double elapsed_time = 0.0;
while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
void SD_exit(void)
{
TRACE_surf_resource_utilization_release();
- TRACE_end();
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_sd_cleanup();
jedule_sd_exit();
#endif
xbt_dynar_free_container(&(sd_global->return_set));
xbt_free(sd_global);
sd_global = NULL;
-
- surf_exit();
}