-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
+#include "simgrid/simix.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
namespace simgrid {
-namespace xbt {
-template class Extendable<simgrid::s4u::Storage>;
-}
+
+template class xbt::Extendable<s4u::Storage>;
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_(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);
}
-const char* Storage::get_type()
+const char* Storage::get_type() const
{
- return pimpl_->typeId_.c_str();
+ return pimpl_->get_type();
}
-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)
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
{
- IoPtr res = IoPtr(new Io());
- res->size_ = size;
- res->storage_ = this;
- res->set_remaining(size);
- return res;
+ return IoPtr(new Io(this, size, type));
+}
+
+IoPtr Storage::read_async(sg_size_t size)
+{
+ return IoPtr(io_init(size, Io::OpType::READ))->start();
}
sg_size_t Storage::read(sg_size_t size)
{
- IoPtr i = io_init(size);
- i->set_io_type(Io::OpType::READ);
- i->start()->wait();
- return i->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops();
}
-sg_size_t Storage::write(sg_size_t size)
+IoPtr Storage::write_async(sg_size_t size)
{
- IoPtr i = io_init(size);
- i->set_io_type(Io::OpType::WRITE);
- i->start()->wait();
- return i->get_performed_ioops();
+ return IoPtr(io_init(size, Io::OpType::WRITE)->start());
}
-// Deprecated functions
-void getStorageList(std::map<std::string, Storage*>* whereTo)
+sg_size_t Storage::write(sg_size_t size)
{
- for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
- whereTo->insert({s->get_name(), s});
+ return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops();
}
-} /* namespace s4u */
-} /* namespace simgrid */
+} // namespace s4u
+} // namespace simgrid
/* **************************** Public C interface *************************** */
*
* 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();
* @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);
- 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) {
- 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;
}
* @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);
}
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();