#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>
Host::Host(std::string name) : name_(std::move(name))
{
- xbt_assert(Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", name_.c_str());
+ 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);
new simgrid::surf::HostImpl(this);
}
}
}
-Host* Host::by_name(std::string name)
+Host* Host::by_name(const std::string& name)
{
return Engine::get_instance()->host_by_name(name);
}
-Host* Host::by_name_or_null(std::string name)
+Host* Host::by_name_or_null(const std::string& name)
{
return Engine::get_instance()->host_by_name_or_null(name);
}
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()
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Host::get_property(std::string key) const
+const char* Host::get_property(const std::string& key) const
{
return this->pimpl_->get_property(key);
}
-void Host::set_property(std::string key, std::string value)
+void Host::set_property(const std::string& key, std::string value)
{
simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, std::move(value)); });
}
return simgrid::s4u::Host::by_name_or_null(name);
}
-static int hostcmp_voidp(const void* pa, const void* pb)
-{
- return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->get_cname(),
- (*static_cast<simgrid::s4u::Host* const*>(pb))->get_cname());
-}
-
xbt_dynar_t sg_hosts_as_dynar()
{
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
if (host && host->pimpl_netpoint && host->pimpl_netpoint->is_host())
xbt_dynar_push(res, &host);
}
- xbt_dynar_sort(res, hostcmp_voidp);
+ xbt_dynar_sort(res, [](const void* pa, const void* pb) {
+ const std::string& na = (*static_cast<simgrid::s4u::Host* const*>(pa))->get_name();
+ const std::string& nb = (*static_cast<simgrid::s4u::Host* const*>(pb))->get_name();
+ return na.compare(nb);
+ });
return res;
}
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)