X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6cf6f6913a06a9b7e64923042e25049b529e5cdc..8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a:/src/surf/HostImpl.hpp

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index fd170decc3..02b40c493e 100644
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2018. 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. */
@@ -14,24 +14,11 @@
 #ifndef SURF_HOST_INTERFACE_HPP_
 #define SURF_HOST_INTERFACE_HPP_
 
-/***********
- * Classes *
- ***********/
-
-namespace simgrid {
-namespace surf {
-
-class XBT_PRIVATE HostModel;
-class XBT_PRIVATE HostImpl;
-class XBT_PRIVATE HostAction;
-}
-}
-
 /*********
  * Tools *
  *********/
 
-XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model;
+XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
 
 /*********
  * Model *
@@ -44,13 +31,13 @@ namespace surf {
  * @brief SURF Host model interface class
  * @details A model is an object which handle the interactions between its Resources and its Actions
  */
-class HostModel : public Model {
+class XBT_PRIVATE HostModel : public kernel::resource::Model {
 public:
-  HostModel() : Model() {}
+  HostModel() : Model(Model::UpdateAlgo::Full) {}
 
-  virtual void ignoreEmptyVmInPmLMM();
-  virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount,
-                                      double rate);
+  virtual void ignore_empty_vm_in_pm_LMM();
+  virtual kernel::resource::Action* execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount,
+                                                     double* bytes_amount, double rate);
 };
 
 /************
@@ -60,54 +47,14 @@ 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::PropertyHolder {
+class XBT_PRIVATE HostImpl : public simgrid::surf::PropertyHolder {
 
 public:
   explicit HostImpl(s4u::Host* host);
   virtual ~HostImpl() = default;
 
-  /** @brief Return the storage of corresponding mount point */
-  virtual simgrid::surf::StorageImpl* findStorageOnMountList(const char* storage);
-
-  /** @brief Get the xbt_dynar_t of storages attached to the Host */
-  virtual void getAttachedStorageList(std::vector<const char*>* storages);
-
-  /**
-   * @brief Close a file
-   *
-   * @param fd The file descriptor to close
-   * @return The StorageAction corresponding to the closing
-   */
-  virtual Action* close(surf_file_t fd);
-
-  /**
-   * @brief Read a file
-   *
-   * @param fd The file descriptor to read
-   * @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);
-
-  /**
-   * @brief Write a file
-   *
-   * @param fd The file descriptor to write
-   * @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);
-
-  /**
-   * @brief Move a file to another location on the *same mount point*.
-   * @details [long description]
-   *
-   * @param fd The file descriptor
-   * @param fullpath The new full path
-   * @return MSG_OK if successful, MSG_TASK_CANCELED and a warning if the new
-   * full path is not on the same mount point
-   */
-  virtual int fileMove(surf_file_t fd, const char* fullpath);
+  /** @brief Get the vector of storages (by names) attached to the Host */
+  virtual std::vector<const char*> get_attached_storages();
 
   std::map<std::string, simgrid::surf::StorageImpl*> storage_;
   simgrid::s4u::Host* piface_ = nullptr;