X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a18fb7c6c81b1f58a9f8111fcf0ade106c4746b..6edd98218de9a7958d1f1a4396a2d460eac2593a:/src/instr/instr_smpi.c diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c index d4fab07c5b..30f1802a72 100644 --- a/src/instr/instr_smpi.c +++ b/src/instr/instr_smpi.c @@ -16,29 +16,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); static xbt_dict_t keys; static const char *smpi_colors[] ={ - "recv", "255 000 000", - "irecv", "255 135 135", - "send", "000 000 255", - "isend", "135 135 255", - "sendrecv", "000 255 255", - "wait", "255 255 000", - "waitall", "200 200 000", - "waitany", "200 200 150", - - "allgather", "255 000 000", - "allgatherv", "255 135 135", - "allreduce", "255 000 255", - "alltoall", "135 000 255", - "alltoallv", "200 135 255", - "barrier", "000 200 200", - "bcast", "000 200 100", - "gather", "255 255 000", - "gatherv", "255 255 135", - "reduce", "000 255 000", - "reducescatter", "135 255 135", - "scan", "255 150 060", - "scatterv", "135 000 135", - "scatter", "255 190 140", + "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", + + "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", + "scatterv", "0.52 0 0.52", + "scatter", "1 0.74 0.54", NULL, NULL, }; @@ -86,7 +86,7 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) } //generate the key static unsigned long long counter = 0; - snprintf(key, n, "%d%d%lld", src, dst, counter++); + snprintf(key, n, "%d%d%llu", src, dst, counter++); //push it char *a = (char*)xbt_strdup(key); @@ -141,17 +141,10 @@ void TRACE_smpi_alloc() process_category = xbt_dict_new_homogeneous(xbt_free); } -void TRACE_smpi_start(void) -{ - TRACE_start(); -} - void TRACE_smpi_release(void) { - if (!TRACE_smpi_is_enabled()) return; - - TRACE_surf_release(); - TRACE_end(); + xbt_dict_free(&keys); + xbt_dict_free(&process_category); } void TRACE_smpi_init(int rank) @@ -163,13 +156,13 @@ void TRACE_smpi_init(int rank) container_t father; if (TRACE_smpi_is_grouped()){ - father = getContainer (SIMIX_host_self_get_name()); + father = PJ_container_get (SIMIX_host_self_get_name()); }else{ - father = getRootContainer (); + father = PJ_container_get_root (); } xbt_assert(father!=NULL, "Could not find a parent for mpi rank %s at function %s", str, __FUNCTION__); - newContainer(str, INSTR_SMPI, father); + PJ_container_new(str, INSTR_SMPI, father); } void TRACE_smpi_finalize(int rank) @@ -177,8 +170,9 @@ void TRACE_smpi_finalize(int rank) if (!TRACE_smpi_is_enabled()) return; char str[INSTR_DEFAULT_STR_SIZE]; - smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - destroyContainer(getContainer (str)); + container_t container = PJ_container_get(smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE)); + PJ_container_remove_from_parent (container); + PJ_container_free (container); } void TRACE_smpi_collective_in(int rank, int root, const char *operation) @@ -187,11 +181,10 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation) char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_STATE", container->type); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); const char *color = instr_find_color (operation); - val_t value = getValue (operation, color, type); - + val_t value = PJ_value_get_or_new (operation, color, type); new_pajePushState (SIMIX_get_clock(), container, type, value); } @@ -201,8 +194,8 @@ void TRACE_smpi_collective_out(int rank, int root, const char *operation) char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_STATE", container->type); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); new_pajePopState (SIMIX_get_clock(), container, type); } @@ -214,11 +207,10 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation) char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_STATE", container->type); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); const char *color = instr_find_color (operation); - val_t value = getValue (operation, color, type); - + val_t value = PJ_value_get_or_new (operation, color, type); new_pajePushState (SIMIX_get_clock(), container, type, value); } @@ -228,8 +220,8 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_STATE", container->type); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); new_pajePopState (SIMIX_get_clock(), container, type); } @@ -239,14 +231,15 @@ void TRACE_smpi_send(int rank, int src, int dst) if (!TRACE_smpi_is_enabled()) return; char key[INSTR_DEFAULT_STR_SIZE]; + bzero (key, INSTR_DEFAULT_STR_SIZE); TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(src, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_LINK", getRootType()); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root()); - new_pajeStartLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key); + new_pajeStartLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); } void TRACE_smpi_recv(int rank, int src, int dst) @@ -254,13 +247,14 @@ void TRACE_smpi_recv(int rank, int src, int dst) if (!TRACE_smpi_is_enabled()) return; char key[INSTR_DEFAULT_STR_SIZE]; + bzero (key, INSTR_DEFAULT_STR_SIZE); TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(dst, str, INSTR_DEFAULT_STR_SIZE); - container_t container = getContainer (str); - type_t type = getType ("MPI_LINK", getRootType()); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root()); - new_pajeEndLink (SIMIX_get_clock(), getRootContainer(), type, container, "PTP", key); + new_pajeEndLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); } #endif /* HAVE_TRACING */