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
cosmetic cleanups in S4U
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Io.hpp
diff --git
a/include/simgrid/s4u/Io.hpp
b/include/simgrid/s4u/Io.hpp
index
4fb6b9f
..
8ac6040
100644
(file)
--- a/
include/simgrid/s4u/Io.hpp
+++ b/
include/simgrid/s4u/Io.hpp
@@
-17,20
+17,27
@@
namespace s4u {
/** I/O Activity, representing the asynchronous disk access.
*
/** 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 {
public:
*/
class XBT_PUBLIC Io : public Activity {
public:
- friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i);
- friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i);
- friend simgrid::s4u::Storage; // Factory of IOs
enum class OpType { READ, WRITE };
private:
enum class OpType { READ, WRITE };
private:
+ 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:
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);
+ friend Storage; // Factory of IOs
+
~Io() = default;
Io* start() override;
~Io() = default;
Io* start() override;
@@
-45,15
+52,9
@@
public:
#ifndef DOXYGEN
XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); }
#endif
#ifndef DOXYGEN
XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); }
#endif
+};
-private:
- sg_storage_t storage_ = nullptr;
- sg_size_t size_ = 0;
- OpType type_ = OpType::READ;
- std::string name_ = "";
- std::atomic_int_fast32_t refcount_{0};
-}; // class
-}
-}; // Namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_IO_HPP */
#endif /* SIMGRID_S4U_IO_HPP */