XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts");
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-int USER_HOST_LEVEL = -1;
-
namespace simgrid {
namespace xbt {
template class Extendable<s4u::Host>;
void Host::turn_on()
{
if (not is_on()) {
- simix::simcall([this] {
+ kernel::actor::simcall([this] {
this->pimpl_cpu->turn_on();
this->pimpl_->turn_on();
on_state_change(*this);
void Host::turn_off()
{
if (is_on()) {
- simix::simcall([this] {
+ kernel::actor::simcall([this] {
for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_)
if (vm->get_pm() == this) {
vm->shutdown();
void Host::set_property(const std::string& key, const std::string& value)
{
- simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
+ kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
}
void Host::set_properties(const std::map<std::string, std::string>& properties)
{
- simix::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
+ kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); });
}
/** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law.
* The profile must contain boolean values. */
void Host::set_state_profile(kernel::profile::Profile* p)
{
- return simix::simcall([this, p] { pimpl_cpu->set_state_profile(p); });
+ return kernel::actor::simcall([this, p] { pimpl_cpu->set_state_profile(p); });
}
/** Specify a profile modeling the external load according to a exhaustive list or a stochastic law.
*
*/
void Host::set_speed_profile(kernel::profile::Profile* p)
{
- return simix::simcall([this, p] { pimpl_cpu->set_speed_profile(p); });
+ return kernel::actor::simcall([this, p] { pimpl_cpu->set_speed_profile(p); });
}
/** @brief Get the peak processor speed (in flops/s), at the specified pstate */
/** @brief Set the pstate at which the host should run */
void Host::set_pstate(int pstate_index)
{
- simix::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); });
+ kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); });
}
/** @brief Retrieve the pstate at which the host is currently running */
int Host::get_pstate() const
return this->pimpl_cpu->get_pstate();
}
+std::vector<Disk*> Host::get_disks() const
+{
+ return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); });
+}
+
+void Host::add_disk(Disk* disk)
+{
+ kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); });
+}
+
+void Host::remove_disk(const std::string& disk_name)
+{
+ kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
+}
/**
* @ingroup simix_storage_management
* @brief Returns the list of storages attached to a host.
*/
std::vector<const char*> Host::get_attached_storages() const
{
- return simix::simcall([this] { return this->pimpl_->get_attached_storages(); });
+ return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); });
}
std::unordered_map<std::string, Storage*> const& Host::get_mounted_storages()
// ========= Layering madness ==============*
// ========== User data Layer ==========
-void* sg_host_user(sg_host_t host)
+void* sg_host_data(sg_host_t host)
+{
+ return host->get_data();
+}
+void sg_host_data_set(sg_host_t host, void* userdata)
+{
+ host->set_data(userdata);
+}
+void* sg_host_user(sg_host_t host) // deprecated
{
- return host->extension(USER_HOST_LEVEL);
+ return host->get_data();
}
-void sg_host_user_set(sg_host_t host, void* userdata)
+void sg_host_user_set(sg_host_t host, void* userdata) // deprecated
{
- host->extension_set(USER_HOST_LEVEL, userdata);
+ host->set_data(userdata);
}
-void sg_host_user_destroy(sg_host_t host)
+void sg_host_user_destroy(sg_host_t host) // deprecated
{
- host->extension_set(USER_HOST_LEVEL, nullptr);
+ host->set_data(nullptr);
}
// ========= storage related functions ============
return host->is_on();
}
-/** @deprecated */
-int sg_host_is_off(sg_host_t host)
-{
- return not host->is_on();
-}
-
/** @brief Get the properties of a host */
xbt_dict_t sg_host_get_properties(sg_host_t host)
{