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
Merge branch 'master' into CRTP
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Exec.hpp
diff --git
a/include/simgrid/s4u/Exec.hpp
b/include/simgrid/s4u/Exec.hpp
index
6515064
..
bf9acf3
100644
(file)
--- a/
include/simgrid/s4u/Exec.hpp
+++ b/
include/simgrid/s4u/Exec.hpp
@@
-8,6
+8,7
@@
#include <simgrid/forward.h>
#include <simgrid/s4u/Activity.hpp>
#include <simgrid/forward.h>
#include <simgrid/s4u/Activity.hpp>
+#include <simgrid/s4u/Actor.hpp>
#include <xbt/ex.h>
#include <atomic>
#include <xbt/ex.h>
#include <atomic>
@@
-20,12
+21,10
@@
namespace s4u {
* They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
* similar mechanisms.
*/
* They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
* similar mechanisms.
*/
-class XBT_PUBLIC Exec : public Activity {
- std::string name_ = "";
+class XBT_PUBLIC Exec : public Activity_T<Exec> {
double priority_ = 1.0;
double bound_ = 0.0;
double timeout_ = 0.0;
double priority_ = 1.0;
double bound_ = 0.0;
double timeout_ = 0.0;
- std::string tracing_category_ = "";
std::atomic_int_fast32_t refcount_{0};
Host* host_ = nullptr;
std::atomic_int_fast32_t refcount_{0};
Host* host_ = nullptr;
@@
-43,8
+42,8
@@
public:
friend XBT_PUBLIC void intrusive_ptr_release(Exec* e);
friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
#endif
friend XBT_PUBLIC void intrusive_ptr_release(Exec* e);
friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
#endif
- static xbt::signal<void(Actor const&)> on_start;
- static xbt::signal<void(Actor const&)> on_completion;
+ static xbt::signal<void(Actor const&
, Exec const&
)> on_start;
+ static xbt::signal<void(Actor const&
, Exec const&
)> on_completion;
virtual Exec* start() override = 0;
virtual double get_remaining_ratio() = 0;
virtual Exec* start() override = 0;
virtual double get_remaining_ratio() = 0;
@@
-61,15
+60,16
@@
public:
bool test() override;
ExecPtr set_bound(double bound);
bool test() override;
ExecPtr set_bound(double bound);
- ExecPtr set_name(const std::string& name);
ExecPtr set_priority(double priority);
ExecPtr set_priority(double priority);
- ExecPtr set_tracing_category(const std::string& category);
ExecPtr set_timeout(double timeout);
Exec* cancel() override;
const std::string& get_name() const { return name_; }
const char* get_cname() const { return name_.c_str(); }
ExecPtr set_timeout(double timeout);
Exec* cancel() override;
const std::string& get_name() const { return name_; }
const char* get_cname() const { return name_.c_str(); }
-
- XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
+ Host* get_host() const;
+ unsigned int get_host_number() const;
+ double get_start_time() const;
+ double get_finish_time() const;
+ double get_cost() const;
};
class XBT_PUBLIC ExecSeq : public Exec {
};
class XBT_PUBLIC ExecSeq : public Exec {