X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d92229e77a708f92cd8401d0d4497706e9a14b3..872d65264714799b25eb231609c3f05bae3d03dc:/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 d780d3c3d8..542fa68f22 100644
--- a/src/instr/jedule/jedule_sd_binding.cpp
+++ b/src/instr/jedule/jedule_sd_binding.cpp
@@ -18,33 +18,32 @@
 #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");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule, "Logging specific to Jedule SD binding");
 
 jedule_t jedule;
 
 void jedule_log_sd_event(SD_task_t task)
 {
-  xbt_dynar_t host_list;
   jed_event_t event;
-  int i;
 
   xbt_assert(task != NULL);
 
-  host_list = xbt_dynar_new(sizeof(char*), NULL);
+  xbt_dynar_t host_list = xbt_dynar_new(sizeof(char*), NULL);
 
-  for(i=0; i<task->host_count; i++) {
+  for(int i=0; i<task->host_count; i++) {
     const char *hostname = sg_host_get_name(task->host_list[i]);
     xbt_dynar_push(host_list, &hostname);
   }
 
-  create_jed_event(&event, (char*)SD_task_get_name(task),
-      task->start_time, task->finish_time,"SD");
+  create_jed_event(&event, (char*)SD_task_get_name(task), task->start_time, task->finish_time,"SD");
 
   jed_event_add_resources(event, host_list);
   jedule_store_event(event);
@@ -52,18 +51,17 @@ void jedule_log_sd_event(SD_task_t task)
   xbt_dynar_free(&host_list);
 }
 
-static void create_hierarchy(AS_t current_comp,
-                             jed_simgrid_container_t current_container)
+static void create_hierarchy(AS_t current_comp, jed_simgrid_container_t current_container)
 {
   xbt_dict_cursor_t cursor = NULL;
   char *key;
   AS_t elem;
-  xbt_dict_t routing_sons = surf_AS_get_routing_sons(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;
@@ -80,9 +78,9 @@ static void create_hierarchy(AS_t current_comp,
   } 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);
     }
   }
@@ -90,22 +88,18 @@ static void create_hierarchy(AS_t current_comp,
 
 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);
 }
 
-
 void jedule_sd_cleanup()
 {
   jedule_cleanup_output();
@@ -143,5 +137,4 @@ void jedule_sd_dump(const char * filename)
     free(fname);
   }
 }
-
 #endif