Concatenate nested namespaces (sonar).

[simgrid.git] / src / surf / network_ib.hpp

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index df41a88..69b52fc 100644 (file)
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017. The SimGrid Team.
+/* Copyright (c) 2014-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,57 +10,50 @@
 #include "src/surf/network_smpi.hpp"
 #include "xbt/base.h"
 
-#include <unordered_map>
+#include <map>
 #include <vector>
 
-namespace simgrid {
-  namespace surf {
-
-    class XBT_PRIVATE IBNode;
-
-    class XBT_PRIVATE ActiveComm{
-    public :
-      //IBNode* origin;
-      IBNode* destination;
-      NetworkAction *action;
-      double init_rate;
-      ActiveComm() : destination(nullptr),action(nullptr),init_rate(-1){};
-      virtual ~ActiveComm() = default;
-    };
-
-    class IBNode{
-    public :
-      int id;
-      //store related links, to ease computation of the penalties
-      std::vector<ActiveComm*> ActiveCommsUp;
-      //store the number of comms received from each node
-      std::map<IBNode*, int> ActiveCommsDown;
-      //number of comms the node is receiving
-      int nbActiveCommsDown;
-      explicit IBNode(int id) : id(id),nbActiveCommsDown(0){};
-      virtual ~IBNode() = default;
-    };
-
-    class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
-    private:
-      void updateIBfactors_rec(IBNode* root, std::vector<bool>& updatedlist);
-      void computeIBfactors(IBNode *root);
-    public:
-      NetworkIBModel();
-      explicit NetworkIBModel(const char *name);
-      ~NetworkIBModel() override;
-      void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
-
-      std::unordered_map<std::string, IBNode*> active_nodes;
-      std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;
-
-      double Bs;
-      double Be;
-      double ys;
-
-    };
-
-  }
-}
-
+namespace simgrid::kernel::resource {
+
+class XBT_PRIVATE IBNode;
+
+struct XBT_PRIVATE ActiveComm {
+  IBNode* destination   = nullptr;
+  NetworkAction* action = nullptr;
+  double init_rate      = -1;
+};
+
+class IBNode {
+public:
+  int id_;
+  // store related links, to ease computation of the penalties
+  std::vector<ActiveComm*> active_comms_up_;
+  // store the number of comms received from each node
+  std::map<IBNode*, int> active_comms_down_;
+  // number of comms the node is receiving
+  int nb_active_comms_down_ = 0;
+  explicit IBNode(int id) : id_(id){};
+};
+
+class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
+  std::unordered_map<std::string, IBNode> active_nodes;
+  std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;
+
+  double Bs_;
+  double Be_;
+  double ys_;
+  void update_IB_factors_rec(IBNode* root, std::vector<bool>& updatedlist) const;
+  void compute_IB_factors(IBNode* root) const;
+
+public:
+  explicit NetworkIBModel(const std::string& name);
+  NetworkIBModel(const NetworkIBModel&) = delete;
+  NetworkIBModel& operator=(const NetworkIBModel&) = delete;
+  void update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const;
+
+  static void IB_create_host_callback(s4u::Host const& host);
+  static void IB_action_state_changed_callback(NetworkAction& action, Action::State /*previous*/);
+  static void IB_comm_start_callback(const activity::CommImpl& comm);
+};
+} // namespace simgrid::kernel::resource
 #endif