X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92cd12d0b61dd5a17500ef7d38f7b95a80301037..75e8b2ae65722d849ef899616de7091286ec91f5:/src/s4u/s4u_Storage.cpp?ds=sidebyside diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index 08ad07863d..8b9a4ecb38 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -36,7 +36,7 @@ Storage* Storage::by_name_or_null(const std::string& name) return Engine::get_instance()->storage_by_name_or_null(name); } -const char* Storage::get_type() +const char* Storage::get_type() const { return pimpl_->typeId_.c_str(); } @@ -73,7 +73,6 @@ sg_size_t Storage::read(sg_size_t size) IoPtr Storage::write_async(sg_size_t size) { - return IoPtr(io_init(size, Io::OpType::WRITE)->start()); } @@ -97,13 +96,13 @@ sg_size_t Storage::write(sg_size_t size) * * This functions checks whether a storage is a valid pointer or not and return its name. */ -const char* sg_storage_get_name(sg_storage_t storage) +const char* sg_storage_get_name(const_sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); return storage->get_cname(); } -const char* sg_storage_get_host(sg_storage_t storage) +const char* sg_storage_get_host(const_sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); return storage->get_host()->get_cname(); @@ -114,7 +113,7 @@ const char* sg_storage_get_host(sg_storage_t storage) * @param storage a storage * @return a dict containing the properties */ -xbt_dict_t sg_storage_get_properties(sg_storage_t storage) +xbt_dict_t sg_storage_get_properties(const_sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); @@ -122,7 +121,7 @@ xbt_dict_t sg_storage_get_properties(sg_storage_t storage) if (props == nullptr) return nullptr; for (auto const& elm : *props) { - xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str())); } return as_dict; } @@ -146,7 +145,7 @@ void sg_storage_set_property_value(sg_storage_t storage, const char* name, const * @param name a property name * @return value of a property (or nullptr if property not set) */ -const char* sg_storage_get_property_value(sg_storage_t storage, const char* name) +const char* sg_storage_get_property_value(const_sg_storage_t storage, const char* name) { return storage->get_property(name); } @@ -173,7 +172,7 @@ xbt_dynar_t sg_storages_as_dynar() return res; } -void* sg_storage_get_data(sg_storage_t storage) +void* sg_storage_get_data(const_sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters"); return storage->get_data();