#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Exec.hpp"
+#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include <string>
simgrid::xbt::signal<void(Host&)> Host::on_state_change;
simgrid::xbt::signal<void(Host&)> Host::on_speed_change;
-Host::Host(std::string name) : name_(std::move(name))
+Host::Host(const std::string& name) : name_(name)
{
xbt_assert(Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname());
- Engine::get_instance()->host_register(std::string(name_), this);
+ Engine::get_instance()->host_register(name_, this);
new simgrid::surf::HostImpl(this);
}
Host::~Host()
{
- xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
+ xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it.");
delete pimpl_;
if (pimpl_netpoint != nullptr) // not removed yet by a children class
*/
void Host::destroy()
{
- if (not currentlyDestroying_) {
- currentlyDestroying_ = true;
+ if (not currently_destroying_) {
+ currently_destroying_ = true;
on_destruction(*this);
Engine::get_instance()->host_unregister(std::string(name_));
delete this;
Host* Host::current()
{
- smx_actor_t smx_proc = SIMIX_process_self();
- if (smx_proc == nullptr)
+ smx_actor_t self = SIMIX_process_self();
+ if (self == nullptr)
xbt_die("Cannot call Host::current() from the maestro context");
- return smx_proc->host_;
+ return self->get_host();
}
void Host::turn_on()
return this->pimpl_->get_property(key);
}
-void Host::set_property(const std::string& key, std::string value)
+void Host::set_property(const std::string& key, const std::string& value)
{
- simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, std::move(value)); });
+ simgrid::simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
}
/** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law.
* The profile must contain boolean values. */
ExecPtr Host::exec_async(double flops)
{
- return this_actor::exec_init(flops)->set_host(this);
+ return this_actor::exec_init(flops);
}
void Host::execute(double flops)
void Host::execute(double flops, double priority)
{
- this_actor::exec_init(flops)->set_host(this)->set_priority(1 / priority)->start()->wait();
+ this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait();
}
} // namespace s4u
sg_host_t sg_host_self()
{
smx_actor_t process = SIMIX_process_self();
- return (process == nullptr) ? nullptr : process->host_;
+ return (process == nullptr) ? nullptr : process->get_host();
+}
+
+/* needs to be public and without simcall for exceptions and logging events */
+const char* sg_host_self_get_name()
+{
+ sg_host_t host = sg_host_self();
+ if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
+ return "";
+
+ return host->get_cname();
}
double sg_host_load(sg_host_t host)