A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NetZoneImpl::network_model_: get() and private object
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index 4bdaacf7ea1aed4c34da253538bba195e38be36b..dfe60452996bd35a20df0aae1cede24692a2703e 100644
(file)
--- a/
src/surf/HostImpl.hpp
+++ b/
src/surf/HostImpl.hpp
@@
-1,17
+1,16
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
21
. 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. */
/* 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
_
+#ifndef SURF_HOST_INTERFACE_HPP
+#define SURF_HOST_INTERFACE_HPP
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
#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 "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include <xbt/PropertyHolder.hpp>
#include <vector>
#include <vector>
@@
-32,7
+31,7
@@
public:
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
- double rate);
+ double rate)
= 0
;
};
/************
};
/************
@@
-40,45
+39,48
@@
public:
************/
/** @ingroup SURF_host_interface
* @brief SURF Host interface class
************/
/** @ingroup SURF_host_interface
* @brief SURF Host interface class
- * @details A
n host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
+ * @details A
host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s)
*/
*/
-class XBT_PRIVATE HostImpl : public
simgrid::surf
::PropertyHolder {
-
typedef
boost::intrusive::list<
+class XBT_PRIVATE HostImpl : public
xbt
::PropertyHolder {
+
using ActorList =
boost::intrusive::list<
kernel::actor::ActorImpl,
boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
kernel::actor::ActorImpl,
boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
- &kernel::actor::ActorImpl::host_actor_list_hook>>
- ActorList;
+ &kernel::actor::ActorImpl::host_actor_list_hook>>
;
+
ActorList actor_list_;
ActorList actor_list_;
+ std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+ s4u::Host* piface_ = nullptr; // we must have a pointer there because the VM wants to change the piface in its ctor
+ std::vector<kernel::resource::DiskImpl*> disks_;
public:
public:
+ friend simgrid::vm::VirtualMachineImpl;
explicit HostImpl(s4u::Host* host);
virtual ~HostImpl();
explicit HostImpl(s4u::Host* host);
virtual ~HostImpl();
- std::vector<s4u::Disk*> get_disks();
- void add_disk(s4u::Disk* disk);
+ std::vector<s4u::Disk*> get_disks() const;
+ void set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host);
+ void add_disk(const s4u::Disk* disk);
void remove_disk(const std::string& disk_name);
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();
+ s4u::Host* get_iface() const { return piface_; }
- std::map<std::string, kernel::resource::StorageImpl*> storage_;
- std::vector<kernel::resource::DiskImpl*> disks_;
-
- s4u::Host* piface_ = nullptr;
-
- void turn_on();
- void turn_off();
+ void turn_on() const;
+ void turn_off(const kernel::actor::ActorImpl* issuer);
std::vector<s4u::ActorPtr> get_all_actors();
std::vector<s4u::ActorPtr> get_all_actors();
- size_t get_actor_count();
+ size_t get_actor_count()
const
;
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(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); }
- // FIXME: make this private
- std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+ template <class F> void foreach_actor(F function)
+ {
+ for (auto& actor : actor_list_)
+ function(actor);
+ }
};
}
}
XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
};
}
}
XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-#endif /* SURF_H
ost_INTERFACE_HPP_
*/
+#endif /* SURF_H
OST_INTERFACE_HPP
*/