X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88474126433cd47e2289512aef9f6e0ddd260a4a..bd76919be169a04d524d59aaad0698411793a410:/src/surf/network_ib.hpp

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index a457a61f3c..ceab7b9d08 100644
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -7,9 +7,10 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
-#include <xbt/base.h>
+#include "src/surf/network_smpi.hpp"
+#include "xbt/base.h"
 
-#include "network_smpi.hpp"
+#include <unordered_map>
 
 namespace simgrid {
   namespace surf {
@@ -22,8 +23,8 @@ namespace simgrid {
       IBNode* destination;
       NetworkAction *action;
       double init_rate;
-      ActiveComm() : destination(NULL),action(NULL),init_rate(-1){};
-      ~ActiveComm(){};
+      ActiveComm() : destination(nullptr),action(nullptr),init_rate(-1){};
+      virtual ~ActiveComm() = default;
     };
 
     class IBNode{
@@ -36,7 +37,7 @@ namespace simgrid {
       //number of comms the node is receiving
       int nbActiveCommsDown;
       explicit IBNode(int id) : id(id),nbActiveCommsDown(0){};
-      ~IBNode(){};
+      virtual ~IBNode() = default;
     };
 
     class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
@@ -46,11 +47,11 @@ namespace simgrid {
     public:
       NetworkIBModel();
       explicit NetworkIBModel(const char *name);
-      ~NetworkIBModel();
+      ~NetworkIBModel() override;
       void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
 
-      xbt_dict_t active_nodes;
-      std::map<NetworkAction *, std::pair<IBNode*,IBNode*> > active_comms;
+      std::unordered_map<std::string, IBNode*> active_nodes;
+      std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;
 
       double Bs;
       double Be;