-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
-#include "surf_interface.hpp"
-#include "cpu_interface.hpp"
-#include "network_interface.hpp"
-#include "src/surf/PropertyHolder.hpp"
-
-#include "StorageImpl.hpp"
-#include <xbt/base.h>
-
#ifndef SURF_HOST_INTERFACE_HPP_
#define SURF_HOST_INTERFACE_HPP_
-/***********
- * Classes *
- ***********/
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/network_interface.hpp"
+
+#include <vector>
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;
-
/*********
* Model *
*********/
-namespace simgrid {
-namespace surf {
-
/** @ingroup SURF_host_interface
* @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 kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
+ const double* flops_amount, const double* bytes_amount,
+ double rate) = 0;
};
/************
* @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 {
+ std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+ s4u::Host* piface_ = nullptr; // FIXME: why don't we store a s4u::Host here as we do everywhere else?
public:
+ friend simgrid::vm::VirtualMachineImpl;
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 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;
-
- simgrid::s4u::Host* getHost() { return piface_; }
+ virtual ~HostImpl();
+
+ std::vector<s4u::Disk*> get_disks();
+ void add_disk(s4u::Disk* disk);
+ void remove_disk(const std::string& disk_name);
+
+ /** @brief Get the vector of storages (by names) attached to the Host */
+ virtual std::vector<const char*> get_attached_storages();
+
+ std::map<std::string, kernel::resource::StorageImpl*> storage_;
+ std::vector<kernel::resource::DiskImpl*> disks_;
+
+ s4u::Host* get_iface() { return piface_; }
+
+ void turn_on();
+ void turn_off(kernel::actor::ActorImpl* issuer);
+ std::vector<s4u::ActorPtr> get_all_actors();
+ size_t get_actor_count();
+ void add_actor(kernel::actor::ActorImpl* actor) { actor_list_.push_back(*actor); }
+ void remove_actor(kernel::actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); }
+ void add_actor_at_boot(kernel::actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); }
+
+ typedef boost::intrusive::list<
+ kernel::actor::ActorImpl,
+ boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
+ &kernel::actor::ActorImpl::host_actor_list_hook>>
+ ActorList;
+
+ // FIXME: make these private
+ ActorList actor_list_;
};
}
}
+XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
+
#endif /* SURF_Host_INTERFACE_HPP_ */