X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/527d6ea1ad739bddb768c4dc654085ddce6fe8bb..cdf6a962eb4e88efbed3df9c41343adabcf09e6c:/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 4206fdb918..5819009b9c 100644
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -1,20 +1,15 @@
-/* Copyright (c) 2010-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2019. 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 "simgrid/jedule/jedule_sd_binding.h"
-
-#include "simgrid/forward.h"
-
-#include "../../simdag/simdag_private.hpp"
 #include "simgrid/jedule/jedule.hpp"
+#include "src/simdag/simdag_private.hpp"
+
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/engine.hpp"
 
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
 
 XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule, "Logging specific to Jedule SD binding");
@@ -25,25 +20,22 @@ 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)),
-                                                 SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD");
-  event->addResources(task->allocation);
-  my_jedule->event_set.push_back(event);
+  simgrid::jedule::Event event(std::string(SD_task_get_name(task)), SD_task_get_start_time(task),
+                               SD_task_get_finish_time(task), "SD");
+  event.add_resources(*task->allocation);
+  my_jedule->event_set_.emplace_back(std::move(event));
 }
 
 void jedule_sd_init()
 {
-  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();
+  sg_netzone_t root_comp = simgrid::s4u::Engine::get_instance()->get_netzone_root();
+  XBT_DEBUG("root name %s\n", root_comp->get_cname());
 
-  jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->name()));
-  root_container->createHierarchy(root_comp);
-  my_jedule->root_container = root_container;
+  my_jedule = new simgrid::jedule::Jedule(root_comp->get_name());
+  my_jedule->root_container_.create_hierarchy(root_comp);
 }
 
-void jedule_sd_exit(void)
+void jedule_sd_exit()
 {
   delete my_jedule;
 }
@@ -52,7 +44,7 @@ void jedule_sd_dump(const char * filename)
 {
   if (my_jedule) {
     char *fname;
-    if (!filename) {
+    if (not filename) {
       fname = bprintf("%s.jed", xbt_binary_name);
     } else {
       fname = xbt_strdup(filename);
@@ -60,7 +52,7 @@ void jedule_sd_dump(const char * filename)
 
     FILE *fh = fopen(fname, "w");
 
-    my_jedule->writeOutput(fh);
+    my_jedule->write_output(fh);
 
     fclose(fh);
     xbt_free(fname);