factor cancel across activities

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

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 8961561..8d8ede0 100644 (file)
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -20,16 +20,22 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-RawImpl* RawImpl::start(s4u::Host* host, double timeout)
+RawImpl& RawImpl::set_host(s4u::Host* host)
 {
-  surf_action_ = host->pimpl_cpu->sleep(timeout);
-  surf_action_->set_data(this);
-  return this;
+  host_ = host;
+  return *this;
+}
+RawImpl& RawImpl::set_timeout(double timeout)
+{
+  timeout_ = timeout;
+  return *this;
 }
 
-RawImpl::~RawImpl()
+RawImpl* RawImpl::start()
 {
-  surf_action_->unref();
+  surf_action_ = host_->pimpl_cpu->sleep(timeout_);
+  surf_action_->set_data(this);
+  return this;
 }
 
 void RawImpl::suspend()
@@ -42,6 +48,12 @@ void RawImpl::resume()
   /* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
    * the end of the synchro. */
 }
+
+void RawImpl::cancel()
+{
+  /* I cannot cancel raw synchros directly. */
+}
+
 void RawImpl::post()
 {
   if (surf_action_->get_state() == resource::Action::State::FAILED) {
@@ -80,7 +92,7 @@ void RawImpl::finish()
   switch (simcall->call) {
 
     case SIMCALL_MUTEX_LOCK:
-      simgrid::xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping, *simcall->issuer);
+      simgrid::xbt::intrusive_erase(simcall_mutex_lock__get__mutex(simcall)->sleeping_, *simcall->issuer);
       break;
 
     case SIMCALL_COND_WAIT: