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
s4u::Actor: Rename migrate() into set_host()
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Host.hpp
diff --git
a/include/simgrid/s4u/Host.hpp
b/include/simgrid/s4u/Host.hpp
index
45038bc
..
c36c54a
100644
(file)
--- a/
include/simgrid/s4u/Host.hpp
+++ b/
include/simgrid/s4u/Host.hpp
@@
-38,6
+38,7
@@
namespace s4u {
class XBT_PUBLIC Host : public xbt::Extendable<Host> {
friend vm::VMModel; // Use the pimpl_cpu to compute the VM sharing
friend vm::VirtualMachineImpl; // creates the the pimpl_cpu
class XBT_PUBLIC Host : public xbt::Extendable<Host> {
friend vm::VMModel; // Use the pimpl_cpu to compute the VM sharing
friend vm::VirtualMachineImpl; // creates the the pimpl_cpu
+ friend kernel::routing::NetZoneImpl;
public:
explicit Host(const std::string& name);
public:
explicit Host(const std::string& name);
@@
-45,18
+46,19
@@
public:
/** Host destruction logic */
protected:
virtual ~Host();
/** Host destruction logic */
protected:
virtual ~Host();
+ void set_netpoint(kernel::routing::NetPoint* netpoint) { pimpl_netpoint_ = netpoint; }
private:
bool currently_destroying_ = false;
public:
private:
bool currently_destroying_ = false;
public:
- /**
*
Called on each newly created host */
+ /** Called on each newly created host */
static xbt::signal<void(Host&)> on_creation;
static xbt::signal<void(Host&)> on_creation;
- /**
*
Called just before destructing a host */
+ /** Called just before destructing a host */
static xbt::signal<void(Host const&)> on_destruction;
static xbt::signal<void(Host const&)> on_destruction;
- /**
*
Called when the machine is turned on or off (called AFTER the change) */
+ /** Called when the machine is turned on or off (called AFTER the change) */
static xbt::signal<void(Host const&)> on_state_change;
static xbt::signal<void(Host const&)> on_state_change;
- /**
*
Called when the speed of the machine is changed (called AFTER the change)
+ /** Called when the speed of the machine is changed (called AFTER the change)
* (either because of a pstate switch or because of an external load event coming from the profile) */
static xbt::signal<void(Host const&)> on_speed_change;
* (either because of a pstate switch or because of an external load event coming from the profile) */
static xbt::signal<void(Host const&)> on_speed_change;
@@
-77,6
+79,8
@@
public:
/** Retrieves the name of that host as a C string */
const char* get_cname() const { return name_.c_str(); }
/** Retrieves the name of that host as a C string */
const char* get_cname() const { return name_.c_str(); }
+ kernel::routing::NetPoint* get_netpoint() const { return pimpl_netpoint_; }
+
int get_actor_count();
std::vector<ActorPtr> get_all_actors();
int get_actor_count();
std::vector<ActorPtr> get_all_actors();
@@
-94,8
+98,6
@@
public:
void turn_off();
/** Returns if that host is currently up and running */
bool is_on() const;
void turn_off();
/** Returns if that host is currently up and running */
bool is_on() const;
- /** Returns if that host is currently down and offline */
- XBT_ATTRIB_DEPRECATED_v325("Please use !is_on()") bool is_off() const { return not is_on(); }
const char* get_property(const std::string& key) const;
void set_property(const std::string& key, const std::string& value);
const char* get_property(const std::string& key) const;
void set_property(const std::string& key, const std::string& value);
@@
-117,13
+119,13
@@
public:
std::vector<Disk*> get_disks() const;
void add_disk(Disk* disk);
std::vector<Disk*> get_disks() const;
void add_disk(Disk* disk);
- void remove_disk(
std::string
disk_name);
+ void remove_disk(
const std::string&
disk_name);
std::vector<const char*> get_attached_storages() const;
/** Get an associative list [mount point]->[Storage] of all local mount points.
*
std::vector<const char*> get_attached_storages() const;
/** Get an associative list [mount point]->[Storage] of all local mount points.
*
- * This is defined in the platform file, and cannot be modified programatically (yet).
+ * This is defined in the platform file, and cannot be modified program
m
atically (yet).
*/
std::unordered_map<std::string, Storage*> const& get_mounted_storages();
*/
std::unordered_map<std::string, Storage*> const& get_mounted_storages();
@@
-147,6
+149,7
@@
public:
private:
xbt::string name_{"noname"};
std::unordered_map<std::string, Storage*>* mounts_ = nullptr; // caching
private:
xbt::string name_{"noname"};
std::unordered_map<std::string, Storage*>* mounts_ = nullptr; // caching
+ kernel::routing::NetPoint* pimpl_netpoint_ = nullptr;
public:
#ifndef DOXYGEN
public:
#ifndef DOXYGEN
@@
-154,8
+157,6
@@
public:
kernel::resource::Cpu* pimpl_cpu = nullptr;
// TODO, this could be a unique_ptr
surf::HostImpl* pimpl_ = nullptr;
kernel::resource::Cpu* pimpl_cpu = nullptr;
// TODO, this could be a unique_ptr
surf::HostImpl* pimpl_ = nullptr;
- /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */
- kernel::routing::NetPoint* pimpl_netpoint = nullptr;
#endif
};
} // namespace s4u
#endif
};
} // namespace s4u