Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simix / ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 07e515a..9319634 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -80,11 +80,11 @@ void SIMIX_process_cleanup(smx_actor_t process)
 
     if (comm->src_proc == process) {
       XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
-                comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc);
+                comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc);
       comm->src_proc = nullptr;
 
     } else if (comm->dst_proc == process) {
-      XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state,
+      XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
                 comm->src_proc, comm->dst_proc);
       comm->dst_proc = nullptr;
 
@@ -475,18 +475,18 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
         boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro);
 
     if (exec != nullptr) {
-      if (exec->surfAction_) {
-        exec->surfAction_->cancel();
-        exec->surfAction_->unref();
-        exec->surfAction_ = nullptr;
+      if (exec->surf_action_) {
+        exec->surf_action_->cancel();
+        exec->surf_action_->unref();
+        exec->surf_action_ = nullptr;
       }
     } else if (comm != nullptr) {
       process->comms.remove(process->waiting_synchro);
       comm->cancel();
       // Remove first occurrence of &process->simcall:
-      auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall);
-      if (i != process->waiting_synchro->simcalls.end())
-        process->waiting_synchro->simcalls.remove(&process->simcall);
+      auto i = boost::range::find(process->waiting_synchro->simcalls_, &process->simcall);
+      if (i != process->waiting_synchro->simcalls_.end())
+        process->waiting_synchro->simcalls_.remove(&process->simcall);
     } else if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(process->waiting_synchro);
 
@@ -527,8 +527,8 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const
 
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
-    if (exec != nullptr && exec->surfAction_)
-      exec->surfAction_->cancel();
+    if (exec != nullptr && exec->surf_action_)
+      exec->surf_action_->cancel();
 
     simgrid::kernel::activity::CommImplPtr comm =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
@@ -591,7 +591,7 @@ void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)
   if (process != simcall->issuer) {
     SIMIX_simcall_answer(simcall);
   } else {
-    sync_suspend->simcalls.push_back(simcall);
+    sync_suspend->simcalls_.push_back(simcall);
     process->waiting_synchro = sync_suspend;
     process->waiting_synchro->suspend();
   }
@@ -643,7 +643,7 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do
     return;
   }
   smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
-  sync->simcalls.push_back(simcall);
+  sync->simcalls_.push_back(simcall);
   simcall->issuer->waiting_synchro = sync;
 }
 
@@ -655,7 +655,7 @@ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl
                         [](void*, void* arg) {
                           auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
                           if (sleep->surf_sleep)
-                            sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::done);
+                            sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
                           intrusive_ptr_release(sleep);
                           return 0;
                         },
@@ -672,7 +672,7 @@ void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
     return;
   }
   smx_activity_t sync = simcall->issuer->sleep(duration);
-  sync->simcalls.push_back(simcall);
+  sync->simcalls_.push_back(simcall);
   simcall->issuer->waiting_synchro = sync;
 }
 
@@ -814,7 +814,7 @@ smx_actor_t simcall_process_create(const char* name, std::function<void()> code,
   if (name == nullptr)
     name = "";
   smx_actor_t self = SIMIX_process_self();
-  return simgrid::simix::kernelImmediate([name, code, data, host, properties, self] {
+  return simgrid::simix::simcall([name, code, data, host, properties, self] {
     return SIMIX_process_create(name, std::move(code), data, host, properties, self);
   });
 }