From: Takishipp Date: Mon, 24 Jul 2017 10:49:11 +0000 (+0200) Subject: remove unused parameters of some fcts X-Git-Tag: v3_17~322^2~4^2^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2a4e09ea802d88e54d4c8b29d9bd57f72d5b2760 remove unused parameters of some fcts --- diff --git a/src/include/instr/instr_interface.h b/src/include/instr/instr_interface.h index 8bb38ce23d..4e6ff0b414 100644 --- a/src/include/instr/instr_interface.h +++ b/src/include/instr/instr_interface.h @@ -12,7 +12,7 @@ SG_BEGIN_DECL() XBT_PUBLIC(int) TRACE_start (); XBT_PUBLIC(int) TRACE_end (); -XBT_PUBLIC(void) TRACE_global_init(int *argc, char **argv); +XBT_PUBLIC(void) TRACE_global_init(); XBT_PUBLIC(void) TRACE_help(int detailed); XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); XBT_PUBLIC(void) TRACE_surf_resource_utilization_release(); diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 82b951f1a3..8455e27199 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -315,7 +315,7 @@ char *TRACE_get_viva_cat_conf () return xbt_cfg_get_string(OPT_VIVA_CAT_CONF); } -void TRACE_global_init(int *argc, char **argv) +void TRACE_global_init() { static int is_initialised = 0; if (is_initialised) diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 963cda9bd2..17f635ca28 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -147,6 +147,7 @@ class DefineStateTypeEvent : public PajeEvent { class SetVariableEvent : public PajeEvent { + private: container_t container; type_t type; double value; @@ -157,6 +158,7 @@ class SetVariableEvent : public PajeEvent { class AddVariableEvent:public PajeEvent { + private: container_t container; type_t type; double value; @@ -169,7 +171,7 @@ class AddVariableEvent:public PajeEvent { class SubVariableEvent : public PajeEvent { - public: + private: container_t container; type_t type; double value; @@ -180,7 +182,7 @@ class SubVariableEvent : public PajeEvent { //-------------------------------------------------- class SetStateEvent : public PajeEvent { - public: + private: container_t container; type_t type; val_t value; diff --git a/src/instr/instr_smpi.h b/src/instr/instr_smpi.h index 974d10f272..699e29b059 100644 --- a/src/instr/instr_smpi.h +++ b/src/instr/instr_smpi.h @@ -18,7 +18,7 @@ SG_BEGIN_DECL() XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category); XBT_PRIVATE const char* TRACE_internal_smpi_get_category(); XBT_PRIVATE void TRACE_smpi_collective_in(int rank, int root, const char* operation, instr_extra_data extra); -XBT_PRIVATE void TRACE_smpi_collective_out(int rank, int root, const char* operation); +XBT_PRIVATE void TRACE_smpi_collective_out(int rank, const char* operation); XBT_PRIVATE void TRACE_smpi_computing_init(int rank); XBT_PRIVATE void TRACE_smpi_computing_out(int rank); XBT_PRIVATE void TRACE_smpi_computing_in(int rank, instr_extra_data extra); diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index 011f6f6669..4a0509d674 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -32,7 +32,7 @@ static void _sg_cfg_cb_msg_debug_multiple_use(const char *name) */ void MSG_init_nocheck(int *argc, char **argv) { - TRACE_global_init(argc, argv); + TRACE_global_init(); if (not msg_global) { diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 0e983e8ffe..71a2345d77 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -35,7 +35,7 @@ Engine::Engine(int *argc, char **argv) { s4u::Engine::instance_ = this; pimpl = new kernel::EngineImpl(); - TRACE_global_init(argc, argv); + TRACE_global_init(); SIMIX_global_init(argc, argv); } diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index b939d4c958..a891002291 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -42,7 +42,7 @@ int PMPI_Init(int *argc, char ***argv) instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_INIT; TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); smpi_bench_begin(); } @@ -61,7 +61,7 @@ int PMPI_Finalize() smpi_process()->finalize(); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); TRACE_smpi_finalize(smpi_process()->index()); return MPI_SUCCESS; } diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index 7459567693..c191471c6c 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -44,7 +44,7 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c simgrid::smpi::Colls::bcast(buf, count, datatype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -71,7 +71,7 @@ int PMPI_Barrier(MPI_Comm comm) retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -123,7 +123,7 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -180,7 +180,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -227,7 +227,7 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -279,7 +279,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -327,7 +327,7 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -379,7 +379,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -414,7 +414,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -472,7 +472,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp xbt_free(sendtmpbuf); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -506,7 +506,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP retval = simgrid::smpi::Colls::scan(sendbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); @@ -543,7 +543,7 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); } @@ -594,7 +594,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -649,7 +649,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, xbt_free(recvcounts); retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -700,7 +700,7 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); if (sendbuf == MPI_IN_PLACE) xbt_free(sendtmpbuf); @@ -771,7 +771,7 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts, recvdisps, recvtype, comm); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); if (sendbuf == MPI_IN_PLACE) { xbt_free(sendtmpbuf); diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index aa82058617..7411b324e8 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -168,7 +168,7 @@ int PMPI_Win_fence( int assert, MPI_Win win){ int rank = smpi_process()->index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = win->fence(assert); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -526,7 +526,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ int rank = smpi_process()->index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = win->post(group,assert); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -543,7 +543,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ int rank = smpi_process()->index(); TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = win->start(group,assert); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -560,7 +560,7 @@ int PMPI_Win_complete(MPI_Win win){ retval = win->complete(); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -577,7 +577,7 @@ int PMPI_Win_wait(MPI_Win win){ retval = win->wait(); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -597,7 +597,7 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->lock(lock_type,rank,assert); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -614,7 +614,7 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->unlock(rank); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -629,7 +629,7 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->lock_all(assert); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -644,7 +644,7 @@ int PMPI_Win_unlock_all(MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->unlock_all(); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -661,7 +661,7 @@ int PMPI_Win_flush(int rank, MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->flush(rank); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -678,7 +678,7 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->flush_local(rank); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -693,7 +693,7 @@ int PMPI_Win_flush_all(MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->flush_all(); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; @@ -708,7 +708,7 @@ int PMPI_Win_flush_local_all(MPI_Win win){ int myrank = smpi_process()->index(); TRACE_smpi_collective_in(myrank, -1, __FUNCTION__, nullptr); retval = win->flush_local_all(); - TRACE_smpi_collective_out(myrank, -1, __FUNCTION__); + TRACE_smpi_collective_out(myrank, __FUNCTION__); } smpi_bench_begin(); return retval; diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index a86350acae..6f42ba093c 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -249,7 +249,7 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_e new PushStateEvent (SIMIX_get_clock(), container, type, value, static_cast(extra)); } -void TRACE_smpi_collective_out(int rank, int root, const char *operation) +void TRACE_smpi_collective_out(int rank, const char *operation) { if (not TRACE_smpi_is_enabled()) return; diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 1504bd2d35..3352cc06a8 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -536,7 +536,7 @@ int smpi_main(const char* executable, int argc, char *argv[]) return 0; } - TRACE_global_init(&argc, argv); + TRACE_global_init(); SIMIX_global_init(&argc, argv); MSG_init(&argc,argv); diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index c41904ef8b..52db69bede 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -458,7 +458,7 @@ static void action_barrier(const char *const *action){ Colls::barrier(MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -490,7 +490,7 @@ static void action_bcast(const char *const *action) Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -525,7 +525,7 @@ static void action_reduce(const char *const *action) Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -553,7 +553,7 @@ static void action_allReduce(const char *const *action) { Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -587,7 +587,7 @@ static void action_allToAll(const char *const *action) { Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -635,7 +635,7 @@ static void action_gather(const char *const *action) { Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(smpi_process()->index(), -1, __FUNCTION__); + TRACE_smpi_collective_out(smpi_process()->index(), __FUNCTION__); log_timed_action (action, clock); } @@ -693,7 +693,7 @@ static void action_gatherv(const char *const *action) { Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); - TRACE_smpi_collective_out(smpi_process()->index(), -1, __FUNCTION__); + TRACE_smpi_collective_out(smpi_process()->index(), __FUNCTION__); log_timed_action (action, clock); } @@ -740,7 +740,7 @@ static void action_reducescatter(const char *const *action) { Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -782,7 +782,7 @@ static void action_allgather(const char *const *action) { Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -835,7 +835,7 @@ static void action_allgatherv(const char *const *action) { Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -899,7 +899,7 @@ static void action_allToAllv(const char *const *action) { Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, MPI_CURRENT_TYPE, MPI_COMM_WORLD); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, __FUNCTION__); log_timed_action (action, clock); } @@ -918,7 +918,7 @@ void smpi_replay_init(int* argc, char*** argv) instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_INIT; TRACE_smpi_collective_in(rank, -1, "smpi_replay_run_init", extra); - TRACE_smpi_collective_out(rank, -1, "smpi_replay_run_init"); + TRACE_smpi_collective_out(rank, "smpi_replay_run_init"); xbt_replay_action_register("init", simgrid::smpi::action_init); xbt_replay_action_register("finalize", simgrid::smpi::action_finalize); xbt_replay_action_register("comm_size", simgrid::smpi::action_comm_size); @@ -992,7 +992,7 @@ void smpi_replay_main(int* argc, char*** argv) smpi_process()->finalize(); - TRACE_smpi_collective_out(smpi_process()->index(), -1, "smpi_replay_run_finalize"); + TRACE_smpi_collective_out(smpi_process()->index(), "smpi_replay_run_finalize"); TRACE_smpi_finalize(smpi_process()->index()); }