THROW0(network_error, 0, "Remote peer failed");
}
+ /* Copy network data */
+ SIMIX_network_copy_data(comm);
+
SIMIX_communication_destroy(comm);
}
{
size_t buff_size = comm->src_buff_size;
+ /* If there is no data to be copy then return */
+ if(!comm->src_buff || !comm->dst_buff || comm->copied == 1)
+ return;
+
DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
comm,
comm->src_proc->smx_host->name, comm->src_buff,
comm->dst_proc->smx_host->name, comm->dst_buff,
buff_size);
- /* If there is no data to be copy then return */
- if(!comm->src_buff || !comm->dst_buff)
- return;
-
/* Copy at most dst_buff_size bytes of the message to receiver's buffer */
if (comm->dst_buff_size)
buff_size = MIN(buff_size,*(comm->dst_buff_size));
return;
(*SIMIX_network_copy_data_callback)(comm, buff_size);
+ /* Set the copied flag so we copy data only once */
+ /* (this function might be called from both communication ends)*/
+ comm->copied = 1;
+
/* pimple to display the message sizes */
{
if (msg_sizes == NULL)
void *src_buff, size_t src_buff_size, void *data)
{
smx_comm_t comm;
- mc_transition_t trans=NULL;
- if (_surf_do_model_check) {
- /* Let's intercept the communication and control it from the model-checker */
- trans = MC_create_transition(mc_isend, SIMIX_process_self(), rdv, NULL);
- SIMIX_process_yield();
- }
+ /*If running in model-checking mode then intercept the communication action*/
+ if (_surf_do_model_check)
+ MC_trans_intercept_isend(rdv);
/* Look for communication request matching our needs.
If it is not found then create it and push it into the rendez-vous point */
comm->src_buff = src_buff;
comm->src_buff_size = src_buff_size;
comm->data = data;
-
- /* Associate the simix communication to the mc transition */
- if (_surf_do_model_check)
- MC_transition_set_comm(trans, comm);
SIMIX_communication_start(comm);
return comm;
}
-smx_comm_t SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size) {
+smx_comm_t SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size)
+{
smx_comm_t comm;
- mc_transition_t trans=NULL;
-
- if (_surf_do_model_check) {
- /* Let's intercept the communication and control it from the model-checker */
- trans = MC_create_transition(mc_irecv, SIMIX_process_self(), rdv, NULL);
- SIMIX_process_yield();
- }
+
+ /*If running in model-checking mode then intercept the communication action*/
+ if (_surf_do_model_check)
+ MC_trans_intercept_irecv(rdv);
/* Look for communication request matching our needs.
- If it is not found then create it and push it into the rendez-vous point */
+ * If it is not found then create it and push it into the rendez-vous point
+ */
comm = SIMIX_rdv_get_request(rdv, comm_send);
if(!comm){
comm->dst_proc = SIMIX_process_self();
comm->dst_buff = dst_buff;
comm->dst_buff_size = dst_buff_size;
-
- /* Associate the simix communication to the mc transition */
- if (_surf_do_model_check)
- MC_transition_set_comm(trans, comm);
SIMIX_communication_start(comm);
return comm;
}
/** @brief blocks until the communication terminates or the timeout occurs */
-XBT_INLINE void SIMIX_network_wait(smx_comm_t comm, double timeout) {
- if (_surf_do_model_check) {
- /* Let's intercept the communication and control it from the model-checker */
- MC_create_transition(mc_wait, SIMIX_process_self(), comm->rdv, comm);
- SIMIX_process_yield();
- }
+XBT_INLINE void SIMIX_network_wait(smx_comm_t comm, double timeout)
+{
+ /*If running in model-checking mode then intercept the communication action*/
+ if (_surf_do_model_check)
+ MC_trans_intercept_wait(comm);
+
/* Wait for communication completion */
SIMIX_communication_wait_for_completion(comm, timeout);
}
/** @Returns whether the (asynchronous) communication is done yet or not */
-XBT_INLINE int SIMIX_network_test(smx_comm_t comm) {
- if (_surf_do_model_check) {
- /* Let's intercept the communication and control it from the model-checker */
- MC_create_transition(mc_test, SIMIX_process_self(), comm->rdv, comm);
- SIMIX_process_yield();
+XBT_INLINE int SIMIX_network_test(smx_comm_t comm)
+{
+ /*If running in model-checking mode then intercept the communication action*/
+ if (_surf_do_model_check)
+ MC_trans_intercept_test(comm);
+
+ /* Copy data if the communication is done */
+ if(comm->sem && !SIMIX_sem_would_block(comm->sem)){
+ /* Copy network data */
+ SIMIX_network_copy_data(comm);
+ return TRUE;
}
- return comm->sem?SIMIX_sem_would_block(comm->sem):0;
+ return FALSE;
}
/** @brief wait for the completion of any communication of a set
*
* @Returns the rank in the dynar of communication which finished; destroy it after identifying which one it is
*/
-unsigned int SIMIX_network_waitany(xbt_dynar_t comms) {
+unsigned int SIMIX_network_waitany(xbt_dynar_t comms)
+{
xbt_dynar_t sems = xbt_dynar_new(sizeof(smx_sem_t),NULL);
unsigned int cursor, found_comm=-1;
smx_comm_t comm,comm_finished=NULL;
- if (_surf_do_model_check) {
- /* Let's intercept the communication and control it from the model-checker */
- MC_create_transition(mc_waitany, SIMIX_process_self(), NULL, NULL);
- SIMIX_process_yield();
- }
-
- xbt_dynar_foreach(comms,cursor,comm){
+ /*If running in model-checking mode then intercept the communication action*/
+ if (_surf_do_model_check)
+ MC_trans_intercept_waitany(comms);
+
+ xbt_dynar_foreach(comms,cursor,comm)
xbt_dynar_push(sems,&(comm->sem));
- }
DEBUG1("Waiting for the completion of communication set %p", comms);
found_comm = SIMIX_sem_acquire_any(sems);
+ xbt_dynar_free_container(&sems);
xbt_assert0(found_comm!=-1,"Cannot find which communication finished");
xbt_dynar_get_cpy(comms,found_comm,&comm_finished);
- DEBUG1("Communication %p complete! Let's check for errors", comm_finished);
-
- /* Make sure that everyone sleeping on that semaphore is awake,
- * and that nobody will ever block on it */
- SIMIX_sem_release_forever(comm_finished->sem);
-
- /* Check for errors */
- if(!SIMIX_host_get_state(SIMIX_host_self())){
- if(comm_finished->rdv)
- SIMIX_rdv_remove(comm_finished->rdv, comm_finished);
- SIMIX_communication_destroy(comm_finished);
- THROW0(host_error, 0, "Host failed");
- } else if (SIMIX_action_get_state(comm_finished->act) == SURF_ACTION_FAILED){
- SIMIX_communication_destroy(comm_finished);
- THROW0(network_error, 0, "Link failure");
- }
- SIMIX_communication_destroy(comm_finished);
-
+ /* Check for errors and cleanup the comm */
+ SIMIX_communication_wait_for_completion(comm_finished,-1);
return found_comm;
-}
+}
\ No newline at end of file
