X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc01999f5003e51cc1d12f93647999a1a143f23..60932102d92338289cf3d4cde552e24e34482004:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 0b8d3032a2..e4ace917c0 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -15,9 +15,7 @@ #include #include -typedef enum { - inited, started, finished -} e_s4u_activity_state_t; +typedef enum { inited = 0, started, canceled, errored, finished } e_s4u_activity_state_t; namespace simgrid { namespace s4u { @@ -28,6 +26,9 @@ namespace s4u { */ XBT_PUBLIC_CLASS Activity { friend Comm; + friend void intrusive_ptr_release(Comm * c); + friend void intrusive_ptr_add_ref(Comm * c); + protected: Activity(); virtual ~Activity(); @@ -66,7 +67,7 @@ public: void *getUserData() { return userData_; } private: - simgrid::simix::Synchro *pimpl_ = nullptr; + simgrid::kernel::activity::ActivityImpl *pimpl_ = nullptr; e_s4u_activity_state_t state_ = inited; double remains_ = 0; void *userData_ = nullptr;