X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6de5d3fc33ec47c1b0d97e24463de43dd4eb129..19b3962253112b19308537bc2400de141c119d99:/src/instr/jedule/jedule_sd_binding.cpp

diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp
index 0da355cfdd..782bb6e0e8 100644
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -1,26 +1,15 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "xbt/asserts.h"
-
-#include "src/surf/surf_private.h"
-#include "surf/surf.h"
-
 #include "simgrid/jedule/jedule_sd_binding.h"
-#include "simgrid/simdag.h"
-#include "simgrid/s4u/As.hpp"
-#include "simgrid/s4u/engine.hpp"
-
-#include <stdio.h>
-#include "simgrid/forward.h"
 
 #include "simgrid/jedule/jedule.hpp"
-#include "simgrid/jedule/jedule_events.hpp"
-#include "simgrid/jedule/jedule_platform.hpp"
-#include "../../simdag/simdag_private.hpp"
+#include "src/simdag/simdag_private.hpp"
+
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 
 #if HAVE_JEDULE
 
@@ -33,15 +22,15 @@ void jedule_log_sd_event(SD_task_t task)
 {
   xbt_assert(task != nullptr);
 
-  jed_event_t event =
-      new simgrid::jedule::Event(std::string(SD_task_get_name(task)), task->start_time, task->finish_time,"SD");
+  jed_event_t event = new simgrid::jedule::Event(std::string(SD_task_get_name(task)),
+                                                 SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD");
   event->addResources(task->allocation);
   my_jedule->event_set.push_back(event);
 }
 
-void jedule_setup_platform()
+void jedule_sd_init()
 {
-  AS_t root_comp = simgrid::s4u::Engine::instance()->rootAs();
+  sg_netzone_t root_comp = simgrid::s4u::Engine::instance()->netRoot();
   XBT_DEBUG("root name %s\n", root_comp->name());
 
   my_jedule = new simgrid::jedule::Jedule();
@@ -51,15 +40,6 @@ void jedule_setup_platform()
   my_jedule->root_container = root_container;
 }
 
-void jedule_sd_cleanup()
-{
-  my_jedule->cleanupOutput();
-}
-
-void jedule_sd_init()
-{
-}
-
 void jedule_sd_exit(void)
 {
   delete my_jedule;