X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f10c9f64beca3d0c8c10fc04ab4b8044000631d4..5f8a647bcabed9fa873dd266735c3e58e9fd3c27:/src/surf/workstation_ptask_L07.hpp

diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp
index 7dd269137c..2b97f71882 100644
--- a/src/surf/workstation_ptask_L07.hpp
+++ b/src/surf/workstation_ptask_L07.hpp
@@ -48,16 +48,11 @@ public:
 
   double shareResources(double now);
   void updateActionsState(double now, double delta);
-  ResourcePtr createResource(const char *name, double power_scale,
-                                 double power_initial,
-                                 tmgr_trace_t power_trace,
-                                 e_surf_resource_state_t state_initial,
-                                 tmgr_trace_t state_trace,
-                                 xbt_dict_t cpu_properties);
+  WorkstationPtr createWorkstation(const char *name);
   ActionPtr executeParallelTask(int workstation_nb,
                                         void **workstation_list,
-                                        double *computation_amount,
-                                        double *communication_amount,
+                                        double *flops_amount,
+                                        double *bytes_amount,
                                         double rate);
   xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst);
   ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
@@ -69,13 +64,7 @@ class CpuL07Model : public CpuModel {
 public:
   CpuL07Model() : CpuModel("cpuL07") {};
   ~CpuL07Model() {surf_cpu_model_pm = NULL;};
-  ResourcePtr createResource(const char *name, double power_scale,
-                                 double power_initial,
-                                 tmgr_trace_t power_trace,
-                                 e_surf_resource_state_t state_initial,
-                                 tmgr_trace_t state_trace,
-                                 xbt_dict_t cpu_properties);
-  CpuPtr createResource(const char *name,  xbt_dynar_t powerPeak,
+  CpuPtr createCpu(const char *name,  xbt_dynar_t powerPeak,
                           int pstate, double power_scale,
                           tmgr_trace_t power_trace, int core,
                           e_surf_resource_state_t state_initial,
@@ -90,7 +79,7 @@ class NetworkL07Model : public NetworkModel {
 public:
   NetworkL07Model() : NetworkModel() {};
   ~NetworkL07Model() {surf_network_model = NULL;};
-  NetworkLinkPtr createResource(const char *name,
+  NetworkLinkPtr createNetworkLink(const char *name,
 		                                   double bw_initial,
 		                                   tmgr_trace_t bw_trace,
 		                                   double lat_initial,
@@ -181,9 +170,8 @@ class WorkstationL07Action : public WorkstationAction {
   friend ActionPtr WorkstationL07::sleep(double duration);
   friend ActionPtr WorkstationL07Model::executeParallelTask(int workstation_nb,
                                                      void **workstation_list,
-                                                   double
-                                                   *computation_amount, double
-                                                   *communication_amount,
+                                                   double *flops_amount,
+												   double *bytes_amount,
                                                    double rate);
 public:
   WorkstationL07Action(ModelPtr model, double cost, bool failed)