X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cbd8dae6d524fc62b0fb5fcf7b2604e98f953615..d15605f0ec704a59399fb71e6c145c72c4a9f1b0:/src/smpi/internals/smpi_actor.cpp

diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp
index 1e43e29712..e0aef7d1e5 100644
--- a/src/smpi/internals/smpi_actor.cpp
+++ b/src/smpi/internals/smpi_actor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -25,9 +25,9 @@ using simgrid::s4u::ActorPtr;
 ActorExt::ActorExt(ActorPtr actor, simgrid::s4u::Barrier* finalization_barrier)
     : finalization_barrier_(finalization_barrier), actor_(actor)
 {
-  mailbox_         = simgrid::s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
-  mailbox_small_   = simgrid::s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
-  mailboxes_mutex_ = xbt_mutex_init();
+  mailbox_         = s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
+  mailbox_small_   = s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
+  mailboxes_mutex_ = s4u::Mutex::create();
   timer_           = xbt_os_timer_new();
   state_           = SmpiProcessState::UNINITIALIZED;
   if (MC_is_active())
@@ -58,7 +58,6 @@ ActorExt::~ActorExt()
   if (comm_intra_ != MPI_COMM_NULL)
     simgrid::smpi::Comm::destroy(comm_intra_);
   xbt_os_timer_free(timer_);
-  xbt_mutex_destroy(mailboxes_mutex_);
 }
 
 void ActorExt::set_data(const char* instance_id)
@@ -155,17 +154,7 @@ MPI_Comm ActorExt::comm_world()
   return comm_world_ == nullptr ? MPI_COMM_NULL : *comm_world_;
 }
 
-smx_mailbox_t ActorExt::mailbox()
-{
-  return mailbox_->get_impl();
-}
-
-smx_mailbox_t ActorExt::mailbox_small()
-{
-  return mailbox_small_->get_impl();
-}
-
-xbt_mutex_t ActorExt::mailboxes_mutex()
+s4u::MutexPtr ActorExt::mailboxes_mutex()
 {
   return mailboxes_mutex_;
 }
@@ -235,7 +224,6 @@ void ActorExt::init()
   }
 
   simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
-  proc->get_impl()->context_->set_cleanup(&SIMIX_process_cleanup);
   // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved
   // this up here so that I can set the privatized region before the switch.
   ActorExt* process = smpi_process_remote(proc);