X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..2f2ce19fcb66a634c19de8dda2dc4b4896203537:/src/surf/workstation.hpp?ds=sidebyside

diff --git a/src/surf/workstation.hpp b/src/surf/workstation.hpp
index d3c18ad7a2..8ce487e30a 100644
--- a/src/surf/workstation.hpp
+++ b/src/surf/workstation.hpp
@@ -22,8 +22,8 @@ typedef WorkstationCLM03Lmm *WorkstationCLM03LmmPtr;
 class WorkstationAction;
 typedef WorkstationAction *WorkstationActionPtr;
 
-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
+class WorkstationActionLmm;
+typedef WorkstationActionLmm *WorkstationActionLmmPtr;
 
 /*********
  * Tools *
@@ -52,6 +52,7 @@ public:
                                         double rate);
  virtual xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst);
  virtual ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate);
+ CpuModelPtr p_cpuModel;
 };
 
 /************
@@ -85,12 +86,12 @@ public:
   ActionPtr close(surf_file_t fd);
   int unlink(surf_file_t fd);
   ActionPtr ls(const char* mount, const char *path);
-  sg_storage_size_t getSize(surf_file_t fd);
-  ActionPtr read(surf_file_t fd, sg_storage_size_t size);
-  ActionPtr write(surf_file_t fd, sg_storage_size_t size);
+  sg_size_t getSize(surf_file_t fd);
+  ActionPtr read(surf_file_t fd, sg_size_t size);
+  ActionPtr write(surf_file_t fd, sg_size_t size);
   xbt_dynar_t getInfo( surf_file_t fd);
-  sg_storage_size_t getFreeSize(const char* name);
-  sg_storage_size_t getUsedSize(const char* name);
+  sg_size_t getFreeSize(const char* name);
+  sg_size_t getUsedSize(const char* name);
 
   bool isUsed();
   //bool isShared();