X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592..7c7b545ea545e6b24c560f3b27b22b664ca6056c:/src/s4u/s4u_Comm.cpp

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index 188fda5788..b9a88112df 100644
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2020. 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. */
@@ -20,17 +20,18 @@ xbt::signal<void(Actor const&)> Comm::on_completion;
 
 Comm::~Comm()
 {
-  if (state_ == State::STARTED && not detached_ && (pimpl_ == nullptr || pimpl_->state_ == SIMIX_RUNNING)) {
+  if (state_ == State::STARTED && not detached_ &&
+      (pimpl_ == nullptr || pimpl_->state_ == kernel::activity::State::RUNNING)) {
     XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, (int)state_);
     if (pimpl_ != nullptr)
-      XBT_INFO("pimpl_->state: %d", pimpl_->state_);
+      XBT_INFO("pimpl_->state: %d", static_cast<int>(pimpl_->state_));
     else
       XBT_INFO("pimpl_ is null");
     xbt_backtrace_display_current();
   }
 }
 
-int Comm::wait_any_for(std::vector<CommPtr>* comms, double timeout)
+int Comm::wait_any_for(const std::vector<CommPtr>* comms, double timeout)
 {
   std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
   std::transform(begin(*comms), end(*comms), rcomms.get(),
@@ -38,7 +39,7 @@ int Comm::wait_any_for(std::vector<CommPtr>* comms, double timeout)
   return simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
 }
 
-void Comm::wait_all(std::vector<CommPtr>* comms)
+void Comm::wait_all(const std::vector<CommPtr>* comms)
 {
   // TODO: this should be a simcall or something
   // TODO: we are missing a version with timeout
@@ -106,6 +107,13 @@ CommPtr Comm::set_dst_data(void** buff, size_t size)
   return this;
 }
 
+CommPtr Comm::set_tracing_category(const std::string& category)
+{
+  xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start");
+  tracing_category_ = category;
+  return this;
+}
+
 Comm* Comm::start()
 {
   xbt_assert(get_state() == State::INITED, "You cannot use %s() once your communication started (not implemented)",
@@ -174,7 +182,7 @@ Comm* Comm::wait_for(double timeout)
   }
   return this;
 }
-int Comm::test_any(std::vector<CommPtr>* comms)
+int Comm::test_any(const std::vector<CommPtr>* comms)
 {
   std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
   std::transform(begin(*comms), end(*comms), rcomms.get(),
@@ -193,7 +201,7 @@ Comm* Comm::detach()
 
 Comm* Comm::cancel()
 {
-  simix::simcall([this] {
+  kernel::actor::simcall([this] {
     if (pimpl_)
       boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->cancel();
   });
@@ -223,21 +231,10 @@ Mailbox* Comm::get_mailbox()
   return mailbox_;
 }
 
-ActorPtr Comm::get_sender()
+Actor* Comm::get_sender()
 {
-  return sender_ ? sender_->iface() : nullptr;
+  return sender_ ? sender_->ciface() : nullptr;
 }
 
-void intrusive_ptr_release(simgrid::s4u::Comm* c)
-{
-  if (c->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
-    std::atomic_thread_fence(std::memory_order_acquire);
-    delete c;
-  }
-}
-void intrusive_ptr_add_ref(simgrid::s4u::Comm* c)
-{
-  c->refcount_.fetch_add(1, std::memory_order_relaxed);
-}
 } // namespace s4u
 } // namespace simgrid