X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffc784d0a7d4b10e9ee73d12a4c355e2644e9afa..0398e492623cdd79abef6beb6819fda9d01b39c9:/src/simix/smx_network.c diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index a795bd2db1..56f4086130 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -15,8 +15,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, static xbt_dict_t rdv_points = NULL; unsigned long int smx_total_comms = 0; -static XBT_INLINE void SIMIX_comm_start(smx_action_t action); -static void SIMIX_comm_finish(smx_action_t action); static void SIMIX_waitany_req_remove_from_actions(smx_req_t req); static void SIMIX_comm_copy_data(smx_action_t comm); static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type); @@ -65,8 +63,7 @@ void SIMIX_rdv_destroy(smx_rdv_t rdv) void SIMIX_rdv_free(void *data) { smx_rdv_t rdv = (smx_rdv_t) data; - if (rdv->name) - xbt_free(rdv->name); + xbt_free(rdv->name); xbt_fifo_free(rdv->comm_fifo); xbt_free(rdv); } @@ -117,6 +114,9 @@ static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm) comm->comm.rdv = NULL; } +/** + * \brief Wrapper to SIMIX_rdv_get_request + */ smx_action_t SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) { return SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND, match_fun, data); } @@ -129,11 +129,12 @@ smx_action_t SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, vo smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type, int (*match_fun)(void *, void *), void *data) { + // FIXME rewrite this function by using SIMIX_rdv_has_send/recv_match smx_action_t action; xbt_fifo_item_t item; void* req_data = NULL; - xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){ + xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t) { if (action->comm.type == SIMIX_COMM_SEND) { req_data = action->comm.src_data; } else if (action->comm.type == SIMIX_COMM_RECEIVE) { @@ -155,6 +156,48 @@ smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type, return NULL; } +/** + * \brief Checks if there is a send communication action + * queued in a rendez-vous matching our needs. + * \return 1 if found, 0 otherwise + */ +int SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) { + + smx_action_t action; + xbt_fifo_item_t item; + + xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){ + if (action->comm.type == SIMIX_COMM_SEND + && (!match_fun || match_fun(data, action->comm.src_data))) { + XBT_DEBUG("Found a matching communication action %p", action); + return 1; + } + } + XBT_DEBUG("No matching communication action found"); + return 0; +} + +/** + * \brief Checks if there is a recv communication action + * queued in a rendez-vous matching our needs. + * \return 1 if found, 0 otherwise + */ +int SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) { + + smx_action_t action; + xbt_fifo_item_t item; + + xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t) { + if (action->comm.type == SIMIX_COMM_RECEIVE + && (!match_fun || match_fun(data, action->comm.dst_data))) { + XBT_DEBUG("Found a matching communication action %p", action); + return 1; + } + } + XBT_DEBUG("No matching communication action found"); + return 0; +} + /******************************************************************************/ /* Comunication Actions */ /******************************************************************************/ @@ -170,6 +213,7 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type) /* alloc structures */ act = xbt_mallocator_get(simix_global->action_mallocator); + act->type = SIMIX_ACTION_COMMUNICATE; act->state = SIMIX_WAITING; @@ -198,11 +242,12 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type) */ void SIMIX_comm_destroy(smx_action_t action) { - XBT_DEBUG("Destroy action %p (refcount:%d)", action, action->comm.refcount); + XBT_DEBUG("Destroy action %p (refcount: %d), state: %d", + action, action->comm.refcount, action->state); - if (action->comm.refcount <= 0) - xbt_die("the refcount of comm %p is already 0 before decreasing it. " - "That's a bug!", action); + xbt_assert(action->comm.refcount > 0, + "The refcount of comm %p is already 0 before decreasing it. " + "That's a bug!", action); action->comm.refcount--; if (action->comm.refcount > 0) @@ -214,10 +259,6 @@ void SIMIX_comm_destroy(smx_action_t action) action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ; #endif -#ifdef HAVE_TRACING - TRACE_smx_action_destroy(action); -#endif - xbt_free(action->name); SIMIX_comm_destroy_internal_actions(action); @@ -270,9 +311,10 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, action->state = SIMIX_READY; action->comm.type = SIMIX_COMM_READY; } + xbt_fifo_push(src_proc->comms, action); - /* If the communication action is detached then decrease the refcount - * by one, so it will be eliminated by the receivers destroy call */ + /* if the communication action is detached then decrease the refcount + * by one, so it will be eliminated by the receiver's destroy call */ if (detached) { action->comm.detached = 1; action->comm.refcount--; @@ -313,6 +355,7 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, action->state = SIMIX_READY; action->comm.type = SIMIX_COMM_READY; } + xbt_fifo_push(dst_proc->comms, action); /* Setup communication request */ action->comm.dst_proc = dst_proc; @@ -468,10 +511,12 @@ void SIMIX_waitany_req_remove_from_actions(smx_req_t req) * \brief Start the simulation of a communication request * \param action The communication action */ -static XBT_INLINE void SIMIX_comm_start(smx_action_t action) + +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) { + smx_host_t sender = action->comm.src_proc->smx_host; smx_host_t receiver = action->comm.dst_proc->smx_host; @@ -485,10 +530,6 @@ static XBT_INLINE void SIMIX_comm_start(smx_action_t action) action->state = SIMIX_RUNNING; -#ifdef HAVE_TRACING - TRACE_smx_action_communicate(action, action->comm.src_proc); -#endif - /* If a link is failed, detect it immediately */ if (surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) { XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", @@ -507,6 +548,10 @@ static XBT_INLINE void SIMIX_comm_start(smx_action_t action) } } +/** + * \brief Answers the SIMIX requests associated to a communication action. + * \param action a finished communication action + */ void SIMIX_comm_finish(smx_action_t action) { unsigned int destroy_count = 0; @@ -540,7 +585,7 @@ void SIMIX_comm_finish(smx_action_t action) case SIMIX_SRC_TIMEOUT: TRY { - THROW0(timeout_error, 0, "Communication timeouted because of sender"); + THROWF(timeout_error, 0, "Communication timeouted because of sender"); } CATCH(req->issuer->running_ctx->exception) { req->issuer->doexception = 1; @@ -549,7 +594,7 @@ void SIMIX_comm_finish(smx_action_t action) case SIMIX_DST_TIMEOUT: TRY { - THROW0(timeout_error, 0, "Communication timeouted because of receiver"); + THROWF(timeout_error, 0, "Communication timeouted because of receiver"); } CATCH(req->issuer->running_ctx->exception) { req->issuer->doexception = 1; @@ -559,9 +604,9 @@ void SIMIX_comm_finish(smx_action_t action) case SIMIX_SRC_HOST_FAILURE: TRY { if (req->issuer == action->comm.src_proc) - THROW0(host_error, 0, "Host failed"); + THROWF(host_error, 0, "Host failed"); else - THROW0(network_error, 0, "Remote peer failed"); + THROWF(network_error, 0, "Remote peer failed"); } CATCH(req->issuer->running_ctx->exception) { req->issuer->doexception = 1; @@ -571,9 +616,9 @@ void SIMIX_comm_finish(smx_action_t action) case SIMIX_DST_HOST_FAILURE: TRY { if (req->issuer == action->comm.dst_proc) - THROW0(host_error, 0, "Host failed"); + THROWF(host_error, 0, "Host failed"); else - THROW0(network_error, 0, "Remote peer failed"); + THROWF(network_error, 0, "Remote peer failed"); } CATCH(req->issuer->running_ctx->exception) { req->issuer->doexception = 1; @@ -583,17 +628,33 @@ void SIMIX_comm_finish(smx_action_t action) case SIMIX_LINK_FAILURE: TRY { XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)", - action, action->comm.src_proc->smx_host->name, action->comm.dst_proc->smx_host->name, + action, + action->comm.src_proc ? action->comm.src_proc->smx_host->name : NULL, + action->comm.dst_proc ? action->comm.dst_proc->smx_host->name : NULL, req->issuer->name, req->issuer); - THROW0(network_error, 0, "Link failure"); + THROWF(network_error, 0, "Link failure"); } CATCH(req->issuer->running_ctx->exception) { req->issuer->doexception = 1; } break; + case SIMIX_CANCELED: + TRY { + if (req->issuer == action->comm.dst_proc) { + THROWF(cancel_error, 0, "Communication canceled by the sender"); + } + else { + THROWF(cancel_error, 0, "Communication canceled by the receiver"); + } + } + CATCH(req->issuer->running_ctx->exception) { + req->issuer->doexception = 1; + } + break; + default: - THROW_IMPOSSIBLE; + xbt_die("Unexpected action state in SIMIX_comm_finish: %d", action->state); } /* if there is an exception during a waitany or a testany, indicate the position of the failed communication */ @@ -615,6 +676,10 @@ void SIMIX_comm_finish(smx_action_t action) SIMIX_comm_destroy(action); } +/** + * \brief This function is called when a Surf communication action is finished. + * \param action the corresponding Simix communication + */ void SIMIX_post_comm(smx_action_t action) { /* Update action state */ @@ -636,28 +701,39 @@ void SIMIX_post_comm(smx_action_t action) else action->state = SIMIX_DONE; - XBT_DEBUG("SIMIX_post_comm: action state = %d", action->state); + XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", + action, action->state, action->comm.src_proc, action->comm.dst_proc, action->comm.detached); - /* After this point the surf actions associated with the simix communicate - action are no longer needed, thus we delete them. */ + /* destroy the surf actions associated with the Simix communication */ SIMIX_comm_destroy_internal_actions(action); - /* If there are requests associated with the action, then answer them */ - if (xbt_fifo_size(action->request_list)) + /* remove the communication action from the list of pending communications + * of both processes (if they still exist) */ + if (action->comm.src_proc) { + xbt_fifo_remove(action->comm.src_proc->comms, action); + } + if (action->comm.dst_proc) { + xbt_fifo_remove(action->comm.dst_proc->comms, action); + } + + /* if there are requests associated with the action, then answer them */ + if (xbt_fifo_size(action->request_list)) { SIMIX_comm_finish(action); + } } void SIMIX_comm_cancel(smx_action_t action) { - /* If the action is a waiting state means that it is still in a rdv */ + /* if the action is a waiting state means that it is still in a rdv */ /* so remove from it and delete it */ if (action->state == SIMIX_WAITING) { SIMIX_rdv_remove(action->comm.rdv, action); - action->state = SIMIX_FAILED; - } else { - /* When running the MC there are no surf actions */ - if(!MC_IS_ENABLED) - surf_workstation_model->action_cancel(action->comm.surf_comm); + action->state = SIMIX_CANCELED; + } + else if (!MC_IS_ENABLED /* when running the MC there are no surf actions */ + && (action->state == SIMIX_READY || action->state == SIMIX_RUNNING)) { + + surf_workstation_model->action_cancel(action->comm.surf_comm); } } @@ -684,6 +760,10 @@ double SIMIX_comm_get_remains(smx_action_t action) { double remains; + if(!action){ + return 0; + } + switch (action->state) { case SIMIX_RUNNING: @@ -744,6 +824,9 @@ smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action) */ XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action) { + if(!action){ + return 0; + } 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); @@ -767,7 +850,7 @@ SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, size_t)) void SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size) { - xbt_assert1((buff_size == sizeof(void *)), + xbt_assert((buff_size == sizeof(void *)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); *(void **) (comm->comm.dst_buff) = comm->comm.src_buff; }