X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..8816765fafedb6fe7a30a663d1fd2eb3955c06f5:/include/simgrid/s4u/Io.hpp diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp index 4e7ae31a54..0a502aa6f3 100644 --- a/include/simgrid/s4u/Io.hpp +++ b/include/simgrid/s4u/Io.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ @@ -17,7 +17,7 @@ namespace s4u { /** I/O Activity, representing the asynchronous disk access. * - * They are generated from simgrid::s4u::Storage::read() and simgrid::s4u::Storage::write(). + * They are generated from Storage::io_init() or Storage::read() and Storage::write(). */ class XBT_PUBLIC Io : public Activity { @@ -25,7 +25,14 @@ public: enum class OpType { READ, WRITE }; private: - explicit Io(sg_size_t size, OpType type) : Activity(), size_(size), type_(type) {} + Storage* storage_ = nullptr; + sg_size_t size_ = 0; + OpType type_ = OpType::READ; + std::string name_ = ""; + std::atomic_int_fast32_t refcount_{0}; + + explicit Io(sg_storage_t storage, sg_size_t size, OpType type); + public: friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i); friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i); @@ -46,14 +53,8 @@ public: XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); } #endif -private: - sg_size_t size_ = 0; - sg_storage_t storage_ = nullptr; - std::string name_ = ""; - OpType type_ = OpType::READ; - std::atomic_int_fast32_t refcount_{0}; }; // class -} -}; // Namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif /* SIMGRID_S4U_IO_HPP */