Merge branch 'master' into disk

[simgrid.git] / src / kernel / activity / SynchroRaw.hpp

diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp
index c96dd4a6fdf1a4f49f441e9538658f819a984d06..13953ead95dfe234cb674412352354b423801e64 100644 (file)
--- a/src/kernel/activity/SynchroRaw.hpp
+++ b/src/kernel/activity/SynchroRaw.hpp
@@ -14,13 +14,23 @@ namespace kernel {
 namespace activity {
 
   /** Used to implement mutexes, semaphores and conditions */
-class XBT_PUBLIC RawImpl : public ActivityImpl {
+class XBT_PUBLIC RawImpl : public ActivityImpl_T<RawImpl> {
+  sg_host_t host_ = nullptr;
+  double timeout_ = -1;
+
 public:
-  ~RawImpl() override;
+  RawImpl& set_host(s4u::Host* host);
+  RawImpl& set_timeout(double timeout);
+
+  RawImpl* start();
   void suspend() override;
   void resume() override;
+  void cancel() override;
   void post() override;
+  void finish() override;
 };
-}}} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 
 #endif