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
cosmetics (less SIMIX, more kernel)
[simgrid.git]
/
src
/
kernel
/
activity
/
IoImpl.hpp
diff --git
a/src/kernel/activity/IoImpl.hpp
b/src/kernel/activity/IoImpl.hpp
index
653d191
..
cbc2f0d
100644
(file)
--- a/
src/kernel/activity/IoImpl.hpp
+++ b/
src/kernel/activity/IoImpl.hpp
@@
-3,8
+3,8
@@
/* 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. */
-#ifndef SIM
IX_SYNCHRO
_IO_HPP
-#define SIM
IX_SYNCHRO
_IO_HPP
+#ifndef SIM
GRID_KERNEL_ACTIVITY
_IO_HPP
+#define SIM
GRID_KERNEL_ACTIVITY
_IO_HPP
#include "src/kernel/activity/ActivityImpl.hpp"
#include "surf/surf.hpp"
#include "src/kernel/activity/ActivityImpl.hpp"
#include "surf/surf.hpp"
@@
-14,25
+14,30
@@
namespace simgrid {
namespace kernel {
namespace activity {
namespace kernel {
namespace activity {
-class XBT_PUBLIC IoImpl : public ActivityImpl {
+class XBT_PUBLIC IoImpl : public ActivityImpl_T<IoImpl> {
+ resource::StorageImpl* storage_ = nullptr;
+ resource::DiskImpl* disk_ = nullptr;
+ sg_size_t size_ = 0;
+ s4u::Io::OpType type_ = s4u::Io::OpType::READ;
+ sg_size_t performed_ioops_ = 0;
+
public:
public:
- ~IoImpl() override;
- explicit IoImpl(const std::string& name, resource::StorageImpl* storage);
+ IoImpl& set_size(sg_size_t size);
+ IoImpl& set_type(s4u::Io::OpType type);
+ IoImpl& set_storage(resource::StorageImpl* storage);
+ IoImpl& set_disk(resource::DiskImpl* disk);
+
+ sg_size_t get_performed_ioops() { return performed_ioops_; }
- IoImpl* start(
sg_size_t size, s4u::Io::OpType type
);
+ IoImpl* start();
void post() override;
void finish() override;
void post() override;
void finish() override;
- void cancel();
- double get_remaining();
- sg_size_t get_performed_ioops() { return performed_ioops_; }
- resource::StorageImpl* storage_ = nullptr;
- sg_size_t performed_ioops_ = 0;
- static xbt::signal<void(IoImplPtr)> on_start;
- static xbt::signal<void(IoImplPtr)> on_completion;
+ static xbt::signal<void(IoImpl const&)> on_start;
+ static xbt::signal<void(IoImpl const&)> on_completion;
};
};
-}
-}
-} // namespace simgrid
::kernel::activity
+}
// namespace activity
+}
// namespace kernel
+} // namespace simgrid
#endif
#endif