NetworkModelIntf: Interface to dynamic factors

[simgrid.git] / include / simgrid / kernel / routing / DijkstraZone.hpp

diff --git a/include/simgrid/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp
index b4d5258c0349e7d6c0e3ea1bdecec7aba71def93..ec3992fc7481d5cd12791ff24d050304e21a6d4c 100644 (file)
--- a/include/simgrid/kernel/routing/DijkstraZone.hpp
+++ b/include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. 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. */
@@ -8,7 +8,6 @@
 
 #include <simgrid/kernel/routing/RoutedZone.hpp>
 
-
 namespace simgrid {
 namespace kernel {
 namespace routing {
@@ -23,7 +22,6 @@ namespace routing {
  * long path resolution times.
  */
 class XBT_PRIVATE DijkstraZone : public RoutedZone {
-private:
   static void route_graph_delete(xbt_graph_t);
 
   std::unique_ptr<s_xbt_graph_t, decltype(&DijkstraZone::route_graph_delete)> route_graph_{
@@ -34,10 +32,11 @@ private:
 
   xbt_node_t route_graph_new_node(int id);
   xbt_node_t node_map_search(int id);
-  void new_edge(int src_id, int dst_id, RouteCreationArgs* e_route);
+  void new_edge(int src_id, int dst_id, Route* e_route);
+  void do_seal() override;
 
 public:
-  DijkstraZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel, bool cached);
+  DijkstraZone(const std::string& name, bool cached) : RoutedZone(name), cached_(cached) {}
 
   /* For each vertex (node) already in the graph,
    * make sure it also has a loopback link; this loopback
@@ -50,10 +49,9 @@ public:
    * After this function returns, any node in the graph
    * will have a loopback attached to it.
    */
-  void seal() override;
-  void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) override;
+  void get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat) override;
   void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                 std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
+                 const std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
 };
 } // namespace routing
 } // namespace kernel