X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac6b411512330530569fadb8c3f4fb82a4c70440..37f93a514b90d9d6ae75f1719346d7a8c604f34a:/src/surf/cpu_interface.hpp

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 066670c7bd..6e8e71ad1c 100644
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -42,13 +42,13 @@ public:
   /**
    * @brief Create a Cpu
    *
-   * @param name The name of the Cpu
+   * @param host The host that will have this CPU
    * @param speedPeak The peak spead (max speed in Flops)
    * @param pstate [TODO]
    * @param speedScale The speed scale (in [O;1] available speed from peak)
    * @param speedTrace Trace variations
    * @param core The number of core of this Cpu
-   * @param state_initial [TODO]
+   * @param initiallyOn [TODO]
    * @param state_trace [TODO]
    */
   virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
@@ -59,7 +59,7 @@ public:
 
   void updateActionsStateLazy(double now, double delta);
   void updateActionsStateFull(double now, double delta);
-  bool shareResourcesIsIdempotent() {return true;}
+  bool next_occuring_event_isIdempotent() {return true;}
 };
 
 /************
@@ -78,31 +78,35 @@ public:
    * @param model The CpuModel associated to this Cpu
    * @param host The host in which this Cpu should be plugged
    * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
+   * @param speedPeakList [TODO]
+   * @param pstate [TODO]
    * @param core The number of core of this Cpu
    * @param speedPeak The speed peak of this Cpu in flops (max speed)
    * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
-   * @param stateInitial whether it is created running or crashed
+   * @param initiallyOn whether it is created running or crashed
    */
   Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
     lmm_constraint_t constraint,
-	  xbt_dynar_t speedPeakList, int pstate,
-	  int core, double speedPeak, double speedScale,
-	  int initiallyOn);
+    xbt_dynar_t speedPeakList, int pstate,
+    int core, double speedPeak, double speedScale,
+    int initiallyOn);
 
   /**
    * @brief Cpu constructor
    *
    * @param model The CpuModel associated to this Cpu
    * @param host The host in which this Cpu should be plugged
+   * @param speedPeakList [TODO]
+   * @param pstate
    * @param core The number of core of this Cpu
    * @param speedPeak The speed peak of this Cpu in flops (max speed)
    * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
-   * @param stateInitial whether it is created running or crashed
+   * @param initiallyOn whether it is created running or crashed
    */
   Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
       xbt_dynar_t speedPeakList, int pstate,
-	  int core, double speedPeak, double speedScale,
-	  int initiallyOn);
+    int core, double speedPeak, double speedScale,
+    int initiallyOn);
 
   ~Cpu();
 
@@ -112,7 +116,7 @@ public:
    * @param size The value of the processing amount (in flop) needed to process
    * @return The CpuAction corresponding to the processing
    */
-  virtual simgrid::surf::Action *execute(double size)=0;
+  virtual simgrid::surf::Action *execution_start(double size)=0;
 
   /**
    * @brief Make a process sleep for duration (in seconds)
@@ -145,13 +149,10 @@ public:
   virtual void setPState(int pstate_index);
   virtual int  getPState();
 
-  void addTraces(void);
   simgrid::s4u::Host* getHost() { return m_host; }
 
 public:
   int m_core = 1;                /* Amount of cores */
-  double m_speedPeak;            /*< CPU speed peak, ie max value */
-  double m_speedScale;           /*< Percentage of CPU available according to the trace, in [O,1] */
   simgrid::s4u::Host* m_host;
 
   xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
@@ -161,6 +162,12 @@ public:
   lmm_constraint_t *p_constraintCore=NULL;
   void **p_constraintCoreId=NULL;
 
+public:
+  virtual void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
+  virtual void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
+
+  tmgr_trace_iterator_t p_stateEvent = nullptr;
+  s_surf_metric_t p_speed = {1.0, 0, nullptr};
 };
 
 /**********
@@ -175,9 +182,9 @@ XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
 friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
 public:
 /** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t old, e_surf_action_state_t current)`
+ * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t previous)`
  */
-  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> onStateChange;
+  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> onStateChange;
 
   /** @brief CpuAction constructor */
   CpuAction(simgrid::surf::Model *model, double cost, bool failed)