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
Another step toward working CommPtr. chord example is broken ATM
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Activity.hpp
diff --git
a/include/simgrid/s4u/Activity.hpp
b/include/simgrid/s4u/Activity.hpp
index
1cdd79e
..
1a6004a
100644
(file)
--- a/
include/simgrid/s4u/Activity.hpp
+++ b/
include/simgrid/s4u/Activity.hpp
@@
-15,9
+15,7
@@
#include <simgrid/s4u/forward.hpp>
#include <simgrid/forward.h>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/forward.h>
-typedef enum {
- inited, started, finished
-} e_s4u_activity_state_t;
+typedef enum { inited = 0, started = 1, canceled = 2, errored, finished } e_s4u_activity_state_t;
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-28,6
+26,9
@@
namespace s4u {
*/
XBT_PUBLIC_CLASS Activity {
friend Comm;
*/
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();
protected:
Activity();
virtual ~Activity();