Make ActorImpl::context_ a std::unique_ptr.

[simgrid.git] / src / kernel / context / ContextThread.cpp

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 7914f29..3e2b066 100644 (file)
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -158,7 +158,7 @@ void ThreadContext::suspend()
 void ThreadContext::attach_start()
 {
   // We're breaking the layers here by depending on the upper layer:
 void ThreadContext::attach_start()
 {
   // We're breaking the layers here by depending on the upper layer:

-  ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
+  ThreadContext* maestro = static_cast<ThreadContext*>(simix_global->maestro_process->context_.get());

   maestro->begin_.release();
   xbt_assert(not this->is_maestro());
   this->start();
   maestro->begin_.release();
   xbt_assert(not this->is_maestro());
   this->start();


@@ -169,7 +169,7 @@ void ThreadContext::attach_stop()
   xbt_assert(not this->is_maestro());
   this->yield();
 
   xbt_assert(not this->is_maestro());
   this->yield();
 

-  ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
+  ThreadContext* maestro = static_cast<ThreadContext*>(simix_global->maestro_process->context_.get());

   maestro->end_.acquire();
 
   Context::set_current(nullptr);
   maestro->end_.acquire();
 
   Context::set_current(nullptr);


@@ -181,7 +181,7 @@ void SerialThreadContext::run_all()
 {
   for (smx_actor_t const& actor : simix_global->actors_to_run) {
     XBT_DEBUG("Handling %p", actor);
 {
   for (smx_actor_t const& actor : simix_global->actors_to_run) {
     XBT_DEBUG("Handling %p", actor);

-    ThreadContext* context = static_cast<ThreadContext*>(actor->context_);
+    ThreadContext* context = static_cast<ThreadContext*>(actor->context_.get());

     context->release();
     context->wait();
   }
     context->release();
     context->wait();
   }


@@ -205,9 +205,9 @@ void ParallelThreadContext::finalize()
 void ParallelThreadContext::run_all()
 {
   for (smx_actor_t const& actor : simix_global->actors_to_run)
 void ParallelThreadContext::run_all()
 {
   for (smx_actor_t const& actor : simix_global->actors_to_run)

-    static_cast<ThreadContext*>(actor->context_)->release();
+    static_cast<ThreadContext*>(actor->context_.get())->release();

   for (smx_actor_t const& actor : simix_global->actors_to_run)
   for (smx_actor_t const& actor : simix_global->actors_to_run)

-    static_cast<ThreadContext*>(actor->context_)->wait();
+    static_cast<ThreadContext*>(actor->context_.get())->wait();

 }
 
 void ParallelThreadContext::start_hook()
 }
 
 void ParallelThreadContext::start_hook()