X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399e4077a352ec6e0ad4134e5645a29d0d241c88..c7b4fbf9bd362ef98af378f5f87d437a7ffa28e8:/src/simix/smx_network.c diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 2868ad669d..a30ee03825 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -26,12 +26,13 @@ static smx_action_t SIMIX_fifo_get_comm(xbt_fifo_t fifo, e_smx_comm_type_t type, int (*match_fun)(void *, void *,smx_action_t), void *user_data, smx_action_t my_action); static void SIMIX_rdv_free(void *data); +static void SIMIX_comm_start(smx_action_t action); void SIMIX_network_init(void) { rdv_points = xbt_dict_new_homogeneous(SIMIX_rdv_free); if(MC_is_active()) - MC_ignore_data_bss(&smx_total_comms, sizeof(smx_total_comms)); + MC_ignore_global_variable("smx_total_comms"); } void SIMIX_network_exit(void) @@ -444,7 +445,7 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, if (MC_is_active()) { other_action->state = SIMIX_RUNNING; - return other_action; + return (detached ? NULL : other_action); } SIMIX_comm_start(other_action); @@ -452,20 +453,11 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, } void SIMIX_pre_comm_recv(smx_simcall_t simcall, smx_rdv_t rdv, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), - void *data, double timeout){ + void *dst_buff, size_t *dst_buff_size, + int (*match_fun)(void *, void *, smx_action_t), + void *data, double timeout, double rate) +{ smx_action_t comm = SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff, - dst_buff_size, match_fun, data); - simcall->mc_value = 0; - SIMIX_pre_comm_wait(simcall, comm, timeout); -} - -void SIMIX_pre_comm_recv_bounded(smx_simcall_t simcall, smx_rdv_t rdv, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), - void *data, double timeout, double rate){ - smx_action_t comm = SIMIX_comm_irecv_bounded(simcall->issuer, rdv, dst_buff, dst_buff_size, match_fun, data, rate); simcall->mc_value = 0; SIMIX_pre_comm_wait(simcall, comm, timeout); @@ -474,107 +466,16 @@ void SIMIX_pre_comm_recv_bounded(smx_simcall_t simcall, smx_rdv_t rdv, smx_action_t SIMIX_pre_comm_irecv(smx_simcall_t simcall, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_action_t), - void *data){ - return SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff, dst_buff_size, - match_fun, data); -} - -smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), void *data) + void *data, double rate) { - XBT_DEBUG("recv from %p %p\n", rdv, rdv->comm_fifo); - smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE); - - smx_action_t other_action; - //communication already done, get it inside the fifo of completed comms - //permanent receive v1 - //int already_received=0; - if(rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0){ - - XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication\n"); - //find a match in the already received fifo - other_action = SIMIX_fifo_get_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action); - //if not found, assume the receiver came first, register it to the mailbox in the classical way - if (!other_action) { - XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo\n"); - other_action = this_action; - SIMIX_rdv_push(rdv, this_action); - }else{ - if(other_action->comm.surf_comm && SIMIX_comm_get_remains(other_action)==0.0) - { - XBT_DEBUG("comm %p has been already sent, and is finished, destroy it\n",&(other_action->comm)); - other_action->state = SIMIX_DONE; - other_action->comm.type = SIMIX_COMM_DONE; - other_action->comm.rdv = NULL; - //SIMIX_comm_destroy(this_action); - //--smx_total_comms; // this creation was a pure waste - //already_received=1; - //other_action->comm.refcount--; - }/*else{ - XBT_DEBUG("Not yet finished, we have to wait %d\n", xbt_fifo_size(rdv->comm_fifo)); - }*/ - other_action->comm.refcount--; - SIMIX_comm_destroy(this_action); - --smx_total_comms; // this creation was a pure waste - } - }else{ - /* Prepare an action describing us, so that it gets passed to the user-provided filter of other side */ - - /* Look for communication action 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 */ - other_action = SIMIX_fifo_get_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action); - - if (!other_action) { - XBT_DEBUG("Receive pushed first %d\n", xbt_fifo_size(rdv->comm_fifo)); - other_action = this_action; - SIMIX_rdv_push(rdv, this_action); - } else { - SIMIX_comm_destroy(this_action); - --smx_total_comms; // this creation was a pure waste - other_action->state = SIMIX_READY; - other_action->comm.type = SIMIX_COMM_READY; - //other_action->comm.refcount--; - } - xbt_fifo_push(dst_proc->comms, other_action); - } - - /* Setup communication action */ - other_action->comm.dst_proc = dst_proc; - other_action->comm.dst_buff = dst_buff; - other_action->comm.dst_buff_size = dst_buff_size; - other_action->comm.dst_data = data; - - other_action->comm.match_fun = match_fun; - - - /*if(already_received)//do the actual copy, because the first one after the comm didn't have all the info - SIMIX_comm_copy_data(other_action);*/ - - - if (MC_is_active()) { - other_action->state = SIMIX_RUNNING; - return other_action; - } - - SIMIX_comm_start(other_action); - // } - return other_action; -} - -smx_action_t SIMIX_pre_comm_irecv_bounded(smx_simcall_t simcall, smx_rdv_t rdv, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), - void *data, double rate){ - return SIMIX_comm_irecv_bounded(simcall->issuer, rdv, dst_buff, dst_buff_size, + return SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff, dst_buff_size, match_fun, data, rate); } -smx_action_t SIMIX_comm_irecv_bounded(smx_process_t dst_proc, smx_rdv_t rdv, +smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), void *data, double rate) + int (*match_fun)(void *, void *, smx_action_t), + void *data, double rate) { XBT_DEBUG("recv from %p %p\n", rdv, rdv->comm_fifo); smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE); @@ -640,8 +541,9 @@ smx_action_t SIMIX_comm_irecv_bounded(smx_process_t dst_proc, smx_rdv_t rdv, other_action->comm.dst_buff_size = dst_buff_size; other_action->comm.dst_data = data; - if (rate < other_action->comm.rate || other_action->comm.rate == -1.0) - other_action->comm.rate = rate; + if (rate != -1.0 && + (other_action->comm.rate == -1.0 || rate < other_action->comm.rate)) + other_action->comm.rate = rate; other_action->comm.match_fun = match_fun; @@ -695,7 +597,6 @@ smx_action_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int src, void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout) { - int idx = simcall->mc_value; /* the simcall may be a wait, a send or a recv */ surf_action_t sleep; @@ -706,6 +607,7 @@ void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double time simcall->issuer->waiting_action = action; if (MC_is_active()) { + int idx = simcall->mc_value; if (idx == 0) { action->state = SIMIX_DONE; } else { @@ -764,12 +666,12 @@ void SIMIX_pre_comm_test(smx_simcall_t simcall, smx_action_t action) void SIMIX_pre_comm_testany(smx_simcall_t simcall, xbt_dynar_t actions) { - int idx = simcall->mc_value; unsigned int cursor; smx_action_t action; simcall_comm_testany__set__result(simcall, -1); if (MC_is_active()){ + int idx = simcall->mc_value; if(idx == -1){ SIMIX_simcall_answer(simcall); }else{ @@ -795,11 +697,11 @@ void SIMIX_pre_comm_testany(smx_simcall_t simcall, xbt_dynar_t actions) void SIMIX_pre_comm_waitany(smx_simcall_t simcall, xbt_dynar_t actions) { - int idx = simcall->mc_value; smx_action_t action; unsigned int cursor = 0; if (MC_is_active()){ + int idx = simcall->mc_value; action = xbt_dynar_get_as(actions, idx, smx_action_t); xbt_fifo_push(action->simcalls, simcall); simcall_comm_waitany__set__result(simcall, idx); @@ -835,7 +737,7 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) * \brief Starts the simulation of a communication action. * \param action the communication action */ -XBT_INLINE void SIMIX_comm_start(smx_action_t action) +static XBT_INLINE void SIMIX_comm_start(smx_action_t action) { /* If both the sender and the receiver are already there, start the communication */ if (action->state == SIMIX_READY) { @@ -890,6 +792,7 @@ void SIMIX_comm_finish(smx_action_t action) unsigned int destroy_count = 0; smx_simcall_t simcall; + while ((simcall = xbt_fifo_shift(action->simcalls))) { /* If a waitany simcall is waiting for this action to finish, then remove @@ -988,13 +891,33 @@ void SIMIX_comm_finish(smx_action_t action) simcall->issuer->waiting_action = NULL; xbt_fifo_remove(simcall->issuer->comms, action); if(action->comm.detached){ + smx_process_t proc; + int still_alive = 0; + if(simcall->issuer == action->comm.src_proc){ - if(action->comm.dst_proc) - xbt_fifo_remove(action->comm.dst_proc->comms, action); + if(action->comm.dst_proc){ + xbt_swag_foreach(proc, simix_global->process_list) + { + if(proc==action->comm.dst_proc){ + still_alive=1; + break; + } + } + } + if(still_alive) xbt_fifo_remove(action->comm.dst_proc->comms, action); } if(simcall->issuer == action->comm.dst_proc){ if(action->comm.src_proc) - xbt_fifo_remove(action->comm.src_proc->comms, action); + if(action->comm.dst_proc){ + xbt_swag_foreach(proc, simix_global->process_list) + { + if(proc==action->comm.src_proc){ + still_alive=1; + break; + } + } + } + if(still_alive) xbt_fifo_remove(action->comm.src_proc->comms, action); } } SIMIX_simcall_answer(simcall); @@ -1189,7 +1112,7 @@ XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action) } if (action->comm.surf_comm){ XBT_DEBUG("Getting latency limited for surf_action (%p)", action->comm.surf_comm); - action->latency_limited = surf_workstation_model->get_latency_limited(action->comm.surf_comm); + action->latency_limited = surf_network_action_get_latency_limited(action->comm.surf_comm); XBT_DEBUG("Action limited is %d", action->latency_limited); } return action->latency_limited;