#include <functional>
#include <stdexcept>
-#include <unordered_map>
+#include <map>
#include "simgrid/s4u/engine.hpp"
#include "simgrid/s4u/host.hpp"
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)
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()) {
smx_actor_t self = SIMIX_process_self();
- simgrid::simix::kernelImmediate([&] {
+ simgrid::simix::kernelImmediate([this, self] {
SIMIX_host_off(this, self);
onStateChange(*this);
});
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 processes attached to the host */
xbt_swag_t Host::processes()
-{
- return simgrid::simix::kernelImmediate([this]() {
- return this->extension<simgrid::simix::Host>()->process_list;
- });
-}
-
-/** Get the peak power of a host */
-double Host::getPstateSpeedCurrent()
{
return simgrid::simix::kernelImmediate([this] {
- return this->pimpl_cpu->getPstateSpeedCurrent();
+ return this->extension<simgrid::simix::Host>()->process_list;
});
}
-/** 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([this, 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([this, pstate_index](){
+ simgrid::simix::kernelImmediate([this, pstate_index] {
this->pimpl_cpu->setPState(pstate_index);
});
}
* \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([this] {
- return this->pimpl_->getAttachedStorageList();
+ simgrid::simix::kernelImmediate([this, storages] {
+ this->pimpl_->getAttachedStorageList(storages);
});
}