X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90d012e147a92dd7c78f0d0e8d1614b6559eb450..3913458ae82f2f5e35f19faa879420b09f4bfa49:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 409a20d19a..63171c5247 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2017. 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,89 +25,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); -static void SIMIX_mbox_free(void *data); -static xbt_dict_t mailboxes = xbt_dict_new_homogeneous(SIMIX_mbox_free); - static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall); static void SIMIX_comm_copy_data(smx_activity_t comm); -static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_activity_t comm); +static void SIMIX_comm_start(smx_activity_t synchro); static smx_activity_t _find_matching_comm(boost::circular_buffer_space_optimized *deque, e_smx_comm_type_t type, int (*match_fun)(void *, void *,smx_activity_t), void *user_data, smx_activity_t my_synchro, bool remove_matching); -static void SIMIX_comm_start(smx_activity_t synchro); - -void SIMIX_mailbox_exit() -{ - xbt_dict_free(&mailboxes); -} - -/******************************************************************************/ -/* Rendez-Vous Points */ -/******************************************************************************/ - -smx_mailbox_t SIMIX_mbox_create(const char *name) -{ - xbt_assert(name, "Mailboxes must have a name"); - /* two processes may have pushed the same mbox_create simcall at the same time */ - smx_mailbox_t mbox = static_cast(xbt_dict_get_or_null(mailboxes, name)); - if (!mbox) { - mbox = new simgrid::simix::Mailbox(name); - XBT_DEBUG("Creating a mailbox at %p with name %s", mbox, name); - xbt_dict_set(mailboxes, mbox->name, mbox, nullptr); - } - return mbox; -} - -void SIMIX_mbox_free(void *data) -{ - XBT_DEBUG("mbox free %p", data); - smx_mailbox_t mbox = static_cast(data); - delete mbox; -} - -smx_mailbox_t SIMIX_mbox_get_by_name(const char *name) -{ - return static_cast(xbt_dict_get_or_null(mailboxes, name)); -} - -/** - * \brief set the receiver of the rendez vous point to allow eager sends - * \param mbox The rendez-vous point - * \param process The receiving process - */ -void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process) -{ - mbox->permanent_receiver = process; -} - -/** - * \brief Pushes a communication synchro into a rendez-vous point - * \param mbox The mailbox - * \param synchro The communication synchro - */ -static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_activity_t synchro) -{ - simgrid::kernel::activity::Comm *comm = static_cast(synchro); - mbox->comm_queue.push_back(comm); - comm->mbox = mbox; -} - -/** - * \brief Removes a communication synchro from a rendez-vous point - * \param mbox The rendez-vous point - * \param synchro The communication synchro - */ -void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_activity_t synchro) -{ - simgrid::kernel::activity::Comm *comm = static_cast(synchro); - - comm->mbox = nullptr; - for (auto it = mbox->comm_queue.begin(); it != mbox->comm_queue.end(); it++) - if (*it == comm) { - mbox->comm_queue. erase(it); - return; - } - xbt_die("Cannot remove the comm %p that is not part of the mailbox %s",comm, mbox->name); -} /** * \brief Checks if there is a communication synchro queued in a deque matching our needs @@ -199,7 +121,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_comm)); }else{ - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_synchro); } } else { XBT_DEBUG("Receive already pushed"); @@ -279,7 +201,7 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * if (!other_synchro) { XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo"); other_synchro = this_synchro; - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_synchro); } else { simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); @@ -304,7 +226,7 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * if (!other_synchro) { XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue.size()); other_synchro = this_synchro; - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_synchro); } else { this_synchro->unref(); simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); @@ -609,7 +531,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) /* If the synchro is still in a rendez-vous point then remove from it */ if (comm->mbox) - SIMIX_mbox_remove(comm->mbox, synchro); + comm->mbox->remove(synchro); XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state); @@ -764,8 +686,8 @@ void SIMIX_comm_copy_buffer_callback(smx_activity_t synchro, void* buff, size_t /** - * \brief Copy the communication data from the sender's buffer to the receiver's one - * \param comm The communication + * @brief Copy the communication data from the sender's buffer to the receiver's one + * @param synchro The communication */ void SIMIX_comm_copy_data(smx_activity_t synchro) {