namespace simgrid {
namespace xbt {
-template class Extendable<simgrid::s4u::Storage>;
-}
+template class Extendable<s4u::Storage>;
+} // namespace xbt
namespace s4u {
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_creation;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_destruction;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::on_state_change;
+xbt::signal<void(Storage&)> Storage::on_creation;
+xbt::signal<void(Storage const&)> Storage::on_destruction;
+xbt::signal<void(Storage const&)> Storage::on_state_change;
-Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(std::move(name))
+Storage::Storage(const std::string& name, kernel::resource::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
- simgrid::s4u::Engine::get_instance()->storage_register(name_, this);
+ Engine::get_instance()->storage_register(name_, this);
}
-Storage* Storage::by_name(std::string name)
+Storage* Storage::by_name(const std::string& name)
{
return Engine::get_instance()->storage_by_name(name);
}
-Storage* Storage::by_name_or_null(std::string name)
+Storage* Storage::by_name_or_null(const std::string& name)
{
return Engine::get_instance()->storage_by_name_or_null(name);
}
return pimpl_->typeId_.c_str();
}
-std::unordered_map<std::string, std::string>* Storage::get_properties()
+const std::unordered_map<std::string, std::string>* Storage::get_properties() const
{
- return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
+ return pimpl_->get_properties();
}
-const char* Storage::get_property(std::string key)
+const char* Storage::get_property(const std::string& key) const
{
return this->pimpl_->get_property(key);
}
-void Storage::set_property(std::string key, std::string value)
+void Storage::set_property(const std::string& key, const std::string& value)
{
- simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
+ kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
}
IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops();
}
-} /* namespace s4u */
-} /* namespace simgrid */
+} // namespace s4u
+} // namespace simgrid
/* **************************** Public C interface *************************** */
{
xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::unordered_map<std::string, std::string>* props = storage->get_properties();
+ const std::unordered_map<std::string, std::string>* props = storage->get_properties();
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {