unspecialize the trace setup for CPUs

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 699237c..27bcee0 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -116,7 +116,7 @@ public:
    * @param size The value of the processing amount (in flop) needed to process
    * @return The CpuAction corresponding to the processing
    */
    * @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)
 
   /**
    * @brief Make a process sleep for duration (in seconds)


@@ -149,7 +149,6 @@ public:
   virtual void setPState(int pstate_index);
   virtual int  getPState();
 
   virtual void setPState(int pstate_index);
   virtual int  getPState();
 

-  void addTraces(void);

   simgrid::s4u::Host* getHost() { return m_host; }
 
 public:
   simgrid::s4u::Host* getHost() { return m_host; }
 
 public:


@@ -165,6 +164,12 @@ public:
   lmm_constraint_t *p_constraintCore=NULL;
   void **p_constraintCoreId=NULL;
 
   lmm_constraint_t *p_constraintCore=NULL;
   void **p_constraintCoreId=NULL;
 

+public:
+  void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF) */
+  void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load) */
+protected:
+  tmgr_trace_iterator_t p_stateEvent = nullptr;
+  tmgr_trace_iterator_t p_speedEvent = nullptr;

 };
 
 /**********
 };
 
 /**********