#include "src/surf/HostImpl.hpp"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "src/simix/smx_process_private.h"
+#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
+xbt_dict_t host_list = nullptr; // FIXME: move it to Engine
+
int MSG_HOST_LEVEL = -1;
-int SIMIX_HOST_LEVEL = -1;
int USER_HOST_LEVEL = -1;
namespace simgrid {
Host::Host(const char* name)
: name_(name)
{
+ xbt_dict_set(host_list, name, this, nullptr);
}
Host::~Host() {
}
Host* Host::by_name_or_null(const char* name)
{
+ if (host_list == nullptr)
+ host_list = xbt_dict_new_homogeneous([](void*p) {
+ simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
+ simgrid::s4u::Host::onDestruction(*host);
+ delete host;
+ });
return (Host*) xbt_dict_get_or_null(host_list, name);
}
Host* Host::by_name_or_create(const char* name)
{
Host* host = by_name_or_null(name);
- if (host == nullptr) {
+ if (host == nullptr)
host = new Host(name);
- xbt_dict_set(host_list, name, host, nullptr);
- }
+
return host;
}
Host *Host::current(){
- smx_process_t smx_proc = SIMIX_process_self();
+ smx_actor_t smx_proc = SIMIX_process_self();
if (smx_proc == nullptr)
xbt_die("Cannot call Host::current() from the maestro context");
- return SIMIX_process_get_host(smx_proc);
+ return smx_proc->host;
}
void Host::turnOn() {
- simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
+ if (isOff()) {
+ simgrid::simix::kernelImmediate([&]{
+ this->extension<simgrid::simix::Host>()->turnOn();
+ this->extension<simgrid::surf::HostImpl>()->turnOn();
+ });
+ }
}
void Host::turnOff() {
- simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+ if (isOn()) {
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+ }
}
bool Host::isOn() {
xbt_swag_t Host::processes()
{
return simgrid::simix::kernelImmediate([&]() {
- return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+ return this->extension<simgrid::simix::Host>()->process_list;
});
}
return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
-int Host::coresCount() {
- return pimpl_cpu->getCore();
+int Host::coreCount() {
+ return pimpl_cpu->coreCount();
}
/** @brief Set the pstate at which the host should run */