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
codefactor: a few more annoying spaces
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
cabbcb0
..
ba76eac
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-18,8
+18,8
@@
template class Extendable<s4u::Storage>;
namespace s4u {
xbt::signal<void(Storage&)> Storage::on_creation;
namespace s4u {
xbt::signal<void(Storage&)> Storage::on_creation;
-xbt::signal<void(Storage&)> Storage::on_destruction;
-xbt::signal<void(Storage&)> Storage::on_state_change;
+xbt::signal<void(Storage
const
&)> Storage::on_destruction;
+xbt::signal<void(Storage
const
&)> Storage::on_state_change;
Storage::Storage(const std::string& name, kernel::resource::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
Storage::Storage(const std::string& name, kernel::resource::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
@@
-41,19
+41,19
@@
const char* Storage::get_type()
return pimpl_->typeId_.c_str();
}
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
simix::simcall([this] { return pimpl_->get_properties(); }
);
+ return
pimpl_->get_properties(
);
}
}
-const char* Storage::get_property(const std::string& key)
+const char* Storage::get_property(const std::string& key)
const
{
return this->pimpl_->get_property(key);
}
void Storage::set_property(const std::string& key, const std::string& value)
{
{
return this->pimpl_->get_property(key);
}
void Storage::set_property(const std::string& key, const std::string& value)
{
-
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)
}
IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
@@
-73,7
+73,6
@@
sg_size_t Storage::read(sg_size_t size)
IoPtr Storage::write_async(sg_size_t size)
{
IoPtr Storage::write_async(sg_size_t size)
{
-
return IoPtr(io_init(size, Io::OpType::WRITE)->start());
}
return IoPtr(io_init(size, Io::OpType::WRITE)->start());
}
@@
-118,11
+117,11
@@
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_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) {
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;
}
}
return as_dict;
}