-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2018. 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. */
#ifndef SIMGRID_S4U_ACTIVITY_HPP
#define SIMGRID_S4U_ACTIVITY_HPP
-#include <stdlib.h>
-#include <xbt/base.h>
-#include <xbt/misc.h>
-
#include <simgrid/s4u/forward.hpp>
-#include "simgrid/forward.h"
+#include <simgrid/forward.h>
-SG_BEGIN_DECL();
-typedef enum {
- inited, started, finished
-} e_s4u_activity_state_t;
-SG_END_DECL();
+enum e_s4u_activity_state_t { inited = 0, started, canceled, errored, finished };
namespace simgrid {
namespace s4u {
*/
XBT_PUBLIC_CLASS Activity {
friend Comm;
+ 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;
+ Activity& operator=(Activity const&) = delete;
+
/** Starts a previously created activity.
*
* This function is optional: you can call wait() even if you didn't call start()
*/
- virtual void start()=0;
+ virtual Activity* start() = 0;
/** Tests whether the given activity is terminated yet. This is a pure function. */
//virtual bool test()=0;
/** Blocks until the activity is terminated */
- virtual void wait()=0;
+ virtual Activity* wait() = 0;
/** Blocks until the activity is terminated, or until the timeout is elapsed
* Raises: timeout exception.*/
- virtual void wait(double timeout)=0;
+ virtual Activity* wait(double timeout) = 0;
/** Cancel that activity */
//virtual void cancel();
/** Retrieve the current state of the activity */
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 setRemains(double remains);
+ Activity* setRemains(double remains);
/** Put some user data onto the Activity */
- void setUserData(void *data) {userData_=data;}
+ Activity* setUserData(void* data)
+ {
+ userData_ = data;
+ return this;
+ }
/** Retrieve the user data of the Activity */
void *getUserData() { return userData_; }
private:
- simgrid::simix::Synchro *pimpl_ = nullptr;
+ simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
void *userData_ = nullptr;