X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1386d9951c6653d682ba02d5ed9155485acf4f64..fd3f5fd2f458e86a9a2fc5c2a2b710d08c7be536:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 02698af270..5cb23b1611 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -18,8 +18,6 @@ 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; @@ -288,6 +286,16 @@ std::vector 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. @@ -391,17 +399,25 @@ xbt_dynar_t sg_hosts_as_dynar() // ========= 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 ============