delete pimpl_;
if (pimpl_netpoint != nullptr) // not removed yet by a children class
- simgrid::s4u::Engine::instance()->netcardUnregister(pimpl_netpoint);
+ 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()) {
smx_actor_t self = SIMIX_process_self();
- simgrid::simix::kernelImmediate([&] {
+ simgrid::simix::kernelImmediate([this, self] {
SIMIX_host_off(this, self);
onStateChange(*this);
});
* by calling each "get_route" function in each routing component.
*/
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_);
+}
+/** @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)) {
/** 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); });
+ simgrid::simix::kernelImmediate([this, key, value] {
+ this->pimpl_->setProperty(key, value);
+ });
}
/** Get the processes attached to the host */
xbt_swag_t Host::processes()
{
- return simgrid::simix::kernelImmediate([&]() {
+ 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([&] {
+ return simgrid::simix::kernelImmediate([this] {
return this->pimpl_cpu->getPstateSpeedCurrent();
});
}
/** Get one power peak (in flops/s) of a host at a given 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 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();
+ });
}
/**
*/
xbt_dynar_t Host::attachedStorages()
{
- return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
+ return simgrid::simix::kernelImmediate([this] {
+ return this->pimpl_->getAttachedStorageList();
+ });
}
} // namespace simgrid