X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3516ecc808bba20973c58b49c33dded30960613a..2f4b313c80827568ce888a6bc1575739d002a6c3:/src/surf/network_ib.hpp

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index b7d17157c5..df41a8873a 100644
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,37 +7,60 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
-class NetworkIBModel : public NetworkModel {
-private:
-public:
-  NetworkIBModel();
-  NetworkIBModel(const char *name);
-  ~NetworkModel();
-  virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-                                double size, double rate);
-  virtual NetworkLinkPtr createNetworkLink(const char *name,
-                                          double bw_initial,
-                                          tmgr_trace_t bw_trace,
-                                          double lat_initial,
-                                          tmgr_trace_t lat_trace,
-                                          e_surf_resource_state_t state_initial,
-                                          tmgr_trace_t state_trace,
-                                          e_surf_link_sharing_policy_t policy,
-                                          xbt_dict_t properties);
-};
-
-class NetworkIBLink : public NetworkLink {
-private:
-public:
-  NetworkIBLink(NetworkModelPtr model, const char *name, xbt_dict_t props);
-  NetworkIBLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
-                lmm_constraint_t constraint,
-                tmgr_history_t history,
-                tmgr_trace_t state_trace);
-  ~NetworkIBLink();
-  virtual void updateLatency(double value, double date=surf_get_clock());
-  virtual void updateBandwidth(double value, double date=surf_get_clock());
-
-
-};
+#include "src/surf/network_smpi.hpp"
+#include "xbt/base.h"
+
+#include <unordered_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;
+
+    };
+
+  }
+}
+
 #endif