#include "simgrid/host.h"
#include "src/simdag/simdag_private.h"
#include "src/surf/surf_interface.hpp"
-
-#include "xbt/dynar.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
+#include "simgrid/s4u/engine.hpp"
#ifdef HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
surf_init(argc, argv);
- xbt_cfg_setdefault_string(_sg_cfg_set, "host/model",
- "ptask_L07");
+ xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", "ptask_L07");
#ifdef HAVE_JEDULE
jedule_sd_init();
*/
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
/* let's see which tasks have just failed */
while ((action = surf_model_extract_failed_action_set(model))) {
task = (SD_task_t) action->getData();
- task->start_time = surf_action_get_start_time(task->surf_action);
+ task->start_time = task->surf_action->getStartTime();
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
SD_task_set_state(task, SD_FAILED);
void SD_exit(void)
{
TRACE_surf_resource_utilization_release();
- TRACE_end();
#ifdef HAVE_JEDULE
jedule_sd_cleanup();
xbt_dynar_free_container(&(sd_global->return_set));
xbt_free(sd_global);
sd_global = NULL;
-
- surf_exit();
}