Kill the surf::Host subclasses (surf::HostModel remain subclassed)

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

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index d0ebc3e..ee5aee3 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -124,6 +124,8 @@ private:
 
 public:
   void attach(simgrid::Host* host);
+
+  e_surf_resource_state_t getState();
   void setState(e_surf_resource_state_t state);
 
   /**
@@ -133,7 +135,7 @@ public:
    * @return The CpuAction corresponding to the processing
    * @see Cpu
    */
-  virtual Action *execute(double flops_amount)=0;
+  Action *execute(double flops_amount);
 
   /**
    * @brief Make a process sleep for duration seconds
@@ -142,7 +144,7 @@ public:
    * @return The CpuAction corresponding to the sleeping
    * @see Cpu
    */
-  virtual Action *sleep(double duration)=0;
+  Action *sleep(double duration);
 
   /** @brief Return the storage of corresponding mount point */
   virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage);
@@ -251,6 +253,10 @@ public:
    */
   virtual int fileMove(surf_file_t fd, const char* fullpath);
 
+  bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource
+  void updateState(tmgr_trace_event_t event_type, double value, double date) override
+    {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource
+
 public:
   xbt_dynar_t p_storage;
   RoutingEdge *p_netElm;