X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..64916baf9d485ba6a2546bf79c948c591a233465:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 266b0cd586..89c5a5c85c 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -1,132 +1,49 @@ -/* 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. */ +#include + #include -#include "src/surf/surf_interface.hpp" -#include "src/simix/smx_private.h" -#include "xbt/log.h" +#include + +#include + #include "mc/mc.h" +#include "simgrid/s4u/Mailbox.hpp" #include "src/mc/mc_replay.h" +#include "src/simix/smx_private.h" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/surf_interface.hpp" #include "xbt/dict.h" -#include "simgrid/s4u/mailbox.hpp" +#include "xbt/log.h" -#include "src/simix/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/surf/network_interface.hpp" 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_synchro_t comm); -static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_synchro_t comm); -static smx_synchro_t _find_matching_comm(std::deque *deque, e_smx_comm_type_t type, - int (*match_fun)(void *, void *,smx_synchro_t), void *user_data, smx_synchro_t my_synchro, bool remove_matching); -static void SIMIX_comm_start(smx_synchro_t synchro); - -void SIMIX_mailbox_exit(void) -{ - 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 = (smx_mailbox_t) xbt_dict_get_or_null(mailboxes, name); - - if (!mbox) { - mbox = xbt_new0(s_smx_mailbox_t, 1); - mbox->name = xbt_strdup(name); - mbox->comm_queue = new std::deque(); - mbox->done_comm_queue = nullptr; // Allocated on need only - mbox->permanent_receiver=nullptr; - - 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 = (smx_mailbox_t) data; - xbt_free(mbox->name); - delete mbox->comm_queue; - delete mbox->done_comm_queue; - - xbt_free(mbox); -} - -smx_mailbox_t SIMIX_mbox_get_by_name(const char *name) -{ - return (smx_mailbox_t) 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_process_t process) -{ - mbox->permanent_receiver=process; - if (mbox->done_comm_queue == nullptr) - mbox->done_comm_queue = new std::deque(); -} - -/** - * \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_synchro_t synchro) -{ - simgrid::simix::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_synchro_t synchro) -{ - simgrid::simix::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 this comm that is not part of the mailbox"); -} +static void SIMIX_comm_copy_data(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); /** * \brief Checks if there is a communication synchro queued in a deque matching our needs * \param type The type of communication we are looking for (comm_send, comm_recv) * \return The communication synchro if found, nullptr otherwise */ -static smx_synchro_t _find_matching_comm(std::deque *deque, e_smx_comm_type_t type, - int (*match_fun)(void *, void *,smx_synchro_t), void *this_user_data, smx_synchro_t my_synchro, bool remove_matching) +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 *this_user_data, smx_activity_t my_synchro, bool remove_matching) { void* other_user_data = nullptr; for(auto it = deque->begin(); it != deque->end(); it++){ - smx_synchro_t synchro = *it; - simgrid::simix::Comm *comm = static_cast(synchro); + smx_activity_t synchro = *it; + simgrid::kernel::activity::Comm *comm = static_cast(synchro); if (comm->type == SIMIX_COMM_SEND) { other_user_data = comm->src_data; @@ -157,55 +74,54 @@ static smx_synchro_t _find_matching_comm(std::deque *deque, e_smx /******************************************************************************/ /* Communication synchros */ /******************************************************************************/ -XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_mailbox_t mbox, +XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *,smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), + int (*match_fun)(void *, void *,smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout){ - smx_synchro_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, + smx_activity_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); SIMCALL_SET_MC_VALUE(simcall, 0); simcall_HANDLER_comm_wait(simcall, comm, timeout); } -XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_mailbox_t mbox, +XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *,smx_synchro_t), + int (*match_fun)(void *, void *,smx_activity_t), void (*clean_fun)(void *), // used to free the synchro in case of problem after a detached send - void (*copy_data_fun)(smx_synchro_t, void*, size_t),// used to copy data if not default one + void (*copy_data_fun)(smx_activity_t, void*, size_t),// used to copy data if not default one void *data, int detached) { XBT_DEBUG("send from %p", mbox); /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ - simgrid::simix::Comm* this_synchro = new simgrid::simix::Comm(SIMIX_COMM_SEND); + simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_SEND); /* Look for communication synchro matching our needs. We also provide a description of * ourself so that the other side also gets a chance of choosing if it wants to match with us. * * If it is not found then push our communication into the rendez-vous point */ - smx_synchro_t other_synchro = - _find_matching_comm(mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_synchro, /*remove_matching*/true); - simgrid::simix::Comm *other_comm = static_cast(other_synchro); + smx_activity_t other_synchro = + _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_synchro, /*remove_matching*/true); + simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); if (!other_synchro) { other_synchro = this_synchro; - other_comm = static_cast(other_synchro); + other_comm = static_cast(other_synchro); if (mbox->permanent_receiver!=nullptr){ //this mailbox is for small messages, which have to be sent right now other_synchro->state = SIMIX_READY; - other_comm->dst_proc=mbox->permanent_receiver; + other_comm->dst_proc=mbox->permanent_receiver.get(); other_comm->ref(); - mbox->done_comm_queue->push_back(other_synchro); - other_comm->mbox=mbox; - XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_comm)); + mbox->done_comm_queue.push_back(other_synchro); + XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, &(other_comm)); }else{ - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_synchro); } } else { XBT_DEBUG("Receive already pushed"); @@ -215,7 +131,7 @@ XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_ other_comm->type = SIMIX_COMM_READY; } - xbt_fifo_push(src_proc->comms, other_synchro); + src_proc->comms.push_back(other_synchro); if (detached) { @@ -246,57 +162,57 @@ XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_ return (detached ? nullptr : other_comm); } -XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, +XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout, double rate) { - smx_synchro_t comm = SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); + smx_activity_t comm = SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); SIMCALL_SET_MC_VALUE(simcall, 0); simcall_HANDLER_comm_wait(simcall, comm, timeout); } -XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, +XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double rate) { return SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); } -smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), // used to copy data if not default one +smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), // used to copy data if not default one void *data, double rate) { - XBT_DEBUG("recv from %p %p", mbox, mbox->comm_queue); - simgrid::simix::Comm* this_synchro = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); + XBT_DEBUG("recv from %p %p", mbox, &mbox->comm_queue); + simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE); - smx_synchro_t other_synchro; - //communication already done, get it inside the fifo of completed comms - if (mbox->permanent_receiver && ! mbox->done_comm_queue->empty()) { + smx_activity_t other_synchro; + //communication already done, get it inside the list of completed comms + if (mbox->permanent_receiver != nullptr && ! mbox->done_comm_queue.empty()) { XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication"); - //find a match in the already received fifo - other_synchro = _find_matching_comm(mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); + //find a match in the list of already received comms + other_synchro = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); //if not found, assume the receiver came first, register it to the mailbox in the classical way 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"); + XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into list"); other_synchro = this_synchro; - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_synchro); } else { - simgrid::simix::Comm *other_comm = static_cast(other_synchro); + simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); - if(other_comm->surf_comm && other_comm->remains()==0.0) { + if(other_comm->surf_comm && other_comm->remains() < 1e-12) { XBT_DEBUG("comm %p has been already sent, and is finished, destroy it",other_comm); other_comm->state = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; } other_comm->unref(); - static_cast(this_synchro)->unref(); + static_cast(this_synchro)->unref(); } } else { /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ @@ -305,30 +221,30 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void * ourself so that the other side also gets a chance of choosing if it wants to match with us. * * If it is not found then push our communication into the rendez-vous point */ - other_synchro = _find_matching_comm(mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); + other_synchro = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); if (!other_synchro) { - XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue->size()); + 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::simix::Comm *other_comm = static_cast(other_synchro); + simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; } - xbt_fifo_push(dst_proc->comms, other_synchro); + dst_proc->comms.push_back(other_synchro); } /* Setup communication synchro */ - simgrid::simix::Comm *other_comm = static_cast(other_synchro); + simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); other_comm->dst_proc = dst_proc; other_comm->dst_buff = dst_buff; other_comm->dst_buff_size = dst_buff_size; other_comm->dst_data = data; - if (rate != -1.0 && (other_comm->rate == -1.0 || rate < other_comm->rate)) + if (rate > -1.0 && (other_comm->rate < 0.0 || rate < other_comm->rate)) other_comm->rate = rate; other_comm->match_fun = match_fun; @@ -343,35 +259,36 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void return other_synchro; } -smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, +smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void *, void *, smx_synchro_t), + int (*match_fun)(void *, void *, smx_activity_t), void *data){ return SIMIX_comm_iprobe(simcall->issuer, mbox, type, src, tag, match_fun, data); } -smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int type, int src, - int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data) +smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, int src, + int tag, int (*match_fun)(void *, void *, smx_activity_t), void *data) { - XBT_DEBUG("iprobe from %p %p", mbox, mbox->comm_queue); - simgrid::simix::Comm* this_comm; + XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); + simgrid::kernel::activity::Comm* this_comm; int smx_type; if(type == 1){ - this_comm = new simgrid::simix::Comm(SIMIX_COMM_SEND); + this_comm = new simgrid::kernel::activity::Comm(SIMIX_COMM_SEND); smx_type = SIMIX_COMM_RECEIVE; } else{ - this_comm = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); + this_comm = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE); smx_type = SIMIX_COMM_SEND; } - smx_synchro_t other_synchro=nullptr; - if(mbox->permanent_receiver && ! mbox->done_comm_queue->empty()){ + smx_activity_t other_synchro=nullptr; + if (mbox->permanent_receiver != nullptr && !mbox->done_comm_queue.empty()) { XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something"); - other_synchro = - _find_matching_comm(mbox->done_comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); + other_synchro = _find_matching_comm(&mbox->done_comm_queue, + (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); } if (!other_synchro){ XBT_DEBUG("check if we have more luck in the normal mailbox"); - other_synchro = _find_matching_comm(mbox->comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); + other_synchro = _find_matching_comm(&mbox->comm_queue, + (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); } if(other_synchro) @@ -381,7 +298,7 @@ smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int return other_synchro; } -void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, double timeout) +void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, double timeout) { /* Associate this simcall to the wait synchro */ XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro); @@ -396,10 +313,10 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, dou } else { /* If we reached this point, the wait simcall must have a timeout */ /* Otherwise it shouldn't be enabled and executed by the MC */ - if (timeout == -1) + if (timeout < 0.0) THROW_IMPOSSIBLE; - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); if (comm->src_proc == simcall->issuer) comm->state = SIMIX_SRC_TIMEOUT; else @@ -415,10 +332,10 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, dou if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { SIMIX_comm_finish(synchro); } else { /* if (timeout >= 0) { we need a surf sleep action even when there is no timeout, otherwise surf won't tell us when the host fails */ - surf_action_t sleep = surf_host_sleep(simcall->issuer->host, timeout); + surf_action_t sleep = simcall->issuer->host->pimpl_cpu->sleep(timeout); sleep->setData(synchro); - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); if (simcall->issuer == comm->src_proc) comm->src_timeout = sleep; else @@ -426,9 +343,9 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, dou } } -void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t synchro) +void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t synchro) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); if (MC_is_active() || MC_record_replay_is_active()){ simcall_comm_test__set__result(simcall, comm->src_proc && comm->dst_proc); @@ -451,10 +368,11 @@ void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t synchro) } } -void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) +void simcall_HANDLER_comm_testany( + smx_simcall_t simcall, simgrid::kernel::activity::ActivityImpl* comms[], size_t count) { - unsigned int cursor; - smx_synchro_t synchro; + // The default result is -1 -- this means, "nothing is ready". + // It can be changed below, but only if something matches. simcall_comm_testany__set__result(simcall, -1); if (MC_is_active() || MC_record_replay_is_active()){ @@ -462,7 +380,7 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) if(idx == -1){ SIMIX_simcall_answer(simcall); }else{ - synchro = xbt_dynar_get_as(synchros, idx, smx_synchro_t); + simgrid::kernel::activity::ActivityImpl* synchro = comms[idx]; simcall_comm_testany__set__result(simcall, idx); synchro->simcalls.push_back(simcall); synchro->state = SIMIX_DONE; @@ -471,9 +389,10 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) return; } - xbt_dynar_foreach(simcall_comm_testany__get__comms(simcall), cursor,synchro) { + for (std::size_t i = 0; i != count; ++i) { + simgrid::kernel::activity::ActivityImpl* synchro = comms[i]; if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { - simcall_comm_testany__set__result(simcall, cursor); + simcall_comm_testany__set__result(simcall, i); synchro->simcalls.push_back(simcall); SIMIX_comm_finish(synchro); return; @@ -482,21 +401,33 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) SIMIX_simcall_answer(simcall); } -void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros) +void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, double timeout) { - smx_synchro_t synchro; + smx_activity_t synchro; unsigned int cursor = 0; if (MC_is_active() || MC_record_replay_is_active()){ + if (timeout > 0.0) + xbt_die("Timeout not implemented for waitany in the model-checker"); int idx = SIMCALL_GET_MC_VALUE(simcall); - synchro = xbt_dynar_get_as(synchros, idx, smx_synchro_t); + synchro = xbt_dynar_get_as(synchros, idx, smx_activity_t); synchro->simcalls.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); synchro->state = SIMIX_DONE; SIMIX_comm_finish(synchro); return; } - + + if (timeout < 0.0){ + simcall->timer = NULL; + } else { + simcall->timer = SIMIX_timer_set(SIMIX_get_clock() + timeout, [simcall]() { + SIMIX_waitany_remove_simcall_from_actions(simcall); + simcall_comm_waitany__set__result(simcall, -1); + SIMIX_simcall_answer(simcall); + }); + } + xbt_dynar_foreach(synchros, cursor, synchro){ /* associate this simcall to the the synchro */ synchro->simcalls.push_back(simcall); @@ -511,7 +442,7 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros) void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) { - smx_synchro_t synchro; + smx_activity_t synchro; unsigned int cursor = 0; xbt_dynar_t synchros = simcall_comm_waitany__get__comms(simcall); @@ -527,26 +458,26 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) * \brief Starts the simulation of a communication synchro. * \param synchro the communication synchro */ -static inline void SIMIX_comm_start(smx_synchro_t synchro) +static inline void SIMIX_comm_start(smx_activity_t synchro) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); /* If both the sender and the receiver are already there, start the communication */ if (synchro->state == SIMIX_READY) { - sg_host_t sender = comm->src_proc->host; - sg_host_t receiver = comm->dst_proc->host; + simgrid::s4u::Host* sender = comm->src_proc->host; + simgrid::s4u::Host* receiver = comm->dst_proc->host; - XBT_DEBUG("Starting communication %p from '%s' to '%s'", synchro, sg_host_get_name(sender), sg_host_get_name(receiver)); + XBT_DEBUG("Starting communication %p from '%s' to '%s'", synchro, sender->cname(), receiver->cname()); - comm->surf_comm = surf_network_model_communicate(surf_network_model, sender, receiver, comm->task_size, comm->rate); + comm->surf_comm = surf_network_model->communicate(sender, receiver, comm->task_size, comm->rate); comm->surf_comm->setData(synchro); comm->state = SIMIX_RUNNING; /* If a link is failed, detect it immediately */ if (comm->surf_comm->getState() == simgrid::surf::Action::State::failed) { - XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", - sg_host_get_name(sender), sg_host_get_name(receiver)); + XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->cname(), + receiver->cname()); comm->state = SIMIX_LINK_FAILURE; comm->cleanupSurf(); } @@ -555,11 +486,13 @@ static inline void SIMIX_comm_start(smx_synchro_t synchro) it will be restarted when the sender process resume */ if (SIMIX_process_is_suspended(comm->src_proc) || SIMIX_process_is_suspended(comm->dst_proc)) { if (SIMIX_process_is_suspended(comm->src_proc)) - XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the communication", - comm->src_proc->name.c_str(), sg_host_get_name(comm->src_proc->host)); + XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the " + "communication", + comm->src_proc->cname(), comm->src_proc->host->cname()); else - XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the communication", - comm->dst_proc->name.c_str(), sg_host_get_name(comm->dst_proc->host)); + XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the " + "communication", + comm->dst_proc->cname(), comm->dst_proc->host->cname()); comm->surf_comm->suspend(); } @@ -570,9 +503,9 @@ static inline void SIMIX_comm_start(smx_synchro_t synchro) * \brief Answers the SIMIX simcalls associated to a communication synchro. * \param synchro a finished communication synchro */ -void SIMIX_comm_finish(smx_synchro_t synchro) +void SIMIX_comm_finish(smx_activity_t synchro) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); unsigned int destroy_count = 0; while (!synchro->simcalls.empty()) { @@ -588,13 +521,17 @@ void SIMIX_comm_finish(smx_synchro_t synchro) continue; // if process handling comm is killed if (simcall->call == SIMCALL_COMM_WAITANY) { SIMIX_waitany_remove_simcall_from_actions(simcall); + if (simcall->timer) { + SIMIX_timer_remove(simcall->timer); + simcall->timer = nullptr; + } if (!MC_is_active() && !MC_record_replay_is_active()) simcall_comm_waitany__set__result(simcall, xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &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); @@ -637,11 +574,11 @@ void SIMIX_comm_finish(smx_synchro_t synchro) case SIMIX_LINK_FAILURE: - XBT_DEBUG("Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) detached:%d", - synchro, - comm->src_proc ? sg_host_get_name(comm->src_proc->host) : nullptr, - comm->dst_proc ? sg_host_get_name(comm->dst_proc->host) : nullptr, - simcall->issuer->name.c_str(), simcall->issuer, comm->detached); + XBT_DEBUG( + "Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) detached:%d", + synchro, comm->src_proc ? comm->src_proc->host->cname() : nullptr, + comm->dst_proc ? comm->dst_proc->host->cname() : nullptr, simcall->issuer->cname(), simcall->issuer, + comm->detached); if (comm->src_proc == simcall->issuer) { XBT_DEBUG("I'm source"); } else if (comm->dst_proc == simcall->issuer) { @@ -675,7 +612,14 @@ void SIMIX_comm_finish(smx_synchro_t synchro) e.value = xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro); } else if (simcall->call == SIMCALL_COMM_TESTANY) { - e.value = xbt_dynar_search(simcall_comm_testany__get__comms(simcall), &synchro); + e.value = -1; + auto comms = simcall_comm_testany__get__comms(simcall); + auto count = simcall_comm_testany__get__count(simcall); + auto element = std::find(comms, comms + count, synchro); + if (element == comms + count) + e.value = -1; + else + e.value = element - comms; } simcall->issuer->exception = std::make_exception_ptr(e); } @@ -689,48 +633,53 @@ void SIMIX_comm_finish(smx_synchro_t synchro) } simcall->issuer->waiting_synchro = nullptr; - xbt_fifo_remove(simcall->issuer->comms, synchro); + simcall->issuer->comms.remove(synchro); if(comm->detached){ if(simcall->issuer == comm->src_proc){ if(comm->dst_proc) - xbt_fifo_remove(comm->dst_proc->comms, synchro); + comm->dst_proc->comms.remove(synchro); } - if(simcall->issuer == comm->dst_proc){ + else if(simcall->issuer == comm->dst_proc){ if(comm->src_proc) - xbt_fifo_remove(comm->src_proc->comms, synchro); + comm->src_proc->comms.remove(synchro); //in case of a detached comm we have an extra ref to remove, as the sender won't do it destroy_count++; } + else{ + comm->dst_proc->comms.remove(synchro); + comm->src_proc->comms.remove(synchro); + } } + SIMIX_simcall_answer(simcall); destroy_count++; } while (destroy_count-- > 0) - static_cast(synchro)->unref(); + static_cast(synchro)->unref(); } /******************************************************************************/ /* SIMIX_comm_copy_data callbacks */ /******************************************************************************/ -static void (*SIMIX_comm_copy_data_callback) (smx_synchro_t, void*, size_t) = &SIMIX_comm_copy_pointer_callback; +static void (*SIMIX_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &SIMIX_comm_copy_pointer_callback; -void SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro_t, void*, size_t)) +void SIMIX_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, size_t)) { SIMIX_comm_copy_data_callback = callback; } -void SIMIX_comm_copy_pointer_callback(smx_synchro_t synchro, void* buff, size_t buff_size) +void SIMIX_comm_copy_pointer_callback(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); xbt_assert((buff_size == sizeof(void *)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); *(void **) (comm->dst_buff) = buff; } -void SIMIX_comm_copy_buffer_callback(smx_synchro_t synchro, void* buff, size_t buff_size) +void SIMIX_comm_copy_buffer_callback(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); XBT_DEBUG("Copy the data over"); memcpy(comm->dst_buff, buff, buff_size); @@ -742,24 +691,21 @@ void SIMIX_comm_copy_buffer_callback(smx_synchro_t synchro, void* buff, size_t b /** - * \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_synchro_t synchro) +void SIMIX_comm_copy_data(smx_activity_t synchro) { - simgrid::simix::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::Comm *comm = static_cast(synchro); size_t buff_size = comm->src_buff_size; /* If there is no data to copy then return */ if (!comm->src_buff || !comm->dst_buff || comm->copied) return; - XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", - comm, - comm->src_proc ? sg_host_get_name(comm->src_proc->host) : "a finished process", - comm->src_buff, - comm->dst_proc ? sg_host_get_name(comm->dst_proc->host) : "a finished process", - comm->dst_buff, buff_size); + XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", comm, + comm->src_proc ? comm->src_proc->host->cname() : "a finished process", comm->src_buff, + comm->dst_proc ? comm->dst_proc->host->cname() : "a finished process", comm->dst_buff, buff_size); /* Copy at most dst_buff_size bytes of the message to receiver's buffer */ if (comm->dst_buff_size)