A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Anonymize unused parameters.
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
1e86878
..
78cfaf6
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-1,10
+1,11
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
/* 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/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 "simgrid/s4u/Storage.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
@@
-20,17
+21,17
@@
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;
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(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(
std::move(name)
)
{
{
- simgrid::s4u::Engine::get_instance()->storage_register(name, this);
+ simgrid::s4u::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);
}
{
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 Engine::get_instance()->storage_by_name_or_null(name);
}
@@
-40,36
+41,45
@@
const char* Storage::get_type()
return pimpl_->typeId_.c_str();
}
return pimpl_->typeId_.c_str();
}
-std::map<std::string, std::string>* Storage::get_properties()
+std::
unordered_
map<std::string, std::string>* Storage::get_properties()
{
return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
}
{
return simgrid::simix::simcall([this] { return pimpl_->get_properties(); });
}
-const char* Storage::get_property(
std::string
key)
+const char* Storage::get_property(
const std::string&
key)
{
return this->pimpl_->get_property(key);
}
{
return this->pimpl_->get_property(key);
}
-void Storage::set_property(
std::string
key, std::string value)
+void Storage::set_property(
const std::string&
key, std::string value)
{
simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
}
{
simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
}
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
+{
+ 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)
{
sg_size_t Storage::read(sg_size_t size)
{
- return
simcall_storage_read(pimpl_, size
);
+ 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)
{
{
- return simcall_storage_write(pimpl_, size);
+
+ 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 s4u */
@@
-81,9
+91,9
@@
void getStorageList(std::map<std::string, Storage*>* whereTo)
* (#sg_storage_t) and the functions for managing it.
*/
* (#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.
*/
*
* This functions checks whether a storage is a valid pointer or not and return its name.
*/
@@
-99,16
+109,16
@@
const char* sg_storage_get_host(sg_storage_t storage)
return storage->get_host()->get_cname();
}
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);
*/
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->get_properties();
+ std::
unordered_
map<std::string, std::string>* props = storage->get_properties();
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
if (props == nullptr)
return nullptr;
for (auto const& elm : *props) {
@@
-117,42
+127,42
@@
xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
return as_dict;
}
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);
}
*/
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);
}
*/
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);
}
*/
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()
{
*/
xbt_dynar_t sg_storages_as_dynar()
{