-/* 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. */
#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 *
* @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() {}
virtual void ignoreEmptyVmInPmLMM();
- virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount,
- double rate);
+ virtual kernel::resource::Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount,
+ double* bytes_amount, double rate);
};
/************
* @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 */
+ /** @brief Get the vector of storages (by names) attached to the Host */
virtual void getAttachedStorageList(std::vector<const char*>* storages);
- /**
- * @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);
-
std::map<std::string, simgrid::surf::StorageImpl*> storage_;
simgrid::s4u::Host* piface_ = nullptr;