uniform naming across activities

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index e683dd5..fa13818 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -19,12 +19,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
 void simgrid::kernel::activity::SleepImpl::suspend()
 {
-  surf_sleep->suspend();
+  surf_action_->suspend();
 }
 
 void simgrid::kernel::activity::SleepImpl::resume()
 {
-  surf_sleep->resume();
+  surf_action_->resume();
 }
 
 void simgrid::kernel::activity::SleepImpl::post()
@@ -41,7 +41,7 @@ void simgrid::kernel::activity::SleepImpl::post()
           std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")));
     }
 
-    switch (surf_sleep->get_state()) {
+    switch (surf_action_->get_state()) {
       case simgrid::kernel::resource::Action::State::FAILED:
         simcall->issuer->context_->iwannadie = true;
         result                               = SIMIX_FAILED;

diff --git a/src/kernel/activity/SleepImpl.hpp b/src/kernel/activity/SleepImpl.hpp
index dbc0a7d..76fa036 100644 (file)
--- a/src/kernel/activity/SleepImpl.hpp
+++ b/src/kernel/activity/SleepImpl.hpp
@@ -19,8 +19,8 @@ public:
   void resume() override;
   void post() override;
 
-  sg_host_t host           = nullptr; /* The host that is sleeping */
-  simgrid::kernel::resource::Action* surf_sleep = nullptr; /* The Surf sleeping action encapsulated */
+  sg_host_t host                 = nullptr;
+  resource::Action* surf_action_ = nullptr;
 };
 }
 }

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 9b9db4f..3287a00 100644 (file)
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -12,7 +12,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
 
 simgrid::kernel::activity::RawImpl::~RawImpl()
 {
-  sleep->unref();
+  surf_action_->unref();
 }
 void simgrid::kernel::activity::RawImpl::suspend()
 {
@@ -27,9 +27,9 @@ void simgrid::kernel::activity::RawImpl::resume()
 void simgrid::kernel::activity::RawImpl::post()
 {
   XBT_IN("(%p)",this);
-  if (sleep->get_state() == simgrid::kernel::resource::Action::State::FAILED)
+  if (surf_action_->get_state() == simgrid::kernel::resource::Action::State::FAILED)
     state_ = SIMIX_FAILED;
-  else if (sleep->get_state() == simgrid::kernel::resource::Action::State::FINISHED)
+  else if (surf_action_->get_state() == simgrid::kernel::resource::Action::State::FINISHED)
     state_ = SIMIX_SRC_TIMEOUT;
 
   SIMIX_synchro_finish(this);

diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp
index d9a38c2..2459efe 100644 (file)
--- a/src/kernel/activity/SynchroRaw.hpp
+++ b/src/kernel/activity/SynchroRaw.hpp
@@ -21,7 +21,7 @@ public:
   void resume() override;
   void post() override;
 
-  simgrid::kernel::resource::Action* sleep = nullptr;
+  resource::Action* surf_action_ = nullptr;
   };
 
 }}} // namespace simgrid::kernel::activity

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 2e2065b..6560ccd 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -195,8 +195,8 @@ smx_activity_t ActorImpl::sleep(double duration)
 
   simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
   synchro->host                                 = host_;
-  synchro->surf_sleep                           = host_->pimpl_cpu->sleep(duration);
-  synchro->surf_sleep->set_data(synchro);
+  synchro->surf_action_                         = host_->pimpl_cpu->sleep(duration);
+  synchro->surf_action_->set_data(synchro);
   XBT_DEBUG("Create sleep synchronization %p", synchro);
 
   return synchro;
@@ -462,8 +462,8 @@ void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
       if (i != actor->waiting_synchro->simcalls_.end())
         actor->waiting_synchro->simcalls_.remove(&actor->simcall);
     } else if (sleep != nullptr) {
-      if (sleep->surf_sleep)
-        sleep->surf_sleep->cancel();
+      if (sleep->surf_action_)
+        sleep->surf_action_->cancel();
       sleep->post();
     } else if (raw != nullptr) {
       SIMIX_synchro_stop_waiting(actor, &actor->simcall);
@@ -626,8 +626,8 @@ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl
   SIMIX_process_on_exit(process,
                         [](int, void* arg) {
                           auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
-                          if (sleep->surf_sleep)
-                            sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
+                          if (sleep->surf_action_)
+                            sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED);
                           intrusive_ptr_release(sleep);
                         },
                         res.get());
@@ -653,9 +653,9 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro)
   simgrid::kernel::activity::SleepImplPtr sleep =
       boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
 
-  if (sleep->surf_sleep) {
-    sleep->surf_sleep->unref();
-    sleep->surf_sleep = nullptr;
+  if (sleep->surf_action_) {
+    sleep->surf_action_->unref();
+    sleep->surf_action_ = nullptr;
   }
 }
 

diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp
index 7fa94bf..11c4716 100644 (file)
--- a/src/simix/smx_synchro.cpp
+++ b/src/simix/smx_synchro.cpp
@@ -20,8 +20,8 @@ smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
 
   simgrid::kernel::activity::RawImplPtr sync =
       simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl());
-  sync->sleep                          = smx_host->pimpl_cpu->sleep(timeout);
-  sync->sleep->set_data(sync.get());
+  sync->surf_action_ = smx_host->pimpl_cpu->sleep(timeout);
+  sync->surf_action_->set_data(sync.get());
   XBT_OUT();
   return sync;
 }