X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2f695076e4f11e4033d66ad57e2274505f60d1c..20e79288d7f2509807c25b4c2aed721c8c6e1b52:/src/surf/cpu_interface.hpp

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index b2f4e8a709..a2dd954e81 100644
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -54,9 +54,9 @@ XBT_PUBLIC_DATA( surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_res
  */
 XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
 
-XBT_PUBLIC(void) parse_cpu_init(sg_platf_host_cbarg_t host);
+XBT_PUBLIC(void) cpu_parse_init(sg_platf_host_cbarg_t host);
 
-XBT_PUBLIC(void) add_traces_cpu();
+XBT_PUBLIC(void) cpu_add_traces();
 
 /*********
  * Model *
@@ -78,11 +78,17 @@ public:
   /**
    * @brief Create a Cpu
    *
-   * @param host [TODO]
+   * @param name The name of the Cpu
+   * @param power_peak The power peak of this Cpu
+   * @param pstate [TODO]
+   * @param power_scale The power scale of this Cpu
+   * @param power_trace [TODO]
+   * @param core The number of core of this Cpu
+   * @param state_initial [TODO]
+   * @param state_trace [TODO]
+   * @param cpu_properties Dictionary of properties associated to this Cpu
    */
-  void parseInit(sg_platf_host_cbarg_t host);
-
-  virtual CpuPtr createResource(const char *name, xbt_dynar_t power_peak,
+  virtual CpuPtr createCpu(const char *name, xbt_dynar_t power_peak,
                       int pstate, double power_scale,
                           tmgr_trace_t power_trace, int core,
                           e_surf_resource_state_t state_initial,
@@ -91,8 +97,6 @@ public:
 
   void updateActionsStateLazy(double now, double delta);
   void updateActionsStateFull(double now, double delta);
-
-  virtual void addTraces() =0;
 };
 
 /************
@@ -101,7 +105,7 @@ public:
 
 /** @ingroup SURF_cpu_interface
 * @brief SURF cpu resource interface class
-* @details A Cpu represent a cpu associated to a workstation
+* @details A Cpu represent a cpu associated to a host
 */
 XBT_PUBLIC_CLASS Cpu : public Resource {
 public:
@@ -195,7 +199,8 @@ public:
 
   virtual int getNbPstates()=0;
 
-  virtual void setPowerPeakAt(int pstate_index)=0;
+  virtual void setPstate(int pstate_index)=0;
+  virtual int  getPstate()=0;
 
   void setState(e_surf_resource_state_t state);
 
@@ -218,7 +223,7 @@ public:
  * @details A CpuAction represent the execution of code on a Cpu
  */
 XBT_PUBLIC_CLASS CpuAction : public Action {
-friend CpuPtr getActionCpu(CpuActionPtr action);
+friend XBT_PUBLIC(CpuPtr) getActionCpu(CpuActionPtr action);
 public:
   /**
    * @brief CpuAction constructor