modernize two simcalls

[simgrid.git] / src / s4u / s4u_storage.cpp

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index e816d0d..53cfb30 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -59,12 +59,12 @@ const char* Storage::host()
 
 sg_size_t Storage::sizeFree()
 {
-  return simcall_storage_get_free_size(pimpl_);
+  return simgrid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getFreeSize(); });
 }
 
 sg_size_t Storage::sizeUsed()
 {
-  return simcall_storage_get_used_size(pimpl_);
+  return simgrid::simix::kernelImmediate([this] { return surf_storage_resource_priv(pimpl_)->getUsedSize(); });
 }
 
 sg_size_t Storage::size() {
@@ -88,8 +88,7 @@ void Storage::setProperty(const char* key, char* value)
 
 std::map<std::string, sg_size_t*>* Storage::content()
 {
-  return simgrid::simix::kernelImmediate(
-      [this] { return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(this->pimpl_))->getContent(); });
+  return simgrid::simix::kernelImmediate([this] { return surf_storage_resource_priv(this->pimpl_)->getContent(); });
 }
 
 std::unordered_map<std::string, Storage*>* Storage::allStorages()