Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index 84319d8..b1e3e71 100644 (file)
--- a/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@ -5,6 +5,7 @@
 
 #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"
@@ -55,14 +56,41 @@ void Storage::set_property(std::string key, std::string value)
   simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, value); });
 }
 
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
+{
+  IoPtr res     = IoPtr(new Io(size, type));
+  res->storage_ = this;
+  return res;
+}
+
+IoPtr Storage::read_async(sg_size_t size)
+{
+
+  IoPtr res = io_init(size, Io::OpType::READ);
+  res->start();
+  return res;
+}
+
 sg_size_t Storage::read(sg_size_t size)
 {
-  return simcall_storage_read(pimpl_, size);
+  IoPtr i = io_init(size, Io::OpType::READ);
+  i->start()->wait();
+  return i->get_performed_ioops();
+}
+
+IoPtr Storage::write_async(sg_size_t size)
+{
+
+  IoPtr res = io_init(size, Io::OpType::WRITE);
+  res->start();
+  return res;
 }
 
 sg_size_t Storage::write(sg_size_t size)
 {
-  return simcall_storage_write(pimpl_, size);
+  IoPtr i = io_init(size, Io::OpType::WRITE);
+  i->start()->wait();
+  return i->get_performed_ioops();
 }
 
 // Deprecated functions