From: Takishipp Date: Mon, 24 Jul 2017 14:08:48 +0000 (+0200) Subject: delete unused parameters X-Git-Tag: v3_17~322^2~4^2^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/828a4cda080ed2897f9d91198bcb8a8c30ff2da9 delete unused parameters --- diff --git a/src/instr/instr_smpi.h b/src/instr/instr_smpi.h index 1549b1099f..cd6faa5f21 100644 --- a/src/instr/instr_smpi.h +++ b/src/instr/instr_smpi.h @@ -32,7 +32,7 @@ XBT_PRIVATE void TRACE_smpi_release(); XBT_PRIVATE void TRACE_smpi_ptp_in(int rank, const char* operation, instr_extra_data extra); XBT_PRIVATE void TRACE_smpi_ptp_out(int rank, int dst, const char* operation); XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size); -XBT_PRIVATE void TRACE_smpi_recv(int rank, int src, int dst, int tag); +XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag); XBT_PRIVATE void TRACE_smpi_init(int rank); XBT_PRIVATE void TRACE_smpi_finalize(int rank); XBT_PRIVATE char* smpi_container(int rank, char* container, int n); diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp index 52cc7297f3..b0ad4301b0 100644 --- a/src/msg/instr_msg_process.cpp +++ b/src/msg/instr_msg_process.cpp @@ -24,7 +24,7 @@ char *instr_process_id_2 (const char *process_name, int process_pid, char *str, /* * Instrumentation functions to trace MSG processes (msg_process_t) */ -void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host) +void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host) { if (TRACE_msg_process_is_enabled()){ static long long int counter = 0; diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 9734130959..6d20389928 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -125,7 +125,7 @@ XBT_PRIVATE void TRACE_msg_task_put_end(); /* declaration of instrumentation functions from msg_process_instr.c */ XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len); XBT_PRIVATE char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len); -XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host); +XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host); XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid); XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 2cabc4796d..af044f0d6c 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -211,7 +211,7 @@ msg_error_t MSG_process_join(msg_process_t process, double timeout){ */ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host) { - TRACE_msg_process_change_host(process, MSG_process_get_host(process), host); + TRACE_msg_process_change_host(process, host); process->migrate(host); return MSG_OK; } diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index e7d88fe7b1..40cc76e08b 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -322,7 +322,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if (status != MPI_STATUS_IGNORE) { src_traced = comm->group()->index(status->MPI_SOURCE); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank, tag); + TRACE_smpi_recv(src_traced, rank, tag); } } TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); @@ -475,7 +475,7 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, retval = MPI_SUCCESS; TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); - TRACE_smpi_recv(rank, src_traced, rank, recvtag); + TRACE_smpi_recv(src_traced, rank, recvtag); } smpi_bench_begin(); @@ -635,7 +635,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) src_traced = (status!=MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(rank, src_traced, dst_traced, tag_traced); + TRACE_smpi_recv(src_traced, dst_traced, tag_traced); } } @@ -685,7 +685,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[*index].comm->group()->rank(status->MPI_SOURCE) : savedvals[*index].src; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced, savedvals[*index].tag); + TRACE_smpi_recv(src_traced, dst_traced, savedvals[*index].tag); } TRACE_smpi_ptp_out(rank_traced, dst_traced, __FUNCTION__); } @@ -735,7 +735,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) if(src_traced==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? savedvals[i].comm->group()->rank(status[i].MPI_SOURCE) : savedvals[i].src; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced,savedvals[i].tag); + TRACE_smpi_recv(src_traced, dst_traced,savedvals[i].tag); } } } diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 42aa150448..0eeccfa8da 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -418,7 +418,7 @@ void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) new StartLinkEvent (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } -void TRACE_smpi_recv(int rank, int src, int dst, int tag) +void TRACE_smpi_recv(int src, int dst, int tag) { if (not TRACE_smpi_is_enabled()) return; diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index c05410b64f..77162fafb7 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -312,7 +312,7 @@ static void action_recv(const char *const *action) { TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank, 0); + TRACE_smpi_recv(src_traced, rank, 0); } log_timed_action (action, clock); @@ -410,7 +410,7 @@ static void action_wait(const char *const *action){ TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); if (is_wait_for_receive) - TRACE_smpi_recv(rank, src_traced, dst_traced, 0); + TRACE_smpi_recv(src_traced, dst_traced, 0); log_timed_action (action, clock); } @@ -442,7 +442,7 @@ static void action_waitall(const char *const *action){ for (i=0; iflags_ & RECV) != 0)){ int rank = smpi_process()->index(); int src_traced = (req->src_ == MPI_ANY_SOURCE ? req->real_src_ : req->src_); - TRACE_smpi_recv(rank, src_traced, rank,req->tag_); + TRACE_smpi_recv(src_traced, rank,req->tag_); } if(req->detached_sender_ != nullptr){ //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0