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
Fix process_killall. Closes #186.
[simgrid.git]
/
src
/
s4u
/
s4u_storage.cpp
diff --git
a/src/s4u/s4u_storage.cpp
b/src/s4u/s4u_storage.cpp
index
d10a19d
..
092afea
100644
(file)
--- a/
src/s4u/s4u_storage.cpp
+++ b/
src/s4u/s4u_storage.cpp
@@
-16,13
+16,13
@@
std::map<std::string, Storage*>* allStorages()
{
std::unordered_map<std::string, surf::StorageImpl*>* map = surf::StorageImpl::storagesMap();
std::map<std::string, Storage*>* res = new std::map<std::string, Storage*>;
- for (auto s : *map)
+ for (auto
const&
s : *map)
res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface
return res;
}
-Storage* Storage::byName(
const char*
name)
+Storage* Storage::byName(
std::string
name)
{
surf::StorageImpl* res = surf::StorageImpl::byName(name);
if (res == nullptr)
@@
-30,51
+30,52
@@
Storage* Storage::byName(const char* name)
return &res->piface_;
}
-const char* Storage::
n
ame()
+const char* Storage::
getN
ame()
{
return pimpl_->cname();
}
-const char* Storage::
t
ype()
+const char* Storage::
getT
ype()
{
return pimpl_->typeId_.c_str();
}
-Host* Storage::
h
ost()
+Host* Storage::
getH
ost()
{
return attached_to_;
}
-sg_size_t Storage::
s
izeFree()
+sg_size_t Storage::
getS
izeFree()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->getFreeSize(); });
}
-sg_size_t Storage::
s
izeUsed()
+sg_size_t Storage::
getS
izeUsed()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->getUsedSize(); });
}
-sg_size_t Storage::size() {
- return pimpl_->size_;
+sg_size_t Storage::getSize()
+{
+ return pimpl_->getSize();
}
-
xbt_dict_t Storage::p
roperties()
+
std::map<std::string, std::string>* Storage::getP
roperties()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); });
}
-const char* Storage::
p
roperty(const char* key)
+const char* Storage::
getP
roperty(const char* key)
{
- return
static_cast<const char*>(xbt_dict_get_or_null(this->properties(), key)
);
+ return
this->pimpl_->getProperty(key
);
}
-void Storage::setProperty(const char* key, char* value)
+void Storage::setProperty(const char* key, c
onst c
har* value)
{
-
xbt_dict_set(this->properties(), key, value, nullptr
);
+
simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }
);
}
-std::map<std::string, sg_size_t>* Storage::
c
ontent()
+std::map<std::string, sg_size_t>* Storage::
getC
ontent()
{
return simgrid::simix::kernelImmediate([this] { return pimpl_->getContent(); });
}