summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4f8e570)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6751
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
double timeout)
{
xbt_ex_t e;
double timeout)
{
xbt_ex_t e;
+ size_t task_size = sizeof(void*);
MSG_error_t ret = MSG_OK;
smx_comm_t comm;
CHECK_HOST();
MSG_error_t ret = MSG_OK;
smx_comm_t comm;
CHECK_HOST();
/* Try to receive it by calling SIMIX network layer */
TRY{
/* Try to receive it by calling SIMIX network layer */
TRY{
- SIMIX_network_recv(mailbox->rdv, timeout, NULL, NULL, &comm);
+ SIMIX_network_recv(mailbox->rdv, timeout, task, &task_size, &comm);
+ (*task)->simdata->refcount--;
}
CATCH(e){
switch(e.category){
}
CATCH(e){
switch(e.category){
-
- *task = SIMIX_communication_get_data(comm);
-
- /* If the sender didn't decremented the refcount so far then do it */
- if (*task && (*task)->simdata->refcount > 1)
- (*task)->simdata->refcount--;
SIMIX_cond_signal(mailbox->cond);
SIMIX_network_send(mailbox->rdv, t_simdata->message_size, t_simdata->rate,
SIMIX_cond_signal(mailbox->cond);
SIMIX_network_send(mailbox->rdv, t_simdata->message_size, t_simdata->rate,
- timeout, NULL, 0, &t_simdata->comm, task);
+ timeout, &task, sizeof(void*), &t_simdata->comm, task);
break;
case timeout_error:
ret = MSG_TRANSFER_FAILURE;
break;
case timeout_error:
ret = MSG_TRANSFER_FAILURE;
default:
xbt_die("Unhandled SIMIX network exception");
}
xbt_ex_free(e);
default:
xbt_die("Unhandled SIMIX network exception");
}
xbt_ex_free(e);
+
+ /* Decrement the refcount only on failure */
+ t_simdata->refcount--;
}
process->simdata->waiting_task = NULL;
}
process->simdata->waiting_task = NULL;
-
- /* If the receiver end didn't decremented the refcount so far then do it */
- if (t_simdata->refcount > 1)
- t_simdata->refcount--;
-
DEBUG0("Communication request found!");
xbt_fifo_shift(rdv->comm_fifo);
SIMIX_communication_use(comm);
DEBUG0("Communication request found!");
xbt_fifo_shift(rdv->comm_fifo);
SIMIX_communication_use(comm);
void SIMIX_communication_destroy(smx_comm_t comm)
{
comm->refcount--;
void SIMIX_communication_destroy(smx_comm_t comm)
{
comm->refcount--;
- if(comm->refcount == 0){
- if(comm->act != NULL)
- SIMIX_action_destroy(comm->act);
+ if(comm->refcount > 0)
+ return;
- xbt_free(comm->cond);
- xbt_free(comm);
+ if(comm->cond){
+ SIMIX_cond_destroy(comm->cond);
+ comm->cond = NULL;
+ }
+
+ if(comm->act){
+ SIMIX_action_destroy(comm->act);
+ comm->act = NULL;
/**
* \brief Start the simulation of a communication request
/**
* \brief Start the simulation of a communication request
- * \param comm The communication request
+ * \param comm The comm->rdv = NULL;communication request
*/
static inline void SIMIX_communication_start(smx_comm_t comm)
{
*/
static inline void SIMIX_communication_start(smx_comm_t comm)
{
SIMIX_communication_cancel(comm);
else
SIMIX_rdv_remove(comm->rdv, comm);
SIMIX_communication_cancel(comm);
else
SIMIX_rdv_remove(comm->rdv, comm);
SIMIX_cond_signal(comm->cond);
SIMIX_communication_destroy(comm);
}
SIMIX_cond_signal(comm->cond);
SIMIX_communication_destroy(comm);
}
/* Check for errors other than timeouts (they are catched above) */
if(!SIMIX_host_get_state(SIMIX_host_self())){
/* Check for errors other than timeouts (they are catched above) */
if(!SIMIX_host_get_state(SIMIX_host_self())){
+ SIMIX_rdv_remove(comm->rdv, comm);
SIMIX_communication_destroy(comm);
THROW0(host_error, 0, "Host failed");
} else if (SIMIX_action_get_state(comm->act) == SURF_ACTION_FAILED){
SIMIX_communication_destroy(comm);
THROW0(network_error, 0, "Link failure");
}
SIMIX_communication_destroy(comm);
THROW0(host_error, 0, "Host failed");
} else if (SIMIX_action_get_state(comm->act) == SURF_ACTION_FAILED){
SIMIX_communication_destroy(comm);
THROW0(network_error, 0, "Link failure");
}
-
- SIMIX_unregister_action_to_condition(comm->act, comm->cond);