From 95990cc4a083cc533f07ebad5ba617c030a5731c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 16 Aug 2015 17:32:51 +0200 Subject: [PATCH] kill SIMIX_comm_isend(), use simcall_HANDLER_comm_isend() directly --- src/simix/smx_network.c | 22 +++++----------------- src/simix/smx_network_private.h | 8 -------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index ffe721ba53..78a4922666 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -335,31 +335,19 @@ void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_rdv int (*match_fun)(void *, void *,smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout){ - smx_synchro_t comm = SIMIX_comm_isend(src, rdv, task_size, rate, + smx_synchro_t comm = simcall_HANDLER_comm_isend(simcall, src, rdv, task_size, rate, src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0); SIMCALL_SET_MC_VALUE(simcall, 0); simcall_HANDLER_comm_wait(simcall, comm, timeout); } -smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src, smx_rdv_t rdv, +smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *,smx_synchro_t), - void (*clean_fun)(void *), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), - void *data, int detached){ - return SIMIX_comm_isend(src, rdv, task_size, rate, src_buff, - src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); - -} -smx_synchro_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, - double task_size, double rate, - void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *,smx_synchro_t), - void (*clean_fun)(void *), // used to free the synchro in case of problem after a detached send - void (*copy_data_fun)(smx_synchro_t, void*, size_t), // used to copy data if not default one - void *data, - int detached) + void (*clean_fun)(void *), // used to free the synchro in case of problem after a detached send + void (*copy_data_fun)(smx_synchro_t, void*, size_t),// used to copy data if not default one + void *data, int detached) { XBT_DEBUG("send from %p", rdv); diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index e9f39efb8e..93778b104e 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -34,14 +34,6 @@ int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host); smx_synchro_t SIMIX_rdv_get_head(smx_rdv_t rdv); void SIMIX_rdv_set_receiver(smx_rdv_t rdv, smx_process_t proc); smx_process_t SIMIX_rdv_get_receiver(smx_rdv_t rdv); -smx_synchro_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv, - double task_size, double rate, - void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*clean_fun)(void *), // used to free the synchro in case of problem after a detached send - void (*copy_data_fun)(smx_synchro_t, void*, size_t), - void *data, - int detached); smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size, int (*)(void *, void *, smx_synchro_t), -- 2.20.1