#include <map>
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "xbt/log.h"
namespace s4u {
-std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
-
simgrid::xbt::signal<void(Host&)> Host::onCreation;
simgrid::xbt::signal<void(Host&)> Host::onDestruction;
simgrid::xbt::signal<void(Host&)> Host::onStateChange;
: name_(name)
{
xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
- host_list[name_] = this;
+ Engine::getInstance()->addHost(std::string(name_), this);
new simgrid::surf::HostImpl(this);
}
delete pimpl_;
if (pimpl_netpoint != nullptr) // not removed yet by a children class
- simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint);
+ simgrid::s4u::Engine::getInstance()->netpointUnregister(pimpl_netpoint);
delete pimpl_cpu;
delete mounts;
}
if (not currentlyDestroying_) {
currentlyDestroying_ = true;
onDestruction(*this);
- host_list.erase(name_);
+ Engine::getInstance()->delHost(std::string(name_));
delete this;
}
}
Host* Host::by_name(std::string name)
{
- return host_list.at(name); // Will raise a std::out_of_range if the host does not exist
+ return Engine::getInstance()->hostByName(name);
+}
+Host* Host::by_name(const char* name)
+{
+ return Engine::getInstance()->hostByName(std::string(name));
}
Host* Host::by_name_or_null(const char* name)
{
- return by_name_or_null(std::string(name));
+ return Engine::getInstance()->hostByNameOrNull(std::string(name));
}
Host* Host::by_name_or_null(std::string name)
{
- if (host_list.find(name) == host_list.end())
- return nullptr;
- return host_list.at(name);
+ return Engine::getInstance()->hostByNameOrNull(name);
}
Host *Host::current(){
if (isOff()) {
simgrid::simix::kernelImmediate([this] {
this->extension<simgrid::simix::Host>()->turnOn();
- this->pimpl_cpu->turnOn();
+ this->pimpl_cpu->turn_on();
onStateChange(*this);
});
}
}
bool Host::isOn() {
- return this->pimpl_cpu->isOn();
+ return this->pimpl_cpu->is_on();
}
-int Host::pstatesCount() const {
+int Host::getPstatesCount() const
+{
return this->pimpl_cpu->getNbPStates();
}
*/
void Host::actorList(std::vector<ActorPtr>* whereto)
{
- smx_actor_t actor = NULL;
- xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list)
- {
- whereto->push_back(actor->ciface());
+ for (auto& actor : this->extension<simgrid::simix::Host>()->process_list) {
+ whereto->push_back(actor.ciface());
}
}
* walk through the routing components tree and find a route between hosts
* by calling each "get_route" function in each routing component.
*/
-void Host::routeTo(Host* dest, std::vector<Link*>* links, double* latency)
+void Host::routeTo(Host* dest, std::vector<Link*>& links, double* latency)
{
std::vector<surf::LinkImpl*> linkImpls;
- this->routeTo(dest, &linkImpls, latency);
- for (surf::LinkImpl* l : linkImpls)
- links->push_back(&l->piface_);
+ this->routeTo(dest, linkImpls, latency);
+ for (surf::LinkImpl* const& l : linkImpls)
+ links.push_back(&l->piface_);
}
/** @brief Just like Host::routeTo, but filling an array of link implementations */
-void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* latency)
+void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>& links, double* latency)
{
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netpoint, dest->pimpl_netpoint, links, latency);
+ simgrid::kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint, dest->pimpl_netpoint, links, latency);
if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
- XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", cname(), dest->cname(),
+ XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(),
(latency == nullptr ? -1 : *latency));
- for (auto link : *links)
- XBT_CDEBUG(surf_route, "Link %s", link->cname());
+ for (auto const& link : links)
+ XBT_CDEBUG(surf_route, "Link %s", link->get_cname());
}
}
/** Get the properties assigned to a host */
-xbt_dict_t Host::properties() {
- return simgrid::simix::kernelImmediate([this] {
- return this->pimpl_->getProperties();
- });
+std::map<std::string, std::string>* Host::getProperties()
+{
+ return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Host::property(const char* key)
+const char* Host::getProperty(const char* key)
{
return this->pimpl_->getProperty(key);
}
-void Host::setProperty(const char* key, const char* value)
+void Host::setProperty(std::string key, std::string value)
{
simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
}
/** Get the processes attached to the host */
-void Host::
processes(std::vector<ActorPtr>* list)
+void Host::
getProcesses(std::vector<ActorPtr>* list)
{
- smx_actor_t actor = NULL;
- xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list) {
- list->push_back(actor->iface());
+ for (auto& actor : this->extension<simgrid::simix::Host>()->process_list) {
+ list->push_back(actor.iface());
}
}
}
/** @brief Get the peak processor speed (in flops/s), at the current pstate */
-double Host::speed() {
+double Host::getSpeed()
+{
return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
-int Host::coreCount() {
+int Host::getCoreCount()
+{
return pimpl_cpu->coreCount();
}
});
}
/** @brief Retrieve the pstate at which the host is currently running */
-int Host::pstate()
+int Host::getPstate()
{
return this->pimpl_cpu->getPState();
}
* \brief Returns the list of storages attached to an host.
* \return a vector containing all storages attached to the host
*/
-void Host::attachedStorages(std::vector<const char*>* storages)
+std::vector<const char*> Host::get_attached_storages()
{
- simgrid::simix::kernelImmediate([this, storages] {
- this->pimpl_->getAttachedStorageList(storages);
- });
+ return simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
}
-std::unordered_map<std::string, Storage*> const& Host::mountedStorages()
+void Host::getAttachedStorages(std::vector<const char*>* storages)
+{
+ std::vector<const char*> local_storages =
+ simgrid::simix::kernelImmediate([this] { return this->pimpl_->get_attached_storages(); });
+ for (auto elm : local_storages)
+ storages->push_back(elm);
+}
+
+std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()
{
if (mounts == nullptr) {
mounts = new std::unordered_map<std::string, Storage*>();
- for (auto m : this->pimpl_->storage_) {
+ for (auto const& m : this->pimpl_->storage_) {
mounts->insert({m.first, &m.second->piface_});
}
}
return *mounts;
}
+void Host::execute(double flops)
+{
+ Host* host_list[1] = {this};
+ double flops_list[1] = {flops};
+ smx_activity_t s = simcall_execution_parallel_start(nullptr /*name*/, 1, host_list, flops_list,
+ nullptr /*comm_sizes */, -1.0, -1 /*timeout*/);
+ simcall_execution_wait(s);
+}
+
+double Host::getLoad()
+{
+ return this->pimpl_cpu->get_load();
+}
+
} // namespace simgrid
} // namespace s4u
