new surf::HostImpl(this);
}
-Host::~Host()
+Host* Host::set_netpoint(kernel::routing::NetPoint* netpoint)
{
- xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it.");
+ pimpl_netpoint_ = netpoint;
+ return this;
+}
+Host::~Host()
+{
delete pimpl_;
if (pimpl_netpoint_ != nullptr) // not removed yet by a children class
Engine::get_instance()->netpoint_unregister(pimpl_netpoint_);
*/
void Host::destroy()
{
- if (not currently_destroying_) {
- currently_destroying_ = true;
- on_destruction(*this);
- Engine::get_instance()->host_unregister(std::string(name_));
- delete this;
- }
+ on_destruction(*this);
+ Engine::get_instance()->host_unregister(std::string(name_));
+ delete this;
}
Host* Host::by_name(const std::string& name)
return pimpl_netpoint_->get_englobing_zone()->get_iface();
}
-void Host::sendto(Host* dest, double byte_amount)
+void Host::sendto(Host* dest, double byte_amount) // deprecated 331
{
- sendto_async(dest, byte_amount)->wait();
+ Comm::sendto_async(this, dest, byte_amount)->wait();
}
-CommPtr Host::sendto_async(Host* dest, double byte_amount)
+CommPtr Host::sendto_async(Host* dest, double byte_amount) // deprecated 331
{
return Comm::sendto_async(this, dest, byte_amount);
}
+void Host::send_to(Host* dest, double byte_amount) // deprecated 330
+{
+ Comm::sendto(this, dest, byte_amount);
+}
+
/** Get the properties assigned to a host */
const std::unordered_map<std::string, std::string>* Host::get_properties() const
{
return this->pimpl_->get_property(key);
}
-void Host::set_property(const std::string& key, const std::string& value)
+Host* Host::set_property(const std::string& key, const std::string& value)
{
kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
+ return this;
}
-void Host::set_properties(const std::unordered_map<std::string, std::string>& properties)
+Host* Host::set_properties(const std::unordered_map<std::string, std::string>& properties)
{
kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
+ return this;
}
/** Specify a profile turning the host on and off according to an exhaustive list or a stochastic law.
return this->pimpl_cpu->get_core_count();
}
+Host* Host::set_core_count(int core_count)
+{
+ this->pimpl_cpu->set_core_count(core_count);
+ return this;
+}
+
/** @brief Set the pstate at which the host should run */
void Host::set_pstate(int pstate_index)
{
return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); });
}
+Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
+{
+ auto disk =
+ this->get_netpoint()->get_englobing_zone()->get_disk_model()->create_disk(name, read_bandwidth, write_bandwidth);
+ return disk->set_host(this)->get_iface();
+}
+
void Host::add_disk(const Disk* disk)
{
kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); });
kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
}
-ExecPtr Host::exec_async(double flops) const
+ExecPtr Host::exec_init(double flops) const
{
return this_actor::exec_init(flops);
}
+ExecPtr Host::exec_async(double flops) const
+{
+ return this_actor::exec_async(flops);
+}
+
void Host::execute(double flops) const
{
execute(flops, 1.0 /* priority */);
void Host::execute(double flops, double priority) const
{
- this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait();
+ this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait();
}
} // namespace s4u
sg_host_t* sg_host_list()
{
const simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
- size_t host_count = e->get_host_count();
+ size_t host_count = e->get_host_count();
+
xbt_assert(host_count > 0, "There is no host!");
std::vector<simgrid::s4u::Host*> hosts = e->get_all_hosts();
sg_host_t* res = xbt_new(sg_host_t, hosts.size());
- memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size());
+ std::copy(begin(hosts), end(hosts), res);
return res;
}
{
std::vector<sg_disk_t> list = host->get_disks();
*disk_count = list.size();
- *disks = static_cast<sg_disk_t*>(xbt_malloc(sizeof(sg_disk_t) * (*disk_count)));
- for (size_t i = 0; i < *disk_count; i++)
- (*disks)[i] = list[i];
+ *disks = xbt_new(sg_disk_t, list.size());
+ std::copy(begin(list), end(list), *disks);
}
// =========== user-level functions ===============
/** @brief Get the properties of a host */
xbt_dict_t sg_host_get_properties(const_sg_host_t host)
{
- xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
const std::unordered_map<std::string, std::string>* props = host->get_properties();
+ xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
+
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount)
{
- from->sendto(to, byte_amount);
+ simgrid::s4u::Comm::sendto(from, to, byte_amount);
}
/** @brief Displays debugging information about a host */
