X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed3e911d18757096ccfd585c4f8ef09d8589f249..39714a9316cb8b1b86982600d4b1c8e034c82e7f:/src/simix/smx_network.c diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 0de05fa5d7..9797825fc9 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -290,9 +290,6 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type) return act; } -void SIMIX_pre_comm_destroy(smx_simcall_t simcall, smx_action_t action){ - SIMIX_comm_destroy(action); -} /** * \brief Destroy a communicate action * \param action The communicate action to be destroyed @@ -445,7 +442,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); @@ -1105,14 +1102,14 @@ int SIMIX_pre_comm_is_latency_bounded(smx_simcall_t simcall, smx_action_t action * \brief verify if communication is latency bounded * \param comm The communication */ -XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action) +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); + 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;