Restructure surf++ cpu and network

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

diff --git a/src/surf/workstation.hpp b/src/surf/workstation.hpp
index dc871bb..f70781b 100644 (file)
--- a/src/surf/workstation.hpp
+++ b/src/surf/workstation.hpp
@@ -1,7 +1,7 @@
 #include "surf.hpp"
 #include "storage.hpp"
-#include "cpu.hpp"
-#include "network.hpp"
+#include "cpu_interface.hpp"
+#include "network_interface.hpp"
 
 #ifndef WORKSTATION_HPP_
 #define 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;
 };
 
 /************
@@ -89,15 +90,17 @@ public:
   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_size_t fileTell(surf_file_t fd);
   sg_size_t getFreeSize(const char* name);
   sg_size_t getUsedSize(const char* name);
+  int fileSeek(surf_file_t fd, sg_size_t offset, int origin);
 
   bool isUsed();
   //bool isShared();
   xbt_dynar_t p_storage;
   RoutingEdgePtr p_netElm;
   CpuPtr p_cpu;
-  NetworkCm02LinkPtr p_network;
+  NetworkLinkPtr p_network;
 
   xbt_dynar_t getVms();