X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f82324570da0d9e5ada9db953e969b760e9b7016..d84e29a724c9f6a2470db8a48cd7f97c3c02c9e0:/src/simix/smx_network.c diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 54eda9e942..7c0b9ff264 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -44,7 +44,7 @@ void SIMIX_network_exit(void) /* Rendez-Vous Points */ /******************************************************************************/ -smx_rdv_t SIMIX_pre_rdv_create(smx_simcall_t simcall, const char *name){ +smx_rdv_t simcall_HANDLER_rdv_create(smx_simcall_t simcall, const char *name){ return SIMIX_rdv_create(name); } smx_rdv_t SIMIX_rdv_create(const char *name) @@ -59,7 +59,7 @@ smx_rdv_t SIMIX_rdv_create(const char *name) rdv->done_comm_fifo = xbt_fifo_new(); rdv->permanent_receiver=NULL; - XBT_DEBUG("Creating a mailbox at %p with name %s\n", rdv, name); + XBT_DEBUG("Creating a mailbox at %p with name %s", rdv, name); if (rdv->name) xbt_dict_set(rdv_points, rdv->name, rdv, NULL); @@ -67,7 +67,7 @@ smx_rdv_t SIMIX_rdv_create(const char *name) return rdv; } -void SIMIX_pre_rdv_destroy(smx_simcall_t simcall, smx_rdv_t rdv){ +void simcall_HANDLER_rdv_destroy(smx_simcall_t simcall, smx_rdv_t rdv){ return SIMIX_rdv_destroy(rdv); } void SIMIX_rdv_destroy(smx_rdv_t rdv) @@ -92,15 +92,12 @@ xbt_dict_t SIMIX_get_rdv_points() return rdv_points; } -smx_rdv_t SIMIX_pre_rdv_get_by_name(smx_simcall_t simcall, const char *name){ - return SIMIX_rdv_get_by_name(name); -} smx_rdv_t SIMIX_rdv_get_by_name(const char *name) { return xbt_dict_get_or_null(rdv_points, name); } -int SIMIX_pre_rdv_comm_count_by_host(smx_simcall_t simcall, smx_rdv_t rdv, smx_host_t host){ +unsigned int simcall_HANDLER_rdv_comm_count_by_host(smx_simcall_t simcall, smx_rdv_t rdv, smx_host_t host){ return SIMIX_rdv_comm_count_by_host(rdv, host); } int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host) @@ -117,7 +114,7 @@ int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host) return count; } -smx_action_t SIMIX_pre_rdv_get_head(smx_simcall_t simcall, smx_rdv_t rdv){ +smx_action_t simcall_HANDLER_rdv_get_head(smx_simcall_t simcall, smx_rdv_t rdv){ return SIMIX_rdv_get_head(rdv); } smx_action_t SIMIX_rdv_get_head(smx_rdv_t rdv) @@ -125,7 +122,7 @@ smx_action_t SIMIX_rdv_get_head(smx_rdv_t rdv) return xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo)); } -smx_process_t SIMIX_pre_rdv_get_receiver(smx_simcall_t simcall, smx_rdv_t rdv){ +smx_process_t simcall_HANDLER_rdv_get_receiver(smx_simcall_t simcall, smx_rdv_t rdv){ return SIMIX_rdv_get_receiver(rdv); } /** @@ -138,7 +135,7 @@ smx_process_t SIMIX_rdv_get_receiver(smx_rdv_t rdv) return rdv->permanent_receiver; } -void SIMIX_pre_rdv_set_receiver(smx_simcall_t simcall, smx_rdv_t rdv, +void simcall_HANDLER_rdv_set_receiver(smx_simcall_t simcall, smx_rdv_t rdv, smx_process_t process){ SIMIX_rdv_set_receiver(rdv, process); } @@ -353,7 +350,7 @@ void SIMIX_comm_destroy_internal_actions(smx_action_t action) } } -void SIMIX_pre_comm_send(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv, +void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *,smx_action_t), @@ -363,9 +360,9 @@ void SIMIX_pre_comm_send(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0); SIMCALL_SET_MC_VALUE(simcall, 0); - SIMIX_pre_comm_wait(simcall, comm, timeout); + simcall_HANDLER_comm_wait(simcall, comm, timeout); } -smx_action_t SIMIX_pre_comm_isend(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv, +smx_action_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *,smx_action_t), @@ -385,7 +382,7 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, void *data, int detached) { - XBT_DEBUG("send from %p\n", rdv); + XBT_DEBUG("send from %p", rdv); /* Prepare an action describing us, so that it gets passed to the user-provided filter of other side */ smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_SEND); @@ -406,13 +403,13 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, other_action->comm.refcount++; xbt_fifo_push(rdv->done_comm_fifo,other_action); other_action->comm.rdv=rdv; - XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p \n", rdv, &(other_action->comm)); + XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", rdv, &(other_action->comm)); }else{ SIMIX_rdv_push(rdv, this_action); } } else { - XBT_DEBUG("Receive already pushed\n"); + XBT_DEBUG("Receive already pushed"); SIMIX_comm_destroy(this_action); --smx_total_comms; // this creation was a pure waste @@ -454,7 +451,7 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, return (detached ? NULL : other_action); } -void SIMIX_pre_comm_recv(smx_simcall_t simcall, smx_rdv_t rdv, +void simcall_HANDLER_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 (*copy_data_fun)(smx_action_t, void*, size_t), @@ -463,10 +460,10 @@ void SIMIX_pre_comm_recv(smx_simcall_t simcall, smx_rdv_t rdv, smx_action_t comm = SIMIX_comm_irecv(simcall->issuer, rdv, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); SIMCALL_SET_MC_VALUE(simcall, 0); - SIMIX_pre_comm_wait(simcall, comm, timeout); + simcall_HANDLER_comm_wait(simcall, comm, timeout); } -smx_action_t SIMIX_pre_comm_irecv(smx_simcall_t simcall, smx_rdv_t rdv, +smx_action_t simcall_HANDLER_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 (*copy_data_fun)(smx_action_t, void*, size_t), @@ -482,7 +479,7 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, void (*copy_data_fun)(smx_action_t, void*, size_t), // used to copy data if not default one void *data, double rate) { - XBT_DEBUG("recv from %p %p\n", rdv, rdv->comm_fifo); + XBT_DEBUG("recv from %p %p", rdv, rdv->comm_fifo); smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE); smx_action_t other_action; @@ -491,27 +488,23 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, //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"); + XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication"); //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"); + XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo"); 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)); + XBT_DEBUG("comm %p has been already sent, and is finished, destroy it",&(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)); + XBT_DEBUG("Not yet finished, we have to wait %d", xbt_fifo_size(rdv->comm_fifo)); }*/ other_action->comm.refcount--; SIMIX_comm_destroy(this_action); @@ -527,7 +520,7 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, 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)); + XBT_DEBUG("Receive pushed first %d", xbt_fifo_size(rdv->comm_fifo)); other_action = this_action; SIMIX_rdv_push(rdv, this_action); } else { @@ -568,30 +561,37 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, return other_action; } -smx_action_t SIMIX_pre_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv, - int src, int tag, +smx_action_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_rdv_t rdv, + int type, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data){ - return SIMIX_comm_iprobe(simcall->issuer, rdv, src, tag, match_fun, data); + return SIMIX_comm_iprobe(simcall->issuer, rdv, type, src, tag, match_fun, data); } -smx_action_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int src, +smx_action_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int type, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data) { - XBT_DEBUG("iprobe from %p %p\n", rdv, rdv->comm_fifo); - smx_action_t this_action = SIMIX_comm_new(SIMIX_COMM_RECEIVE); - + XBT_DEBUG("iprobe from %p %p", rdv, rdv->comm_fifo); + smx_action_t this_action; + int smx_type; + if(type == 1){ + this_action=SIMIX_comm_new(SIMIX_COMM_SEND); + smx_type = SIMIX_COMM_RECEIVE; + } else{ + this_action=SIMIX_comm_new(SIMIX_COMM_RECEIVE); + smx_type = SIMIX_COMM_SEND; + } smx_action_t other_action=NULL; if(rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0){ //find a match in the already received fifo - XBT_DEBUG("first try in the perm recv mailbox \n"); + XBT_DEBUG("first try in the perm recv mailbox"); - other_action = SIMIX_fifo_probe_comm(rdv->done_comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action); + other_action = SIMIX_fifo_probe_comm(rdv->done_comm_fifo, smx_type, match_fun, data, this_action); } // }else{ if(!other_action){ - XBT_DEBUG("second try in the other mailbox"); - other_action = SIMIX_fifo_probe_comm(rdv->comm_fifo, SIMIX_COMM_SEND, match_fun, data, this_action); + XBT_DEBUG("try in the normal mailbox"); + other_action = SIMIX_fifo_probe_comm(rdv->comm_fifo, smx_type, match_fun, data, this_action); } // } if(other_action)other_action->comm.refcount--; @@ -601,13 +601,13 @@ smx_action_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_rdv_t rdv, int src, return other_action; } -void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout) +void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout) { /* the simcall may be a wait, a send or a recv */ surf_action_t sleep; /* Associate this simcall to the wait action */ - XBT_DEBUG("SIMIX_pre_comm_wait, %p", action); + XBT_DEBUG("simcall_HANDLER_comm_wait, %p", action); xbt_fifo_push(action->simcalls, simcall); simcall->issuer->waiting_action = action; @@ -647,7 +647,7 @@ void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double time } } -void SIMIX_pre_comm_test(smx_simcall_t simcall, smx_action_t action) +void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_action_t action) { if(MC_is_active()){ simcall_comm_test__set__result(simcall, action->comm.src_proc && action->comm.dst_proc); @@ -670,7 +670,7 @@ 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) +void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t actions) { unsigned int cursor; smx_action_t action; @@ -701,7 +701,7 @@ void SIMIX_pre_comm_testany(smx_simcall_t simcall, xbt_dynar_t actions) SIMIX_simcall_answer(simcall); } -void SIMIX_pre_comm_waitany(smx_simcall_t simcall, xbt_dynar_t actions) +void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t actions) { smx_action_t action; unsigned int cursor = 0; @@ -955,7 +955,7 @@ void SIMIX_post_comm(smx_action_t action) } } -void SIMIX_pre_comm_cancel(smx_simcall_t simcall, smx_action_t action){ +void simcall_HANDLER_comm_cancel(smx_simcall_t simcall, smx_action_t action){ SIMIX_comm_cancel(action); } void SIMIX_comm_cancel(smx_action_t action) @@ -992,7 +992,7 @@ void SIMIX_comm_resume(smx_action_t action) /************* Action Getters **************/ -double SIMIX_pre_comm_get_remains(smx_simcall_t simcall, smx_action_t action){ +double simcall_HANDLER_comm_get_remains(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_remains(action); } /** @@ -1025,7 +1025,7 @@ double SIMIX_comm_get_remains(smx_action_t action) return remains; } -e_smx_state_t SIMIX_pre_comm_get_state(smx_simcall_t simcall, smx_action_t action){ +e_smx_state_t simcall_HANDLER_comm_get_state(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_state(action); } e_smx_state_t SIMIX_comm_get_state(smx_action_t action) @@ -1033,7 +1033,7 @@ e_smx_state_t SIMIX_comm_get_state(smx_action_t action) return action->state; } -void* SIMIX_pre_comm_get_src_data(smx_simcall_t simcall, smx_action_t action){ +void* simcall_HANDLER_comm_get_src_data(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_src_data(action); } /** @@ -1046,7 +1046,7 @@ void* SIMIX_comm_get_src_data(smx_action_t action) return action->comm.src_data; } -void* SIMIX_pre_comm_get_dst_data(smx_simcall_t simcall, smx_action_t action){ +void* simcall_HANDLER_comm_get_dst_data(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_dst_data(action); } /** @@ -1059,7 +1059,7 @@ void* SIMIX_comm_get_dst_data(smx_action_t action) return action->comm.dst_data; } -smx_process_t SIMIX_pre_comm_get_src_proc(smx_simcall_t simcall, smx_action_t action){ +smx_process_t simcall_HANDLER_comm_get_src_proc(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_src_proc(action); } smx_process_t SIMIX_comm_get_src_proc(smx_action_t action) @@ -1067,7 +1067,7 @@ smx_process_t SIMIX_comm_get_src_proc(smx_action_t action) return action->comm.src_proc; } -smx_process_t SIMIX_pre_comm_get_dst_proc(smx_simcall_t simcall, smx_action_t action){ +smx_process_t simcall_HANDLER_comm_get_dst_proc(smx_simcall_t simcall, smx_action_t action){ return SIMIX_comm_get_dst_proc(action); } smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action) @@ -1076,7 +1076,7 @@ smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action) } #ifdef HAVE_LATENCY_BOUND_TRACKING -int SIMIX_pre_comm_is_latency_bounded(smx_simcall_t simcall, smx_action_t action) +int simcall_HANDLER_comm_is_latency_bounded(smx_simcall_t simcall, smx_action_t action) { return SIMIX_comm_is_latency_bounded(action); }