use CRTP to factor refcounting across activity types

[simgrid.git] / src / s4u / s4u_Comm.cpp

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index 188fda5..98965dc 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -106,6 +106,13 @@ CommPtr Comm::set_dst_data(void** buff, size_t size)
   return this;
 }
 
   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)",
 Comm* Comm::start()
 {
   xbt_assert(get_state() == State::INITED, "You cannot use %s() once your communication started (not implemented)",


@@ -193,7 +200,7 @@ Comm* Comm::detach()
 
 Comm* Comm::cancel()
 {
 
 Comm* Comm::cancel()
 {

-  simix::simcall([this] {
+  kernel::actor::simcall([this] {

     if (pimpl_)
       boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->cancel();
   });
     if (pimpl_)
       boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->cancel();
   });


@@ -223,21 +230,10 @@ Mailbox* Comm::get_mailbox()
   return 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
 } // namespace s4u
 } // namespace simgrid