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
rename the plugins from the command line, and document it
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
a4e08df
..
aa0904d
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-19,22
+19,20
@@
template class Extendable<simgrid::s4u::Storage>;
namespace s4u {
namespace s4u {
-void XBT_ATTRIB_DEPRECATED_v322(
- "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22")
- getStorageList(std::map<std::string, Storage*>* whereTo)
+void getStorageList(std::map<std::string, Storage*>* whereTo)
{
{
- for (auto const& s : simgrid::s4u::Engine::get
I
nstance()->get_all_storages())
+ for (auto const& s : simgrid::s4u::Engine::get
_i
nstance()->get_all_storages())
whereTo->insert({s->get_name(), s});
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
whereTo->insert({s->get_name(), s});
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
- simgrid::s4u::Engine::get
I
nstance()->storage_register(name, this);
+ simgrid::s4u::Engine::get
_i
nstance()->storage_register(name, this);
}
Storage* Storage::byName(std::string name)
{
}
Storage* Storage::byName(std::string name)
{
- return Engine::get
I
nstance()->storage_by_name_or_null(name);
+ return Engine::get
_i
nstance()->storage_by_name_or_null(name);
}
const std::string& Storage::get_name() const
}
const std::string& Storage::get_name() const
@@
-59,17
+57,17
@@
Host* Storage::getHost()
std::map<std::string, std::string>* Storage::getProperties()
{
std::map<std::string, std::string>* Storage::getProperties()
{
- return simgrid::simix::
kernelImmediate([this] { return pimpl_->getP
roperties(); });
+ return simgrid::simix::
simcall([this] { return pimpl_->get_p
roperties(); });
}
const char* Storage::getProperty(std::string key)
{
}
const char* Storage::getProperty(std::string key)
{
- return this->pimpl_->get
P
roperty(key);
+ return this->pimpl_->get
_p
roperty(key);
}
void Storage::setProperty(std::string key, std::string value)
{
}
void Storage::setProperty(std::string key, std::string value)
{
- simgrid::simix::
kernelImmediate([this, key, value] { this->pimpl_->setP
roperty(key, value); });
+ simgrid::simix::
simcall([this, key, value] { this->pimpl_->set_p
roperty(key, value); });
}
sg_size_t Storage::read(sg_size_t size)
}
sg_size_t Storage::read(sg_size_t size)
@@
-85,8
+83,9
@@
sg_size_t Storage::write(sg_size_t size)
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onCreation;
-simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
+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;
} /* namespace s4u */
} /* namespace simgrid */
} /* namespace s4u */
} /* namespace simgrid */
@@
-172,7
+171,7
@@
sg_storage_t sg_storage_get_by_name(const char* name)
*/
xbt_dynar_t sg_storages_as_dynar()
{
*/
xbt_dynar_t sg_storages_as_dynar()
{
- std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::get
I
nstance()->get_all_storages();
+ std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::get
_i
nstance()->get_all_storages();
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr);
for (auto const& s : storage_list)
xbt_dynar_push(res, &s);
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr);
for (auto const& s : storage_list)
xbt_dynar_push(res, &s);