X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..a39d19f655f4f30d3672e25d2003482867164559:/src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 6d219aa848..9cbfea5639 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2012-2017. The SimGrid Team. +/* Copyright (c) 2010-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,37 +10,119 @@ #include #include #include -#include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); static std::unordered_map*> keys; -static const char* smpi_colors[] = { - "recv", "1 0 0", "irecv", "1 0.52 0.52", "send", "0 0 1", - "isend", "0.52 0.52 1", "sendrecv", "0 1 1", "wait", "1 1 0", - "waitall", "0.78 0.78 0", "waitany", "0.78 0.78 0.58", "test", "0.52 0.52 0", - - "allgather", "1 0 0", "allgatherv", "1 0.52 0.52", "allreduce", "1 0 1", - "alltoall", "0.52 0 1", "alltoallv", "0.78 0.52 1", "barrier", "0 0.78 0.78", - "bcast", "0 0.78 0.39", "gather", "1 1 0", "gatherv", "1 1 0.52", - "reduce", "0 1 0", "reducescatter", "0.52 1 0.52", "scan", "1 0.58 0.23", - "exscan", "1 0.54 0.25", "scatterv", "0.52 0 0.52", "scatter", "1 0.74 0.54", - - "computing", "0 1 1", "sleeping", "0 0.5 0.5", - - "init", "0 1 0", "finalize", "0 1 0", - - "put", "0.3 1 0", "get", "0 1 0.3", "accumulate", "1 0.3 0", - "rput", "0.3 1 0", "rget", "0 1 0.3", "raccumulate", "1 0.3 0", - "compare_and_swap", "0.3 1 0", "get_accumulate", "0 1 0.3", "rget_accumulate", "1 0.3 0", - "win_fence", "1 0 0.3", "win_post", "1 0 0.8", "win_wait", "1 0.8 0", - "win_start", "0.8 0 1", "win_complete", "0.8 1 0", "win_lock", "1 0 0.3", - "win_unlock", "1 0 0.3", "win_lock_all", "1 0 0.8", "win_unlock_all", "1 0.8 0", - "win_flush", "1 0 0.3", "win_flush_local", "1 0 0.8", "win_flush_all", "1 0.8 0", - "win_flush_local_all", "1 0 0.3", "" , "" -}; +static const char* smpi_colors[] = {"recv", + "1 0 0", + "irecv", + "1 0.52 0.52", + "send", + "0 0 1", + "isend", + "0.52 0.52 1", + "sendrecv", + "0 1 1", + "wait", + "1 1 0", + "waitall", + "0.78 0.78 0", + "waitany", + "0.78 0.78 0.58", + "test", + "0.52 0.52 0", + + "allgather", + "1 0 0", + "allgatherv", + "1 0.52 0.52", + "allreduce", + "1 0 1", + "alltoall", + "0.52 0 1", + "alltoallv", + "0.78 0.52 1", + "barrier", + "0 0.78 0.78", + "bcast", + "0 0.78 0.39", + "gather", + "1 1 0", + "gatherv", + "1 1 0.52", + "reduce", + "0 1 0", + "reducescatter", + "0.52 1 0.52", + "scan", + "1 0.58 0.23", + "exscan", + "1 0.54 0.25", + "scatterv", + "0.52 0 0.52", + "scatter", + "1 0.74 0.54", + + "computing", + "0 1 1", + "sleeping", + "0 0.5 0.5", + + "init", + "0 1 0", + "finalize", + "0 1 0", + + "put", + "0.3 1 0", + "get", + "0 1 0.3", + "accumulate", + "1 0.3 0", + "rput", + "0.3 1 0", + "rget", + "0 1 0.3", + "raccumulate", + "1 0.3 0", + "compare_and_swap", + "0.3 1 0", + "get_accumulate", + "0 1 0.3", + "rget_accumulate", + "1 0.3 0", + "win_fence", + "1 0 0.3", + "win_post", + "1 0 0.8", + "win_wait", + "1 0.8 0", + "win_start", + "0.8 0 1", + "win_complete", + "0.8 1 0", + "win_lock", + "1 0 0.3", + "win_unlock", + "1 0 0.3", + "win_lock_all", + "1 0 0.8", + "win_unlock_all", + "1 0.8 0", + "win_flush", + "1 0 0.3", + "win_flush_local", + "1 0 0.8", + "win_flush_all", + "1 0.8 0", + "win_flush_local_all", + "1 0 0.3", + "", + ""}; static const char* instr_find_color(const char* state) { @@ -155,12 +237,10 @@ void TRACE_smpi_init(int rank) }else{ father = simgrid::instr::Container::getRoot(); } - xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __FUNCTION__); -#if HAVE_PAPI - container_t container = -#endif - new simgrid::instr::Container(str, "MPI", father); + xbt_assert(father != nullptr, "Could not find a parent for mpi rank %s at function %s", str.c_str(), __func__); + father->createChild(str, "MPI"); #if HAVE_PAPI + container_t container = simgrid::instr::Container::byName(str); papi_counter_t counters = smpi_process()->papi_counters(); for (auto const& it : counters) { @@ -180,9 +260,7 @@ void TRACE_smpi_finalize(int rank) if (not TRACE_smpi_is_enabled()) return; - container_t container = smpi_container(rank); - container->removeFromParent(); - delete container; + smpi_container(rank)->removeFromParent(); } void TRACE_smpi_computing_init(int rank) @@ -206,13 +284,6 @@ void TRACE_smpi_computing_out(int rank) smpi_container(rank)->getState("MPI_STATE")->popEvent(); } -void TRACE_smpi_sleeping_init(int rank) -{ - //first use, initialize the color in the trace - if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) - smpi_container(rank)->getState("MPI_STATE")->addEntityValue("sleeping", instr_find_color("sleeping")); -} - void TRACE_smpi_sleeping_in(int rank, double duration) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping())