#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
-#include <string>
-#include <unordered_map>
-
namespace simgrid {
namespace xbt {
template class Extendable<simgrid::s4u::Storage>;
namespace s4u {
-void getStorageList(std::map<std::string, Storage*>* whereTo)
-{
- for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
- whereTo->insert({s->get_name(), s});
-}
+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;
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
Storage* Storage::by_name(std::string name)
{
- return Engine::get_instance()->storage_by_name_or_null(name);
+ return Engine::get_instance()->storage_by_name(name);
}
-const std::string& Storage::get_name() const
+Storage* Storage::by_name_or_null(std::string name)
{
- return name_;
-}
-
-const char* Storage::get_cname() const
-{
- return name_.c_str();
+ return Engine::get_instance()->storage_by_name_or_null(name);
}
const char* Storage::get_type()
return pimpl_->typeId_.c_str();
}
-std::map<std::string, std::string>* Storage::getProperties()
+std::unordered_map<std::string, std::string>* Storage::get_properties()
{
return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
}
simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
}
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
+{
+ IoPtr res = IoPtr(new Io(size, type));
+ res->storage_ = this;
+ return res;
+}
+
+IoPtr Storage::read_async(sg_size_t size)
+{
+
+ IoPtr res = io_init(size, Io::OpType::READ);
+ res->start();
+ return res;
+}
+
sg_size_t Storage::read(sg_size_t size)
{
- return simcall_storage_read(pimpl_, size);
+ IoPtr i = io_init(size, Io::OpType::READ);
+ i->start()->wait();
+ return i->get_performed_ioops();
}
-sg_size_t Storage::write(sg_size_t size)
+IoPtr Storage::write_async(sg_size_t size)
{
- return simcall_storage_write(pimpl_, size);
+
+ IoPtr res = io_init(size, Io::OpType::WRITE);
+ res->start();
+ return res;
}
-/*************
- * Callbacks *
- *************/
-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;
+sg_size_t Storage::write(sg_size_t size)
+{
+ IoPtr i = io_init(size, Io::OpType::WRITE);
+ i->start()->wait();
+ return i->get_performed_ioops();
+}
} /* namespace s4u */
} /* namespace simgrid */
* (#sg_storage_t) and the functions for managing it.
*/
-/** \ingroup sg_storage_management
+/** @ingroup sg_storage_management
*
- * \brief Returns the name of the #sg_storage_t.
+ * @brief Returns the name of the #sg_storage_t.
*
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
return storage->get_host()->get_cname();
}
-/** \ingroup sg_storage_management
- * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
- * \param storage a storage
- * \return a dict containing the properties
+/** @ingroup sg_storage_management
+ * @brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage
+ * @param storage a storage
+ * @return a dict containing the properties
*/
xbt_dict_t sg_storage_get_properties(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::map<std::string, std::string>* props = storage->getProperties();
+ std::unordered_map<std::string, std::string>* props = storage->get_properties();
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
return as_dict;
}
-/** \ingroup sg_storage_management
- * \brief Change the value of a given storage property
+/** @ingroup sg_storage_management
+ * @brief Change the value of a given storage property
*
- * \param storage a storage
- * \param name a property name
- * \param value what to change the property to
+ * @param storage a storage
+ * @param name a property name
+ * @param value what to change the property to
*/
void sg_storage_set_property_value(sg_storage_t storage, const char* name, const char* value)
{
storage->set_property(name, value);
}
-/** \ingroup sg_storage_management
- * \brief Returns the value of a given storage property
+/** @ingroup sg_storage_management
+ * @brief Returns the value of a given storage property
*
- * \param storage a storage
- * \param name a property name
- * \return value of a property (or nullptr if property not set)
+ * @param storage a storage
+ * @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)
{
return storage->get_property(name);
}
-/** \ingroup sg_storage_management
- * \brief Finds a sg_storage_t using its name.
- * \param name the name of a storage
- * \return the corresponding storage
+/** @ingroup sg_storage_management
+ * @brief Finds a sg_storage_t using its name.
+ * @param name the name of a storage
+ * @return the corresponding storage
*/
sg_storage_t sg_storage_get_by_name(const char* name)
{
return simgrid::s4u::Storage::by_name(name);
}
-/** \ingroup sg_storage_management
- * \brief Returns a dynar containing all the storage elements declared at a given point of time
+/** @ingroup sg_storage_management
+ * @brief Returns a dynar containing all the storage elements declared at a given point of time
*/
xbt_dynar_t sg_storages_as_dynar()
{
