X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e0879e02f32153ee997c27cbe0255309a2668db..f9dd39e26289f9ba2d4ef96fbbed1709bff22043:/src/surf/host_ptask_L07.hpp

diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp
index b69b496863..3754b67fac 100644
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -44,24 +44,23 @@ 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;
 };
 
 class CpuL07Model : public CpuModel {
 public:
-  CpuL07Model(HostL07Model *hmodel) : CpuModel() {p_hostModel = hmodel;};
-  ~CpuL07Model() {surf_cpu_model_pm = NULL;};
+  CpuL07Model(HostL07Model *hmodel,lmm_system_t sys);
+  ~CpuL07Model();
 
-  Cpu *createCpu(const char *name,  xbt_dynar_t speedPeak,
+  Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPeakList,
                           int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
-                          e_surf_resource_state_t state_initial,
+                          int initiallyOn,
                           tmgr_trace_t state_trace) override;
   void addTraces() override {DIE_IMPOSSIBLE;};
 
@@ -70,19 +69,19 @@ public:
 
 class NetworkL07Model : public NetworkModel {
 public:
-  NetworkL07Model(HostL07Model *hmodel) : NetworkModel() {p_hostModel = hmodel;};
-  ~NetworkL07Model() {surf_network_model = NULL;};
+  NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
+  ~NetworkL07Model();
   Link* createLink(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,
+		  int initiallyOn,
 		  tmgr_trace_t state_trace,
 		  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;}
 
@@ -95,23 +94,19 @@ public:
 
 class CpuL07 : public Cpu {
   friend void HostL07Model::addTraces();
-  tmgr_trace_event_t p_stateEvent;
-  tmgr_trace_event_t p_speedEvent;
+  tmgr_trace_iterator_t p_stateEvent = nullptr;
+  tmgr_trace_iterator_t p_speedEvent = nullptr;
 public:
-  CpuL07(CpuL07Model *model, const char* name,
-		 double power_scale, double power_initial, tmgr_trace_t power_trace,
-     int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
+  CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, int pstate,
+		 double power_scale, tmgr_trace_t power_trace,
+     int core, int initiallyOn, tmgr_trace_t state_trace);
   ~CpuL07();
   bool isUsed() override;
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
-  Action *execute(double size) override;
+  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
+  Action *execution_start(double size) override;
   Action *sleep(double duration) override;
-
-  double getCurrentPowerPeak() override {THROW_UNIMPLEMENTED;};
-  double getPowerPeakAt(int /*pstate_index*/) override {THROW_UNIMPLEMENTED;};
-  int getNbPstates() override {THROW_UNIMPLEMENTED;};
-  void setPstate(int /*pstate_index*/) override {THROW_UNIMPLEMENTED;};
-  int  getPstate() override {THROW_UNIMPLEMENTED;};
+protected:
+  void onSpeedChange() override;
 };
 
 class LinkL07 : public Link {
@@ -121,49 +116,44 @@ public:
           tmgr_trace_t bw_trace,
           double lat_initial,
           tmgr_trace_t lat_trace,
-          e_surf_resource_state_t
-          state_initial,
+          int initiallyOn,
           tmgr_trace_t state_trace,
           e_surf_link_sharing_policy_t policy);
   ~LinkL07(){ };
   bool isUsed() override;
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
+  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
   double getBandwidth() override;
   void updateBandwidth(double value, double date=surf_get_clock()) override;
   void updateLatency(double value, double date=surf_get_clock()) override;
 
   double m_bwCurrent;
-  tmgr_trace_event_t p_bwEvent;
+  tmgr_trace_iterator_t p_bwEvent;
 };
 
 /**********
  * Action *
  **********/
 class L07Action : public CpuAction {
-  friend Action *CpuL07::execute(double size);
+  friend Action *CpuL07::execution_start(double size);
   friend Action *CpuL07::sleep(double duration);
   friend Action *HostL07Model::executeParallelTask(int host_nb,
                                                    sg_host_t*host_list,
                                                    double *flops_amount,
-												   double *bytes_amount,
+                                                   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();
 
   int unref() override;
-  void cancel() override;
-  void suspend() override;
-  void resume() override;
-  bool isSuspended() override;
-  void setMaxDuration(double duration) override;
-  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;