X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25..2c69087d11c54eee924f6870373883d6aa9ff228:/src/surf/workstation_interface.hpp

diff --git a/src/surf/workstation_interface.hpp b/src/surf/workstation_interface.hpp
index b4e2dd7b0b..13ccd603ff 100644
--- a/src/surf/workstation_interface.hpp
+++ b/src/surf/workstation_interface.hpp
@@ -101,15 +101,15 @@ public:
    *
    * @param workstation_nb [description]
    * @param workstation_list [description]
-   * @param computation_amount [description]
-   * @param communication_amount [description]
+   * @param flops_amount [description]
+   * @param bytes_amount [description]
    * @param rate [description]
    * @return [description]
    */
   virtual ActionPtr executeParallelTask(int workstation_nb,
                                         void **workstation_list,
-                                        double *computation_amount,
-                                        double *communication_amount,
+                                        double *flops_amount,
+                                        double *bytes_amount,
                                         double rate)=0;
 
  /**
@@ -165,8 +165,9 @@ public:
    * @param netElm The RoutingEdge associated to this Workstation
    * @param cpu The Cpu associated to this Workstation
    */
-  Workstation(ModelPtr model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
-		      xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu);
+  Workstation(ModelPtr model, const char *name, xbt_dict_t props,
+      lmm_constraint_t constraint, xbt_dynar_t storage, RoutingEdgePtr netElm,
+      CpuPtr cpu);
 
   /**
    * @brief Workstation destructor
@@ -185,11 +186,11 @@ public:
   /**
    * @brief Execute some quantity of computation
    *
-   * @param size The value of the processing amount (in flop) needed to process
+   * @param flops_amount The value of the processing amount (in flop) needed to process
    * @return The CpuAction corresponding to the processing
    * @see Cpu
    */
-  virtual ActionPtr execute(double size)=0;
+  virtual ActionPtr execute(double flops_amount)=0;
 
   /**
    * @brief Make a process sleep for duration seconds
@@ -346,7 +347,7 @@ public:
    *  - SEEK_END: end of the file
    * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED
    */
-  virtual int fileSeek(surf_file_t fd, sg_size_t offset, int origin);
+  virtual int fileSeek(surf_file_t fd, sg_offset_t offset, int origin);
 
   /**
    * @brief Move a file to another location on the *same mount point*.