SD_task_t simplification

[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 f22c577..cf20f13 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -18,9 +18,12 @@
 #include "simgrid/simdag.h"
 #include "src/simdag/simdag_private.h"
 
+#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/engine.hpp"
+
 #include <stdio.h>
 
-#ifdef HAVE_JEDULE
+#if 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");
@@ -31,12 +34,12 @@ void jedule_log_sd_event(SD_task_t task)
 {
   jed_event_t event;
 
-  xbt_assert(task != NULL);
+  xbt_assert(task != nullptr);
 
-  xbt_dynar_t host_list = xbt_dynar_new(sizeof(char*), NULL);
+  xbt_dynar_t host_list = xbt_dynar_new(sizeof(char*), nullptr);
 
-  for(int i=0; i<task->host_count; i++) {
-    const char *hostname = sg_host_get_name(task->host_list[i]);
+  for(auto host: *task->allocation){
+    const char *hostname = sg_host_get_name(host);
     xbt_dynar_push(host_list, &hostname);
   }
 
@@ -50,20 +53,20 @@ void jedule_log_sd_event(SD_task_t task)
 
 static void create_hierarchy(AS_t current_comp, jed_simgrid_container_t current_container)
 {
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   char *key;
   AS_t elem;
-  xbt_dict_t routing_sons = surf_AS_get_children(current_comp);
+  xbt_dict_t routing_sons = current_comp->children();
 
   if (xbt_dict_is_empty(routing_sons)) {
     // I am no AS
     // add hosts to jedule platform
-    xbt_dynar_t table = surf_AS_get_hosts(current_comp);
+    xbt_dynar_t table = current_comp->hosts();
     xbt_dynar_t hosts;
     unsigned int dynar_cursor;
     sg_host_t host_elem;
 
-    hosts = xbt_dynar_new(sizeof(char*), NULL);
+    hosts = xbt_dynar_new(sizeof(char*), nullptr);
 
     xbt_dynar_foreach(table, dynar_cursor, host_elem) {
       xbt_dynar_push_as(hosts, const char*, sg_host_get_name(host_elem));
@@ -75,9 +78,9 @@ static void create_hierarchy(AS_t current_comp, jed_simgrid_container_t current_
   } else {
     xbt_dict_foreach(routing_sons, cursor, key, elem) {
       jed_simgrid_container_t child_container;
-      jed_simgrid_create_container(&child_container, surf_AS_get_name(elem));
+      jed_simgrid_create_container(&child_container, elem->name());
       jed_simgrid_add_container(current_container, child_container);
-      XBT_DEBUG("name : %s\n", surf_AS_get_name(elem));
+      XBT_DEBUG("name : %s\n", elem->name());
       create_hierarchy(elem, child_container);
     }
   }
@@ -85,16 +88,13 @@ static void create_hierarchy(AS_t current_comp, jed_simgrid_container_t current_
 
 void jedule_setup_platform()
 {
-  AS_t root_comp;
-
-  jed_simgrid_container_t root_container;
-
   jed_create_jedule(&jedule);
 
-  root_comp = surf_AS_get_routing_root();
-  XBT_DEBUG("root name %s\n", surf_AS_get_name(root_comp));
+  AS_t root_comp = simgrid::s4u::Engine::instance()->rootAs();
+  XBT_DEBUG("root name %s\n", root_comp->name());
 
-  jed_simgrid_create_container(&root_container, surf_AS_get_name(root_comp));
+  jed_simgrid_container_t root_container;
+  jed_simgrid_create_container(&root_container, root_comp->name());
   jedule->root_container = root_container;
 
   create_hierarchy(root_comp, root_container);
@@ -114,7 +114,7 @@ void jedule_sd_exit(void)
 {
   if (jedule) {
     jed_free_jedule(jedule);
-    jedule = NULL;
+    jedule = nullptr;
   }
 }
 
@@ -131,7 +131,7 @@ void jedule_sd_dump(const char * filename)
 
     fh = fopen(fname, "w");
 
-    write_jedule_output(fh, jedule, jedule_event_list, NULL);
+    write_jedule_output(fh, jedule, jedule_event_list, nullptr);
 
     fclose(fh);
     free(fname);