Added Mailbox::set_receiver to python binding

[simgrid.git] / src / instr / instr_platform.cpp

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index f273438..2323f6c 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -29,11 +29,6 @@ std::string instr_pid(simgrid::s4u::Actor const& proc)
   return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
 }
 
-static const char* instr_node_name(const s_xbt_node_t* node)
-{
-  return static_cast<char*>(xbt_graph_node_get_data(node));
-}
-
 static container_t lowestCommonAncestor(const simgrid::instr::Container* a1, const simgrid::instr::Container* a2)
 {
   // this is only an optimization (since most of a1 and a2 share the same parent)
@@ -166,7 +161,7 @@ static void recursiveNewVariableType(const std::string& new_typename, const std:
   if (root->get_name() == "LINK")
     root->by_name_or_create(std::string("b") + new_typename, color);
 
-  for (auto const& elm : root->children_) {
+  for (auto const& elm : root->get_children()) {
     recursiveNewVariableType(new_typename, color, elm.second.get());
   }
 }
@@ -182,7 +177,7 @@ static void recursiveNewUserVariableType(const std::string& father_type, const s
   if (root->get_name() == father_type) {
     root->by_name_or_create(new_typename, color);
   }
-  for (auto const& elm : root->children_)
+  for (auto const& elm : root->get_children())
     recursiveNewUserVariableType(father_type, new_typename, color, elm.second.get());
 }
 
@@ -198,7 +193,7 @@ static void recursiveNewUserStateType(const std::string& father_type, const std:
   if (root->get_name() == father_type)
     root->by_name_or_create<simgrid::instr::StateType>(new_typename);
 
-  for (auto const& elm : root->children_)
+  for (auto const& elm : root->get_children())
     recursiveNewUserStateType(father_type, new_typename, elm.second.get());
 }
 
@@ -213,7 +208,7 @@ static void recursiveNewValueForUserStateType(const std::string& type_name, cons
   if (root->get_name() == type_name)
     static_cast<simgrid::instr::StateType*>(root)->add_entity_value(val, color);
 
-  for (auto const& elm : root->children_)
+  for (auto const& elm : root->get_children())
     recursiveNewValueForUserStateType(type_name, val, color, elm.second.get());
 }
 
@@ -222,16 +217,6 @@ void instr_new_value_for_user_state_type(const std::string& type_name, const cha
   recursiveNewValueForUserStateType(type_name, value, color, simgrid::instr::Container::get_root()->type_);
 }
 
-static void recursiveXBTGraphExtraction(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t>* nodes,
-                                        std::map<std::string, xbt_edge_t>* edges, const_sg_netzone_t netzone)
-{
-  // bottom-up recursion
-  for (auto const& netzone_child : netzone->get_children())
-    recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child);
-
-  netzone->get_impl()->get_graph(graph, nodes, edges);
-}
-
 namespace simgrid {
 namespace instr {
 
@@ -240,7 +225,7 @@ void platform_graph_export_graphviz(const std::string& output_filename)
   xbt_graph_t g                            = xbt_graph_new_graph(0, nullptr);
   std::map<std::string, xbt_node_t>* nodes = new std::map<std::string, xbt_node_t>();
   std::map<std::string, xbt_edge_t>* edges = new std::map<std::string, xbt_edge_t>();
-  recursiveXBTGraphExtraction(g, nodes, edges, s4u::Engine::get_instance()->get_netzone_root());
+  s4u::Engine::get_instance()->get_netzone_root()->extract_xbt_graph(g, nodes, edges);
 
   std::ofstream fs;
   fs.open(output_filename, std::ofstream::out);
@@ -257,11 +242,11 @@ void platform_graph_export_graphviz(const std::string& output_filename)
   fs << "  node [width=.3, height=.3, style=filled, color=skyblue]" << std::endl << std::endl;
 
   for (auto const& elm : *nodes)
-    fs << "  \"" << instr_node_name(elm.second) << "\";" << std::endl;
+    fs << "  \"" << elm.first << "\";" << std::endl;
 
   for (auto const& elm : *edges) {
-    const char* src_s = instr_node_name(elm.second->src);
-    const char* dst_s = instr_node_name(elm.second->dst);
+    const char* src_s = static_cast<char*>(elm.second->src->data);
+    const char* dst_s = static_cast<char*>(elm.second->dst->data);
     if (g->directed)
       fs << "  \"" << src_s << "\" -> \"" << dst_s << "\";" << std::endl;
     else
@@ -321,6 +306,7 @@ static void on_link_creation(s4u::Link const& link)
     latency->set_calling_container(container);
     latency->set_event(0, link.get_latency());
   }
+
   if (TRACE_uncategorized()) {
     container->type_->by_name_or_create("bandwidth_used", "0.5 0.5 0.5");
   }
@@ -404,7 +390,7 @@ static void on_platform_created()
   recursiveGraphExtraction(s4u::Engine::get_instance()->get_netzone_root(), Container::get_root(), filter);
   XBT_DEBUG("Graph extraction finished.");
   delete filter;
-  TRACE_paje_dump_buffer(true);
+  dump_buffer(true);
 }
 
 static void on_actor_creation(s4u::Actor const& actor)
@@ -477,7 +463,6 @@ void define_callbacks()
     kernel::routing::NetPoint::on_creation.connect(on_netpoint_creation);
   }
   s4u::NetZone::on_creation.connect(on_netzone_creation);
-  s4u::Engine::on_time_advance.connect([](double /*time_delta*/) { TRACE_paje_dump_buffer(false); });
 
   kernel::resource::CpuAction::on_state_change.connect(on_action_state_change);
   s4u::Link::on_communication_state_change.connect(on_action_state_change);