X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a769d0bfd8cf7d4e8f9ae4dfbcf69d8a851508da..149c63f36e15b8500b1e826bda5138318ff7ba2b:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 16b1284b19..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. */ @@ -14,23 +14,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous commun namespace simgrid { namespace s4u { -xbt::signal Comm::on_sender_start; -xbt::signal Comm::on_receiver_start; -xbt::signal Comm::on_completion; +xbt::signal Comm::on_sender_start; +xbt::signal Comm::on_receiver_start; +xbt::signal 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(pimpl_->state_)); else XBT_INFO("pimpl_ is null"); xbt_backtrace_display_current(); } } -int Comm::wait_any_for(std::vector* comms, double timeout) +int Comm::wait_any_for(const std::vector* comms, double timeout) { std::unique_ptr 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* comms, double timeout) return simcall_comm_waitany(rcomms.get(), comms->size(), timeout); } -void Comm::wait_all(std::vector* comms) +void Comm::wait_all(const std::vector* comms) { // TODO: this should be a simcall or something // TODO: we are missing a version with timeout @@ -106,20 +107,27 @@ 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(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", + xbt_assert(get_state() == State::INITED, "You cannot use %s() once your communication started (not implemented)", __FUNCTION__); if (src_buff_ != nullptr) { // Sender side - on_sender_start(Actor::self()); + on_sender_start(*Actor::self()); pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, - clean_fun_, copy_data_function_, user_data_, detached_); + clean_fun_, copy_data_function_, get_user_data(), detached_); } else if (dst_buff_ != nullptr) { // Receiver side xbt_assert(not detached_, "Receive cannot be detached"); - on_receiver_start(Actor::self()); + on_receiver_start(*Actor::self()); pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, - copy_data_function_, user_data_, rate_); + copy_data_function_, get_user_data(), rate_); } else { xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver"); @@ -136,7 +144,7 @@ Comm* Comm::wait() /** @brief Block the calling actor until the communication is finished, or until timeout * - * On timeout, an exception is thrown. + * On timeout, an exception is thrown and the communication is invalidated. * * @param timeout the amount of seconds to wait for the comm termination. * Negative values denote infinite wait times. 0 as a timeout returns immediately. */ @@ -148,21 +156,21 @@ Comm* Comm::wait_for(double timeout) case State::INITED: // It's not started yet. Do it in one simcall if (src_buff_ != nullptr) { - on_sender_start(Actor::self()); + on_sender_start(*Actor::self()); simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_, - copy_data_function_, user_data_, timeout); + copy_data_function_, get_user_data(), timeout); } else { // Receiver - on_receiver_start(Actor::self()); + on_receiver_start(*Actor::self()); simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_, - user_data_, timeout, rate_); + get_user_data(), timeout, rate_); } state_ = State::FINISHED; break; case State::STARTED: simcall_comm_wait(pimpl_, timeout); - on_completion(Actor::self()); + on_completion(*Actor::self()); state_ = State::FINISHED; break; @@ -174,7 +182,7 @@ Comm* Comm::wait_for(double timeout) } return this; } -int Comm::test_any(std::vector* comms) +int Comm::test_any(const std::vector* comms) { std::unique_ptr 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(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