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
fix the done marking of multiple times taken transitions
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.hpp
diff --git
a/src/kernel/activity/ActivityImpl.hpp
b/src/kernel/activity/ActivityImpl.hpp
index ceaea01e6ff2d6562ba025875a54473b1c5c7e4a..d974e2963f81cad4f870bb9a9043471ad37d5dd4 100644
(file)
--- a/
src/kernel/activity/ActivityImpl.hpp
+++ b/
src/kernel/activity/ActivityImpl.hpp
@@
-35,8
+35,8
@@
public:
virtual ~ActivityImpl();
ActivityImpl() = default;
std::list<actor::Simcall*> simcalls_; /* List of simcalls waiting for this activity */
virtual ~ActivityImpl();
ActivityImpl() = default;
std::list<actor::Simcall*> simcalls_; /* List of simcalls waiting for this activity */
- s4u::Activity* piface_ = nullptr;
- resource::Action*
surf_action_ = nullptr;
+ s4u::Activity* piface_
= nullptr;
+ resource::Action*
model_action_ = nullptr; /* The resource consumption in the used model */
protected:
void inline set_name(std::string_view name)
protected:
void inline set_name(std::string_view name)