#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::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 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)