#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
-xbt_dict_t host_list = nullptr; // FIXME: move it to Engine
+std::unordered_map<simgrid::xbt::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
int MSG_HOST_LEVEL = -1;
int USER_HOST_LEVEL = -1;
: name_(name)
{
xbt_assert(sg_host_by_name(name) == nullptr, "Refusing to create a second host named '%s'.", name);
- xbt_dict_set(host_list, name, this, nullptr);
+ host_list[name_] = this;
}
Host::~Host()
{
xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
+ delete pimpl_;
delete pimpl_cpu;
delete pimpl_netcard;
delete mounts;
*
* Don't delete directly an Host, call h->destroy() instead.
*
- * This is cumbersome but there is the simplest solution to ensure that the
+ * This is cumbersome but this is the simplest solution to ensure that the
* onDestruction() callback receives a valid object (because of the destructor
* order in a class hierarchy).
*/
{
if (!currentlyDestroying_) {
currentlyDestroying_ = true;
- xbt_dict_remove(host_list, name().c_str());
onDestruction(*this);
+ host_list.erase(name_);
delete this;
}
}
Host* Host::by_name(std::string name)
{
- Host* host = Host::by_name_or_null(name.c_str());
- // TODO, raise an exception instead?
- if (host == nullptr)
- xbt_die("No such host: '%s'", name.c_str());
- return host;
+ return host_list.at(name); // Will raise a std::out_of_range if the host does not exist
}
Host* Host::by_name_or_null(const char* name)
{
- if (host_list == nullptr)
- host_list = xbt_dict_new_homogeneous(nullptr);
- return (Host*) xbt_dict_get_or_null(host_list, name);
+ try {
+ return host_list.at(name);
+ } catch (std::out_of_range& e) {
+ return nullptr;
+ }
}
Host *Host::current(){
if (isOff()) {
simgrid::simix::kernelImmediate([&]{
this->extension<simgrid::simix::Host>()->turnOn();
- this->extension<simgrid::surf::HostImpl>()->turnOn();
+ this->pimpl_cpu->turnOn();
});
}
}
/** Get the properties assigned to a host */
xbt_dict_t Host::properties() {
- return simgrid::simix::kernelImmediate([&] {
- simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
- return surf_host->getProperties();
- });
+ return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
const char*Host::property(const char*key) {
- simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
- return surf_host->getProperty(key);
+ return this->pimpl_->getProperty(key);
}
void Host::setProperty(const char*key, const char *value){
- simgrid::simix::kernelImmediate([&] {
- simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
- surf_host->setProperty(key,value);
- });
+ simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
}
/** Get the processes attached to the host */
return pimpl_cpu->getPState();
}
-void Host::parameters(vm_params_t params)
-{
- simgrid::simix::kernelImmediate([&]() {
- this->extension<simgrid::surf::HostImpl>()->getParams(params);
- });
-}
-
-void Host::setParameters(vm_params_t params)
-{
- simgrid::simix::kernelImmediate([&]() {
- this->extension<simgrid::surf::HostImpl>()->setParams(params);
- });
-}
-
/**
* \ingroup simix_storage_management
* \brief Returns the list of storages mounted on an host.
*/
xbt_dict_t Host::mountedStoragesAsDict()
{
- return simgrid::simix::kernelImmediate([&] {
- return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
- });
+ return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
}
/**
*/
xbt_dynar_t Host::attachedStorages()
{
- return simgrid::simix::kernelImmediate([&] {
- return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
- });
+ return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
}
} // namespace simgrid