Give a p_netcard to simgrid::Host instead of relying on extensions for that

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

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index a897ca3..89ab7c8 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -44,12 +44,11 @@ public:
   ~HostL07Model();
 
   double shareResources(double now) override;
-  void updateActionsState(double now, double delta);
-  Action *executeParallelTask(int host_nb,
-                              sg_host_t *host_list,
-                                                         double *flops_amount,
-                                                         double *bytes_amount,
+  void updateActionsState(double now, double delta) override;
+  Action *executeParallelTask(int host_nb, sg_host_t *host_list,
+                                                         double *flops_amount, double *bytes_amount,
                                                          double rate) override;
+
   void addTraces() override;
 };
 
@@ -82,7 +81,7 @@ public:
                  e_surf_link_sharing_policy_t policy,
                  xbt_dict_t properties) override;
 
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate) override;
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
   void addTraces() override {DIE_IMPOSSIBLE;};
   bool shareResourcesIsIdempotent() override {return true;}
 
@@ -142,8 +141,11 @@ class L07Action : public CpuAction {
                                                                                                   double *bytes_amount,
                                                    double rate);
 public:
-  L07Action(Model *model, double cost, bool failed)
-  : CpuAction(model, cost, failed) {};
+  L07Action(Model *model, int host_nb,
+          sg_host_t*host_list,
+          double *flops_amount,
+                  double *bytes_amount,
+          double rate);
  ~L07Action();
 
   void updateBound();
@@ -155,7 +157,7 @@ public:
   void setPriority(double priority) override;
   double getRemains() override;
 
-  std::vector<RoutingEdge*> * p_edgeList = new std::vector<RoutingEdge*>();
+  std::vector<NetCard*> * p_netcardList = new std::vector<NetCard*>();
   double *p_computationAmount;
   double *p_communicationAmount;
   double m_latency;