#include <unordered_map>
-#include <simgrid/simix.hpp>
-
+#include "simgrid/simix.hpp"
+#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/smx_private.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/host_interface.hpp"
-
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int USER_HOST_LEVEL;
+int MSG_HOST_LEVEL = -1;
+int USER_HOST_LEVEL = -1;
namespace simgrid {
+
+namespace xbt {
+template class Extendable<simgrid::s4u::Host>;
+}
+
namespace s4u {
simgrid::xbt::signal<void(Host&)> Host::onCreation;
}
Host::~Host() {
- if (mounts != NULL)
- delete mounts;
+ delete pimpl_cpu;
+ delete pimpl_netcard;
+ delete mounts;
}
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;
+ 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;
+}
+Host* Host::by_name_or_null(const char* name)
+{
+ 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) {
+ 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();
- if (smx_proc == NULL)
- xbt_die("Cannot call Host::current() from the maestro context");
- return SIMIX_process_get_host(smx_proc);
+ smx_actor_t smx_proc = SIMIX_process_self();
+ if (smx_proc == nullptr)
+ xbt_die("Cannot call Host::current() from the maestro context");
+ return smx_proc->host;
}
void Host::turnOn() {
- simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
}
void Host::turnOff() {
- simgrid::simix::simcall<void>(SIMCALL_HOST_OFF, this);
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
}
bool Host::isOn() {
- return this->pimpl_cpu->isOn();
+ return this->pimpl_cpu->isOn();
}
-int Host::getNbPStates() const {
- return this->pimpl_cpu->getNbPStates();
+int Host::pstatesCount() const {
+ return this->pimpl_cpu->getNbPStates();
}
-boost::unordered_map<std::string, Storage*> &Host::mountedStorages() {
- if (mounts == NULL) {
- mounts = new boost::unordered_map<std::string, Storage*> ();
+boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
+ if (mounts == nullptr) {
+ mounts = new boost::unordered_map<std::string, Storage*> ();
- xbt_dict_t dict = this->getMountedStorageList();
+ xbt_dict_t dict = this->mountedStoragesAsDict();
- xbt_dict_cursor_t cursor;
- char *mountname;
- char *storagename;
- xbt_dict_foreach(dict, cursor, mountname, storagename) {
- mounts->insert({mountname, &Storage::byName(storagename)});
- }
- xbt_dict_free(&dict);
- }
+ xbt_dict_cursor_t cursor;
+ char *mountname;
+ char *storagename;
+ xbt_dict_foreach(dict, cursor, mountname, storagename) {
+ mounts->insert({mountname, &Storage::byName(storagename)});
+ }
+ xbt_dict_free(&dict);
+ }
- return *mounts;
+ return *mounts;
}
/** Get the properties assigned to a host */
-xbt_dict_t Host::getProperties() {
- return simgrid::simix::kernel([&] {
- simgrid::surf::Host* surf_host = this->extension<simgrid::surf::Host>();
- return surf_host->getProperties();
- });
+xbt_dict_t Host::properties() {
+ return simgrid::simix::kernelImmediate([&] {
+ simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
+ return surf_host->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);
+}
+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);
+ });
}
/** Get the processes attached to the host */
-xbt_swag_t Host::getProcessList()
+xbt_swag_t Host::processes()
{
- return simgrid::simix::kernel([&]() {
- return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+ return simgrid::simix::kernelImmediate([&]() {
+ return this->extension<simgrid::simix::Host>()->process_list;
});
}
/** Get the peak power of a host */
-double Host::getCurrentPowerPeak()
+double Host::getPstateSpeedCurrent()
{
- return simgrid::simix::kernel([&] {
- return this->pimpl_cpu->getCurrentPowerPeak();
+ return simgrid::simix::kernelImmediate([&] {
+ return this->pimpl_cpu->getPstateSpeedCurrent();
});
}
/** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::getPowerPeakAt(int pstate_index)
+double Host::getPstateSpeed(int pstate_index)
{
- return simgrid::simix::kernel([&] {
- return this->pimpl_cpu->getPowerPeakAt(pstate_index);
+ return simgrid::simix::kernelImmediate([&] {
+ return this->pimpl_cpu->getPstateSpeed(pstate_index);
});
}
/** @brief Get the speed of the cpu associated to a host */
-double Host::getSpeed() {
- return pimpl_cpu->getSpeed(1.0);
+double Host::speed() {
+ return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
-int Host::getCoreAmount() {
- return pimpl_cpu->getCore();
-}
-
-Host* Host::by_name_or_null(const char* name)
-{
- 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) {
- host = new Host(name);
- xbt_dict_set(host_list, name, host, NULL);
- }
- return host;
+int Host::coresCount() {
+ return pimpl_cpu->getCore();
}
/** @brief Set the pstate at which the host should run */
-void Host::setPState(int pstate_index)
+void Host::setPstate(int pstate_index)
{
- simgrid::simix::kernel(std::bind(
+ simgrid::simix::kernelImmediate(std::bind(
&simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
));
}
/** @brief Retrieve the pstate at which the host is currently running */
-int Host::getPState()
+int Host::pstate()
{
return pimpl_cpu->getPState();
}
-void Host::getParams(vm_params_t params)
+void Host::parameters(vm_params_t params)
{
- simgrid::simix::kernel([&]() {
- this->extension<simgrid::surf::Host>()->getParams(params);
+ simgrid::simix::kernelImmediate([&]() {
+ this->extension<simgrid::surf::HostImpl>()->getParams(params);
});
}
-void Host::setParams(vm_params_t params)
+void Host::setParameters(vm_params_t params)
{
- simgrid::simix::kernel([&]() {
- this->extension<simgrid::surf::Host>()->setParams(params);
+ simgrid::simix::kernelImmediate([&]() {
+ this->extension<simgrid::surf::HostImpl>()->setParams(params);
});
}
* \brief Returns the list of storages mounted on an host.
* \return a dict containing all storages mounted on the host
*/
-xbt_dict_t Host::getMountedStorageList()
+xbt_dict_t Host::mountedStoragesAsDict()
{
- return simgrid::simix::kernel([&] {
- return this->extension<simgrid::surf::Host>()->getMountedStorageList();
+ return simgrid::simix::kernelImmediate([&] {
+ return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
});
}
* \brief Returns the list of storages attached to an host.
* \return a dict containing all storages attached to the host
*/
-xbt_dynar_t Host::getAttachedStorageList()
+xbt_dynar_t Host::attachedStorages()
{
- return simgrid::simix::kernel([&] {
- return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
+ return simgrid::simix::kernelImmediate([&] {
+ return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
});
}
