-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <functional>
#include <stdexcept>
-#include <unordered_map>
+#include <map>
#include "simgrid/s4u/engine.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/msg/msg_private.h"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.h"
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-std::unordered_map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
+std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
-int MSG_HOST_LEVEL = -1;
int USER_HOST_LEVEL = -1;
namespace simgrid {
simgrid::xbt::signal<void(Host&)> Host::onCreation;
simgrid::xbt::signal<void(Host&)> Host::onDestruction;
simgrid::xbt::signal<void(Host&)> Host::onStateChange;
+simgrid::xbt::signal<void(Host&)> Host::onSpeedChange;
Host::Host(const char* name)
: name_(name)
{
xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name);
host_list[name_] = this;
+ new simgrid::surf::HostImpl(this);
}
Host::~Host()
xbt_assert(currentlyDestroying_, "Please call h->destroy() instead of manually deleting it.");
delete pimpl_;
- if (pimpl_netcard != nullptr) // not removed yet by a children class
- simgrid::s4u::Engine::instance()->netcardUnregister(pimpl_netcard);
+ if (pimpl_netpoint != nullptr) // not removed yet by a children class
+ simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint);
delete pimpl_cpu;
delete mounts;
}
void Host::turnOn() {
if (isOff()) {
- simgrid::simix::kernelImmediate([&]{
+ simgrid::simix::kernelImmediate([this] {
this->extension<simgrid::simix::Host>()->turnOn();
this->pimpl_cpu->turnOn();
+ onStateChange(*this);
});
}
}
void Host::turnOff() {
if (isOn()) {
- simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+ smx_actor_t self = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([this, self] {
+ SIMIX_host_off(this, self);
+ onStateChange(*this);
+ });
}
}
* \brief Find a route toward another host
*
* \param dest [IN] where to
- * \param route [OUT] where to store the list of links (must exist, cannot be nullptr).
+ * \param links [OUT] where to store the list of links (must exist, cannot be nullptr).
* \param latency [OUT] where to store the latency experienced on the path (or nullptr if not interested)
* It is the caller responsibility to initialize latency to 0 (we add to provided route)
- * \pre route!=nullptr
+ * \pre links!=nullptr
*
* 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)
{
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netcard, dest->pimpl_netcard, links, latency);
+ std::vector<surf::LinkImpl*> linkImpls;
+ this->routeTo(dest, &linkImpls, latency);
+ for (surf::LinkImpl* 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)
+{
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(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(),
(latency == nullptr ? -1 : *latency));
for (auto link : *links)
- XBT_CDEBUG(surf_route, "Link %s", link->getName());
+ XBT_CDEBUG(surf_route, "Link %s", link->cname());
}
}
/** Get the properties assigned to a host */
xbt_dict_t Host::properties() {
- return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); });
+ return simgrid::simix::kernelImmediate([this] {
+ return this->pimpl_->getProperties();
+ });
}
/** Retrieve the property value (or nullptr if not set) */
return this->pimpl_->getProperty(key);
}
void Host::setProperty(const char*key, const char *value){
- simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
-}
-
-/** Get the processes attached to the host */
-xbt_swag_t Host::processes()
-{
- return simgrid::simix::kernelImmediate([&]() {
- return this->extension<simgrid::simix::Host>()->process_list;
+ simgrid::simix::kernelImmediate([this, key, value] {
+ this->pimpl_->setProperty(key, value);
});
}
-/** Get the peak power of a host */
-double Host::getPstateSpeedCurrent()
+/** Get the processes attached to the host */
+void Host::processes(std::vector<ActorPtr>* list)
{
- return simgrid::simix::kernelImmediate([&] {
- return this->pimpl_cpu->getPstateSpeedCurrent();
- });
+ smx_actor_t actor = NULL;
+ xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list) {
+ list->push_back(actor->iface());
+ }
}
-/** Get one power peak (in flops/s) of a host at a given pstate */
+/** @brief Get the peak processor speed (in flops/s), at the specified pstate */
double Host::getPstateSpeed(int pstate_index)
{
- return simgrid::simix::kernelImmediate([&] {
+ return simgrid::simix::kernelImmediate([this, pstate_index] {
return this->pimpl_cpu->getPstateSpeed(pstate_index);
});
}
-/** @brief Get the speed of the cpu associated to a host */
+/** @brief Get the peak processor speed (in flops/s), at the current pstate */
double Host::speed() {
return pimpl_cpu->getSpeed(1.0);
}
+
/** @brief Returns the number of core of the processor. */
int Host::coreCount() {
return pimpl_cpu->coreCount();
/** @brief Set the pstate at which the host should run */
void Host::setPstate(int pstate_index)
{
- simgrid::simix::kernelImmediate(std::bind(
- &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
- ));
+ simgrid::simix::kernelImmediate([this, pstate_index] {
+ this->pimpl_cpu->setPState(pstate_index);
+ });
}
/** @brief Retrieve the pstate at which the host is currently running */
int Host::pstate()
{
- return pimpl_cpu->getPState();
+ return this->pimpl_cpu->getPState();
}
/**
*/
xbt_dict_t Host::mountedStoragesAsDict()
{
- return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
+ return simgrid::simix::kernelImmediate([this] {
+ return this->pimpl_->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::attachedStorages()
+void Host::attachedStorages(std::vector<const char*>* storages)
{
- return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
+ simgrid::simix::kernelImmediate([this, storages] {
+ this->pimpl_->getAttachedStorageList(storages);
+ });
}
} // namespace simgrid
