X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f3e7df6480d8da4db694b9ba382fa8c416ed916..146af226580d45710f7f242223ea795570a2a738:/src/instr/instr_smpi.c diff --git a/src/instr/instr_smpi.c b/src/instr/instr_smpi.c index 659f4447bf..b16c5ac0d0 100644 --- a/src/instr/instr_smpi.c +++ b/src/instr/instr_smpi.c @@ -5,6 +5,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "instr/instr_private.h" +#include +#include + #ifdef HAVE_TRACING @@ -12,6 +15,60 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_smpi, instr, "Tracing SMPI"); static xbt_dict_t 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", + + "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", + "computing", "0 1 1", + + NULL, NULL, +}; + +static char *str_tolower (const char *str) +{ + char *ret = xbt_strdup (str); + int i, n = strlen (ret); + for (i = 0; i < n; i++) + ret[i] = tolower (str[i]); + return ret; +} + +static const char *instr_find_color (const char *state) +{ + char *target = str_tolower (state); + const char *ret = NULL; + const char *current; + unsigned int i = 0; + while ((current = smpi_colors[i])){ + if (strcmp (state, current) == 0){ ret = smpi_colors[i+1]; break; } //exact match + if (strstr(target, current)) { ret = smpi_colors[i+1]; break; }; //as substring + i+=2; + } + free (target); + return ret; +} + + static char *smpi_container(int rank, char *container, int n) { snprintf(container, n, "rank-%d", rank); @@ -26,11 +83,11 @@ static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) xbt_dynar_t d = xbt_dict_get_or_null(keys, aux); if (d == NULL) { d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); - xbt_dict_set(keys, aux, d, xbt_free); + xbt_dict_set(keys, aux, d, NULL); } //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); @@ -45,10 +102,11 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n) snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); xbt_dynar_t d = xbt_dict_get_or_null(keys, aux); - int length = xbt_dynar_length(d); - char *s = xbt_dynar_get_as (d, length-1, char *); + xbt_assert(!xbt_dynar_is_empty(d), + "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__); + char *s = xbt_dynar_get_as (d, 0, char *); snprintf (key, n, "%s", s); - xbt_dynar_remove_at (d, length-1, NULL); + xbt_dynar_remove_at (d, 0, NULL); return key; } @@ -66,7 +124,7 @@ void TRACE_internal_smpi_set_category (const char *category) if (xbt_dict_get_or_null (process_category, processid)) xbt_dict_remove (process_category, processid); if (category != NULL) - xbt_dict_set (process_category, processid, xbt_strdup(category), xbt_free); + xbt_dict_set (process_category, processid, xbt_strdup(category), NULL); } const char *TRACE_internal_smpi_get_category (void) @@ -80,23 +138,14 @@ const char *TRACE_internal_smpi_get_category (void) void TRACE_smpi_alloc() { - keys = xbt_dict_new(); - process_category = xbt_dict_new(); -} - -void TRACE_smpi_start(void) -{ - if (!TRACE_smpi_is_enabled()) return; - - TRACE_start(); + keys = xbt_dict_new_homogeneous(xbt_free); + process_category = xbt_dict_new_homogeneous(xbt_free); } 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) @@ -108,13 +157,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 = getContainer ("0"); + father = PJ_container_get_root (); } - xbt_assert2(father!=NULL, + 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) @@ -122,8 +171,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) @@ -132,10 +182,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); - val_t value = getValue (operation, "1 1 1", 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 = PJ_value_get_or_new (operation, color, type); new_pajePushState (SIMIX_get_clock(), container, type, value); } @@ -145,9 +195,48 @@ 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); +} + +void TRACE_smpi_computing_init(int rank) +{ + //first use, initialize the color in the trace + //TODO : check with lucas and Pierre how to generalize this approach + //to avoid unnecessary access to the color array + if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_computing()) return; + + char str[INSTR_DEFAULT_STR_SIZE]; + smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); + const char *color = instr_find_color ("computing"); + val_t value = PJ_value_get_or_new ("computing", color, type); + new_pajePushState (SIMIX_get_clock(), container, type, value); +} + +void TRACE_smpi_computing_in(int rank) +{ + //do not forget to set the color first, otherwise this will explode + if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) return; + + char str[INSTR_DEFAULT_STR_SIZE]; + smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); + val_t value = PJ_value_get_or_new ("computing", NULL, type); + new_pajePushState (SIMIX_get_clock(), container, type, value); +} +void TRACE_smpi_computing_out(int rank) +{ + if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) return; + char str[INSTR_DEFAULT_STR_SIZE]; + smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); + container_t container = PJ_container_get (str); + type_t type = PJ_type_get ("MPI_STATE", container->type); new_pajePopState (SIMIX_get_clock(), container, type); } @@ -155,12 +244,13 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation) { if (!TRACE_smpi_is_enabled()) return; + 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); - val_t value = getValue (operation, "1 1 1", 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 = PJ_value_get_or_new (operation, color, type); new_pajePushState (SIMIX_get_clock(), container, type, value); } @@ -170,8 +260,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); } @@ -181,14 +271,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) @@ -196,13 +287,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 */