a vector of keyval structs is a map

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

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index a47d566..12287e3 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -25,8 +24,6 @@ namespace surf {
 class XBT_PRIVATE HostModel;
 class XBT_PRIVATE HostImpl;
 class XBT_PRIVATE HostAction;
-
-
 }
 }
 
@@ -52,8 +49,8 @@ public:
   HostModel() : Model() {}
 
   virtual void adjustWeightOfDummyCpuActions();
-  virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list,
-      double *flops_amount, double *bytes_amount, double rate);
+  virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount,
+                                      double rate);
 };
 
 /************
@@ -63,58 +60,20 @@ 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:
-  /**
-   * @brief Host constructor
-   *
-   * @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);
-
-  /* Host destruction logic */
-  /**************************/
-  ~HostImpl() override;
+class HostImpl : public simgrid::surf::PropertyHolder {
 
 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;
+  explicit HostImpl(s4u::Host* host);
+  virtual ~HostImpl() = default;
 
   /** @brief Return the storage of corresponding mount point */
-  virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage);
+  virtual simgrid::surf::Storage* findStorageOnMountList(const char* storage);
 
   /** @brief Get the xbt_dict_t of mount_point: Storage */
   virtual xbt_dict_t getMountedStorageList();
 
   /** @brief Get the xbt_dynar_t of storages attached to the Host */
-  virtual xbt_dynar_t getAttachedStorageList();
+  virtual void getAttachedStorageList(std::vector<const char*>* storages);
 
   /**
    * @brief Open a file
@@ -122,7 +81,7 @@ public:
    * @param fullpath The full path to the file
    * @return The StorageAction corresponding to the opening
    */
-  virtual Action *open(const char* fullpath);
+  virtual Action* open(const char* fullpath);
 
   /**
    * @brief Close a file
@@ -130,7 +89,7 @@ public:
    * @param fd The file descriptor to close
    * @return The StorageAction corresponding to the closing
    */
-  virtual Action *close(surf_file_t fd);
+  virtual Action* close(surf_file_t fd);
 
   /**
    * @brief Unlink a file
@@ -156,7 +115,7 @@ public:
    * @param size The size in bytes to read
    * @return The StorageAction corresponding to the reading
    */
-  virtual Action *read(surf_file_t fd, sg_size_t size);
+  virtual Action* read(surf_file_t fd, sg_size_t size);
 
   /**
    * @brief Write a file
@@ -165,7 +124,7 @@ public:
    * @param size The size in bytes to write
    * @return The StorageAction corresponding to the writing
    */
-  virtual Action *write(surf_file_t fd, sg_size_t size);
+  virtual Action* write(surf_file_t fd, sg_size_t size);
 
   /**
    * @brief Get the information of a file descriptor
@@ -214,29 +173,11 @@ 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_        = nullptr;
-  Cpu* cpu_                   = nullptr;
+  std::map<std::string, simgrid::surf::Storage*> storage_;
   simgrid::s4u::Host* piface_ = nullptr;
 
-  /** @brief Get the list of virtual machines on the current Host */
-  xbt_dynar_t getVms();
-
-  /* common with vm */
-  /** @brief Retrieve a copy of the parameters of that VM/PM
-   *  @details The ramsize and overcommit fields are used on the PM too */
-  void getParams(vm_params_t params);
-  /** @brief Sets the params of that VM/PM */
-  void setParams(vm_params_t params);
   simgrid::s4u::Host* getHost() { return piface_; }
-private:
-  s_vm_params_t params_;
 };
-
 }
 }