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
What ActivityImpl child should look like IMHO
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.hpp
diff --git
a/src/kernel/activity/ActivityImpl.hpp
b/src/kernel/activity/ActivityImpl.hpp
index
d145e8f
..
58e146c
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.hpp
+++ b/
src/kernel/activity/ActivityImpl.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. */
@@
-13,6
+13,7
@@
#include "simgrid/forward.h"
#include <atomic>
#include "simgrid/forward.h"
#include <atomic>
+#include <simgrid/kernel/resource/Action.hpp>
#include <simgrid/simix.hpp>
namespace simgrid {
#include <simgrid/simix.hpp>
namespace simgrid {
@@
-21,15
+22,22
@@
namespace activity {
class XBT_PUBLIC ActivityImpl {
public:
class XBT_PUBLIC ActivityImpl {
public:
- ActivityImpl();
- virtual ~ActivityImpl();
+ ActivityImpl() = default;
+ explicit ActivityImpl(const std::string& name) : name_(name) {}
+ virtual ~ActivityImpl() = default;
e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */
- std::string name_; /* Activity name if any */
std::list<smx_simcall_t> simcalls_; /* List of simcalls waiting for this activity */
std::list<smx_simcall_t> simcalls_; /* List of simcalls waiting for this activity */
+ resource::Action* surf_action_ = nullptr;
+
+ const std::string& get_name() const { return name_; }
+ const char* get_cname() const { return name_.c_str(); }
+ void set_name(const std::string& name) { name_ = name; }
- virtual void suspend() = 0;
- virtual void resume() = 0;
- virtual void post() = 0; // What to do when a simcall terminates
+ virtual void suspend();
+ virtual void resume();
+ virtual void post() = 0; // What to do when a simcall terminates
+ virtual void finish() = 0;
+ void set_category(const std::string& category);
// boost::intrusive_ptr<ActivityImpl> support:
friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
// boost::intrusive_ptr<ActivityImpl> support:
friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
@@
-37,7
+45,14
@@
public:
private:
std::atomic_int_fast32_t refcount_{0};
private:
std::atomic_int_fast32_t refcount_{0};
+ std::string name_; /* Activity name if any */
+
+public:
+ static xbt::signal<void(ActivityImplPtr)> on_suspended;
+ static xbt::signal<void(ActivityImplPtr)> on_resumed;
};
};
-}}} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
#endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */
#endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */