From fa9f8bd4dce9b5c37e9c66ac09c9acc2e47e5bc3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 15 Dec 2016 08:21:25 +0100 Subject: [PATCH] fix jedule builds --- include/simgrid/jedule/jedule_platform.hpp | 2 +- src/instr/jedule/jedule_platform.cpp | 4 ++-- src/instr/jedule/jedule_sd_binding.cpp | 2 +- src/kernel/routing/NetZoneImpl.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/simgrid/jedule/jedule_platform.hpp b/include/simgrid/jedule/jedule_platform.hpp index 6c0055ed00..86b134ddf8 100644 --- a/include/simgrid/jedule/jedule_platform.hpp +++ b/include/simgrid/jedule/jedule_platform.hpp @@ -32,7 +32,7 @@ public: std::vector resource_list; void addChild(Container* child); void addResources(std::vector hosts); - void createHierarchy(AS_t from_as); + void createHierarchy(NetZone_t from_as); std::vector getHierarchy(); std::string getHierarchyAsString(); void print(FILE *file); diff --git a/src/instr/jedule/jedule_platform.cpp b/src/instr/jedule/jedule_platform.cpp index 226dc05fc2..6aedb79adc 100644 --- a/src/instr/jedule/jedule_platform.cpp +++ b/src/instr/jedule/jedule_platform.cpp @@ -59,11 +59,11 @@ void Container::addResources(std::vector hosts) } } -void Container::createHierarchy(AS_t from_as) +void Container::createHierarchy(NetZone_t from_as) { xbt_dict_cursor_t cursor = nullptr; char *key; - AS_t elem; + NetZone_t elem; xbt_dict_t routing_sons = from_as->children(); if (xbt_dict_is_empty(routing_sons)) { diff --git a/src/instr/jedule/jedule_sd_binding.cpp b/src/instr/jedule/jedule_sd_binding.cpp index 48bb260d9b..1790483604 100644 --- a/src/instr/jedule/jedule_sd_binding.cpp +++ b/src/instr/jedule/jedule_sd_binding.cpp @@ -33,7 +33,7 @@ void jedule_log_sd_event(SD_task_t task) void jedule_sd_init() { - AS_t root_comp = simgrid::s4u::Engine::instance()->rootAs(); + NetZone_t root_comp = simgrid::s4u::Engine::instance()->netRoot(); XBT_DEBUG("root name %s\n", root_comp->name()); my_jedule = new simgrid::jedule::Jedule(); diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 27b454b689..00a013898a 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -173,7 +173,7 @@ static void find_common_ancestors(NetCard* src, NetCard* dst, * * This works because all SimGrid platform have a unique root element (that is the last element of both paths). */ - NetZoneImpl* father = nullptr; // the AS we dropped on the previous loop iteration + NetZoneImpl* father = nullptr; // the netzone we dropped on the previous loop iteration while (path_src.size() > 1 && path_dst.size() > 1 && path_src.at(path_src.size() - 1) == path_dst.at(path_dst.size() - 1)) { father = path_src.at(path_src.size() - 1); -- 2.20.1