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
properly split init and start for IO activities
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Io.hpp
diff --git
a/include/simgrid/s4u/Io.hpp
b/include/simgrid/s4u/Io.hpp
index
2fb16f1
..
4fb6b9f
100644
(file)
--- a/
include/simgrid/s4u/Io.hpp
+++ b/
include/simgrid/s4u/Io.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2017-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-201
9
. 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. */
/* 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. */
@@
-21,22
+21,22
@@
namespace s4u {
*/
class XBT_PUBLIC Io : public Activity {
*/
class XBT_PUBLIC Io : public Activity {
-public:
- enum class OpType { READ, WRITE };
-
-private:
- explicit Io(sg_size_t size, OpType type) : Activity(), size_(size), type_(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 simgrid::s4u::Storage; // Factory of IOs
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:
+ explicit Io(sg_storage_t storage, sg_size_t size, OpType type);
+public:
~Io() = default;
~Io() = default;
-
Activity
* start() override;
-
Activity
* wait() override;
-
Activity
* wait_for(double timeout) override;
-
Activity
* cancel() override;
+
Io
* start() override;
+
Io
* wait() override;
+
Io
* wait_for(double timeout) override;
+
Io
* cancel() override;
bool test() override;
double get_remaining() override;
bool test() override;
double get_remaining() override;
@@
-47,10
+47,10
@@
public:
#endif
private:
#endif
private:
- sg_size_t size_ = 0;
sg_storage_t storage_ = nullptr;
sg_storage_t storage_ = nullptr;
- s
td::string name_ = ""
;
+ s
g_size_t size_ = 0
;
OpType type_ = OpType::READ;
OpType type_ = OpType::READ;
+ std::string name_ = "";
std::atomic_int_fast32_t refcount_{0};
}; // class
}
std::atomic_int_fast32_t refcount_{0};
}; // class
}