X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 266b0cd586..25783eb9ad 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -3,8 +3,14 @@ /* 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 + +#include + #include "src/surf/surf_interface.hpp" #include "src/simix/smx_private.h" #include "xbt/log.h" @@ -41,14 +47,8 @@ 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; - + 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); } @@ -59,11 +59,7 @@ 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); + delete mbox; } smx_mailbox_t SIMIX_mbox_get_by_name(const char *name) @@ -78,9 +74,7 @@ smx_mailbox_t SIMIX_mbox_get_by_name(const char *name) */ 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(); + mbox->permanent_receiver = process; } /** @@ -91,8 +85,7 @@ void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process) 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); + mbox->comm_queue.push_back(comm); comm->mbox = mbox; } @@ -106,9 +99,9 @@ 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++) + for (auto it = mbox->comm_queue.begin(); it != mbox->comm_queue.end(); it++) if (*it == comm) { - mbox->comm_queue->erase(it); + mbox->comm_queue. erase(it); return; } xbt_die("Cannot remove this comm that is not part of the mailbox"); @@ -187,7 +180,7 @@ XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_ * * 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); + _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); @@ -198,9 +191,9 @@ XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_ 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); + 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)); @@ -271,16 +264,16 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void void (*copy_data_fun)(smx_synchro_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); + XBT_DEBUG("recv from %p %p", mbox, &mbox->comm_queue); simgrid::simix::Comm* this_synchro = new simgrid::simix::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()) { + 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); + 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"); @@ -305,10 +298,10 @@ 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); } else { @@ -353,7 +346,7 @@ smx_synchro_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t m 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) { - XBT_DEBUG("iprobe from %p %p", mbox, mbox->comm_queue); + XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); simgrid::simix::Comm* this_comm; int smx_type; if(type == 1){ @@ -364,14 +357,15 @@ smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int smx_type = SIMIX_COMM_SEND; } smx_synchro_t other_synchro=nullptr; - if(mbox->permanent_receiver && ! mbox->done_comm_queue->empty()){ + 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) @@ -451,10 +445,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::simix::Synchro* 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 +457,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::simix::Synchro* synchro = comms[idx]; simcall_comm_testany__set__result(simcall, idx); synchro->simcalls.push_back(simcall); synchro->state = SIMIX_DONE; @@ -471,9 +466,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::simix::Synchro* 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,12 +478,14 @@ 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; unsigned int cursor = 0; if (MC_is_active() || MC_record_replay_is_active()){ + if (timeout != -1) + 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->simcalls.push_back(simcall); @@ -496,7 +494,17 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros) SIMIX_comm_finish(synchro); return; } - + + if (timeout == -1 ){ + simcall->timer = NULL; + } else { + simcall->timer = SIMIX_timer_set(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); @@ -588,6 +596,10 @@ 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)); } @@ -675,7 +687,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); }