#include <simgrid/s4u/forward.hpp>
#include <simgrid/forward.h>
-typedef enum { inited = 0, started, canceled, errored, finished } e_s4u_activity_state_t;
+enum e_s4u_activity_state_t { inited = 0, started, canceled, errored, finished };
namespace simgrid {
namespace s4u {
*/
XBT_PUBLIC_CLASS Activity {
friend Comm;
- friend void intrusive_ptr_release(Comm * c);
- friend void intrusive_ptr_add_ref(Comm * c);
+ friend XBT_PUBLIC(void) intrusive_ptr_release(Comm * c);
+ friend XBT_PUBLIC(void) intrusive_ptr_add_ref(Comm * c);
+ friend Exec;
+ friend XBT_PUBLIC(void) intrusive_ptr_release(Exec * e);
+ friend XBT_PUBLIC(void) intrusive_ptr_add_ref(Exec * e);
protected:
- Activity();
- virtual ~Activity();
+ Activity() = default;
+ virtual ~Activity() = default;
public:
Activity(Activity const&) = delete;
e_s4u_activity_state_t getState() {return state_;}
/** Get the remaining amount of work that this Activity entails. When it's 0, it's done. */
- double getRemains();
+ virtual double getRemains();
/** Set the [remaining] amount of work that this Activity will entail
*
* It is forbidden to change the amount of work once the Activity is started */
void *getUserData() { return userData_; }
private:
- simgrid::kernel::activity::ActivityImpl *pimpl_ = nullptr;
+ simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
void *userData_ = nullptr;