X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b96c9838e06560c684ad8bccc0db226ac4f9616..716ae59fb79d85eccccddc948ee49dcc14f1b897:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 9307cd3a00..d5d7933aff 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -50,15 +50,10 @@ namespace surf {
 class HostModel : public Model {
 public:
   HostModel() : Model() {}
-  ~HostModel() override {}
-
-  HostImpl *createHost(const char *name, kernel::routing::NetCard *net, Cpu *cpu);
 
   virtual void adjustWeightOfDummyCpuActions();
   virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list,
       double *flops_amount, double *bytes_amount, double rate);
-
-  bool next_occuring_event_isIdempotent() override {return true;}
 };
 
 /************
@@ -68,11 +63,7 @@ public:
  * @brief SURF Host interface class
  * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
  */
-class HostImpl
-: public simgrid::surf::Resource,
-  public simgrid::surf::PropertyHolder {
-public:
-  static simgrid::xbt::Extension<simgrid::s4u::Host, HostImpl> EXTENSION_ID;
+class HostImpl : public simgrid::surf::PropertyHolder {
 
 public:
   /**
@@ -81,39 +72,16 @@ public:
    * @param model HostModel associated to this Host
    * @param name The name of the Host
    * @param storage The Storage associated to this Host
-   * @param cpu The Cpu associated to this Host
    */
-  HostImpl(HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu);
-
-  /**
-   * @brief Host constructor
-   *
-   * @param model HostModel associated to this Host
-   * @param name The name of the Host
-   * @param constraint The lmm constraint associated to this Host if it is part of a LMM component
-   * @param storage The Storage associated to this Host
-   * @param cpu The Cpu associated to this Host
-   */
-  HostImpl(HostModel *model, const char *name,
-      lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu);
+  HostImpl(HostModel* model, const char* name, xbt_dynar_t storage);
 
   /* Host destruction logic */
   /**************************/
-  ~HostImpl() override;
+  virtual ~HostImpl();
 
 public:
-  // Overload the method for covariant return type:
-  HostModel *getModel()
-  {
-    return static_cast<HostModel*>(Resource::getModel());
-  }
   void attach(simgrid::s4u::Host* host);
 
-  bool isOn() const override;
-  bool isOff() const override;
-  void turnOn() override;
-  void turnOff() override;
-
   /** @brief Return the storage of corresponding mount point */
   virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage);
 
@@ -221,13 +189,8 @@ public:
    */
   virtual int fileMove(surf_file_t fd, const char* fullpath);
 
-  bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource
-  void apply_event(tmgr_trace_iterator_t event, double value) override
-    {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource
-
 public:
-  xbt_dynar_t storage_;
-  Cpu *cpu_;
+  xbt_dynar_t storage_        = nullptr;
   simgrid::s4u::Host* piface_ = nullptr;
 
   /** @brief Get the list of virtual machines on the current Host */