Fix Memleaks

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

diff --git a/src/surf/workstation.hpp b/src/surf/workstation.hpp
index d3c18ad..8ce487e 100644 (file)
--- a/src/surf/workstation.hpp
+++ b/src/surf/workstation.hpp
@@ -22,8 +22,8 @@ typedef WorkstationCLM03Lmm *WorkstationCLM03LmmPtr;
 class WorkstationAction;
 typedef WorkstationAction *WorkstationActionPtr;
 
 class WorkstationAction;
 typedef WorkstationAction *WorkstationActionPtr;
 

-/*FIXME:class WorkstationActionLmm;
-typedef WorkstationActionLmm *WorkstationActionLmmPtr;*/
+class WorkstationActionLmm;
+typedef WorkstationActionLmm *WorkstationActionLmmPtr;

 
 /*********
  * Tools *
 
 /*********
  * 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);
                                         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);
   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);
   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();
 
   bool isUsed();
   //bool isShared();