From: Christian Heinrich Date: Thu, 21 Jun 2018 14:06:32 +0000 (+0200) Subject: [TRACING] Rename TIT action waitAll -> waitall X-Git-Tag: v3.20~31 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dabc974c900a0e86479655752a6c915385d670e7?hp=6d18625ebd53e7e4218e8892aea37a64449f1f27 [TRACING] Rename TIT action waitAll -> waitall --- diff --git a/examples/smpi/replay/actions_waitall.txt b/examples/smpi/replay/actions_waitall.txt index 9f69b9e66e..644c26543c 100644 --- a/examples/smpi/replay/actions_waitall.txt +++ b/examples/smpi/replay/actions_waitall.txt @@ -10,9 +10,9 @@ 1 Isend 2 1 3000 2 Isend 0 2 3000 -0 waitAll -1 waitAll -2 waitAll +0 waitall +1 waitall +2 waitall 0 finalize 1 finalize diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh index 8f444e4dfe..e1bd7339a0 100644 --- a/examples/smpi/replay/replay.tesh +++ b/examples/smpi/replay/replay.tesh @@ -342,11 +342,11 @@ $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=replay.thre > [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Isend 0 2 3000 0.000000 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 0 0 2000 0.000000 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Isend 2 1 3000 0.000000 -> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 waitAll 0.000000 +> [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 waitall 0.000000 > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 1 0 2000 0.000000 > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 Irecv 2 2 3000 0.000000 -> [Tremblay:0:(1) 0.003787] [smpi_replay/VERBOSE] 0 waitAll 0.003787 -> [Fafard:2:(3) 0.006220] [smpi_replay/VERBOSE] 2 waitAll 0.006220 +> [Tremblay:0:(1) 0.003787] [smpi_replay/VERBOSE] 0 waitall 0.003787 +> [Fafard:2:(3) 0.006220] [smpi_replay/VERBOSE] 2 waitall 0.006220 > [Fafard:2:(3) 0.006220] [smpi_replay/INFO] Simulation time 0.006220 $ rm -f replay/one_trace diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index 8b675e8b70..e933f6bd73 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -253,7 +253,7 @@ private: RequestStorage& req_storage; public: - explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitAll"), req_storage(storage) {} + explicit WaitAllAction(RequestStorage& storage) : ReplayAction("waitall"), req_storage(storage) {} void kernel(simgrid::xbt::ReplayAction& action) override; }; diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index c3a35b6f4a..48fc023878 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -61,7 +61,7 @@ public: // NoOpTI: init, finalize, test, wait, barrier explicit TIData(std::string name) : name_(name){}; - // CPuTI: compute, sleep (+ waitAny and waitAll out of laziness) + // CPuTI: compute, sleep (+ waitAny and waitall out of laziness) explicit TIData(std::string name, double amount) : name_(name), amount_(amount){}; // Pt2PtTI: send, isend, sssend, issend, recv, irecv explicit TIData(std::string name, int endpoint, int size, std::string datatype) diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index f8e4612425..19e2f997a3 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -737,7 +737,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) } int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null? - TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAll", static_cast(count))); + TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitall", static_cast(count))); int retval = simgrid::smpi::Request::waitall(count, requests, status); diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index f01b7f2e3a..b52b9ba74d 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -522,7 +522,7 @@ void WaitAllAction::kernel(simgrid::xbt::ReplayAction& action) const unsigned int count_requests = req_storage.size(); if (count_requests > 0) { - TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, "")); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, "")); std::vector> sender_receiver; std::vector reqs; req_storage.get_requests(reqs); @@ -723,7 +723,7 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("Irecv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::RecvAction("Irecv", storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("test", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::TestAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("wait", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); - xbt_replay_action_register("waitAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); + xbt_replay_action_register("waitall", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::WaitAllAction(storage[simgrid::s4u::this_actor::get_pid()-1]).execute(action); }); xbt_replay_action_register("barrier", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BarrierAction().execute(action); }); xbt_replay_action_register("bcast", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::BcastAction().execute(action); }); xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceAction().execute(action); });