move some storage-related content out of routing into storage area

[simgrid.git] / 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 58766b5..ee3c110 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -1,26 +1,16 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
+/* Copyright (c) 2010-2016. 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 "xbt/dynar.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_events.hpp"
-#include "simgrid/jedule/jedule_output.hpp"
-#include "simgrid/jedule/jedule_platform.hpp"
+#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/jedule/jedule.hpp"
 #include "../../simdag/simdag_private.hpp"
 
 #if HAVE_JEDULE
@@ -34,41 +24,27 @@ 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);
-  jedule_store_event(event);
+  my_jedule->event_set.push_back(event);
 }
 
-void jedule_setup_platform()
+void jedule_sd_init()
 {
-  jed_create_jedule(&my_jedule);
-
   AS_t root_comp = simgrid::s4u::Engine::instance()->rootAs();
   XBT_DEBUG("root name %s\n", root_comp->name());
 
-  jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->name()));
-  my_jedule->root_container = root_container;
+  my_jedule = new simgrid::jedule::Jedule();
 
+  jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->name()));
   root_container->createHierarchy(root_comp);
-}
-
-void jedule_sd_cleanup()
-{
-  jedule_cleanup_output();
-}
-
-void jedule_sd_init()
-{
-  jedule_init_output();
+  my_jedule->root_container = root_container;
 }
 
 void jedule_sd_exit(void)
 {
-  if (my_jedule) {
-    jed_free_jedule(my_jedule);
-    my_jedule = nullptr;
-  }
+  delete my_jedule;
 }
 
 void jedule_sd_dump(const char * filename)
@@ -83,7 +59,7 @@ void jedule_sd_dump(const char * filename)
 
     FILE *fh = fopen(fname, "w");
 
-    write_jedule_output(fh, my_jedule, jedule_event_list);
+    my_jedule->writeOutput(fh);
 
     fclose(fh);
     xbt_free(fname);