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
MailboxPtr looks like a smart pointer, but it's not. Kill it.
[simgrid.git]
/
src
/
kernel
/
activity
/
IoImpl.hpp
diff --git
a/src/kernel/activity/IoImpl.hpp
b/src/kernel/activity/IoImpl.hpp
index
59ec127
..
653d191
100644
(file)
--- a/
src/kernel/activity/IoImpl.hpp
+++ b/
src/kernel/activity/IoImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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. */
@@
-8,6
+8,7
@@
#include "src/kernel/activity/ActivityImpl.hpp"
#include "surf/surf.hpp"
#include "src/kernel/activity/ActivityImpl.hpp"
#include "surf/surf.hpp"
+#include <simgrid/s4u/Io.hpp>
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-16,20
+17,19
@@
namespace activity {
class XBT_PUBLIC IoImpl : public ActivityImpl {
public:
~IoImpl() override;
class XBT_PUBLIC IoImpl : public ActivityImpl {
public:
~IoImpl() override;
- explicit IoImpl(
std::string name, resource::Action* surf_action, s4u::Storage
* storage);
+ explicit IoImpl(
const std::string& name, resource::StorageImpl
* storage);
- void suspend() override;
- void resume() override;
+ IoImpl* start(sg_size_t size, s4u::Io::OpType type);
void post() override;
void post() override;
+ void finish() override;
void cancel();
double get_remaining();
sg_size_t get_performed_ioops() { return performed_ioops_; }
void cancel();
double get_remaining();
sg_size_t get_performed_ioops() { return performed_ioops_; }
- s4u::Storage* storage_ = nullptr;
- simgrid::kernel::resource::Action* surf_action_ = nullptr;
+ resource::StorageImpl* storage_ = nullptr;
sg_size_t performed_ioops_ = 0;
sg_size_t performed_ioops_ = 0;
- static
simgrid::xbt::signal<void(kernel::activity::IoImplPtr)> on_creation
;
- static
simgrid::xbt::signal<void(kernel::activity::
IoImplPtr)> on_completion;
+ static
xbt::signal<void(IoImplPtr)> on_start
;
+ static
xbt::signal<void(
IoImplPtr)> on_completion;
};
}
}
};
}
}