X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9119c20b55464a6a1c867edc1a7a2d95b070847..66e4277badef8f22852720b79a78e1f091c3b679:/src/s4u/s4u_Storage.cpp

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index d1b2aa5597..f0bd686d3e 100644
--- a/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -56,34 +56,38 @@ 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)
+IoPtr Storage::io_init(sg_size_t size, Io::OpType type)
 {
-  IoPtr res     = IoPtr(new Io(size));
-  res->storage_ = this;
+  return IoPtr(new Io(this, size, type));
+}
+
+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)
 {
-  IoPtr i = io_init(size);
-  i->set_io_type(Io::OpType::READ);
+  IoPtr i = io_init(size, Io::OpType::READ);
   i->start()->wait();
   return i->get_performed_ioops();
 }
 
-sg_size_t Storage::write(sg_size_t size)
+IoPtr Storage::write_async(sg_size_t size)
 {
-  IoPtr i = io_init(size);
-  i->set_io_type(Io::OpType::WRITE);
-  i->start()->wait();
-  return i->get_performed_ioops();
+
+  IoPtr res = io_init(size, Io::OpType::WRITE);
+  res->start();
+  return res;
 }
 
-// Deprecated functions
-void getStorageList(std::map<std::string, Storage*>* whereTo)
+sg_size_t Storage::write(sg_size_t size)
 {
-  for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages())
-    whereTo->insert({s->get_name(), s});
+  IoPtr i = io_init(size, Io::OpType::WRITE);
+  i->start()->wait();
+  return i->get_performed_ioops();
 }
 
 } /* namespace s4u */