X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..37f5b9a91a456e44ca9a312f84201b3c562e90c6:/src/smpi/instr_smpi.c diff --git a/src/smpi/instr_smpi.c b/src/smpi/instr_smpi.c index b4239bed29..6e048ba96e 100644 --- a/src/smpi/instr_smpi.c +++ b/src/smpi/instr_smpi.c @@ -1,13 +1,14 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010, 2012-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "mc/mc.h" #include #include +#include +#include #ifdef HAVE_TRACING @@ -25,6 +26,7 @@ static const char *smpi_colors[] ={ "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", @@ -38,9 +40,15 @@ static const char *smpi_colors[] ={ "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", NULL, NULL, }; @@ -75,21 +83,30 @@ static char *smpi_container(int rank, char *container, int n) return container; } +static char *TRACE_smpi_get_key(int src, int dst, char *key, int n); + + static char *TRACE_smpi_put_key(int src, int dst, char *key, int n) { //get the dynar for src#dst char aux[INSTR_DEFAULT_STR_SIZE]; snprintf(aux, INSTR_DEFAULT_STR_SIZE, "%d#%d", src, dst); xbt_dynar_t d = xbt_dict_get_or_null(keys, aux); + + + if(!xbt_dynar_is_empty(d)){ + //receive was already pushed, perform a get instead + TRACE_smpi_get_key(src , dst, key ,n); + return key; + } + if (d == NULL) { d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); xbt_dict_set(keys, aux, d, NULL); } + //generate the key static unsigned long long counter = 0; - - if(MC_is_active()) - MC_ignore_data_bss(&counter, sizeof(counter)); snprintf(key, n, "%d_%d_%llu", src, dst, counter++); @@ -106,8 +123,15 @@ 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); - xbt_assert(!xbt_dynar_is_empty(d), - "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__); + // xbt_assert(!xbt_dynar_is_empty(d), + // "Trying to get a link key (for message reception) that has no corresponding send (%s).", __FUNCTION__); + + // sometimes the receive may be posted before the send + if(xbt_dynar_is_empty(d)){ + TRACE_smpi_put_key(src, dst, key, n); + return key; + } + char *s = xbt_dynar_get_as (d, 0, char *); snprintf (key, n, "%s", s); xbt_dynar_remove_at (d, 0, NULL); @@ -116,6 +140,16 @@ static char *TRACE_smpi_get_key(int src, int dst, char *key, int n) static xbt_dict_t process_category; +static void cleanup_extra_data (instr_extra_data extra){ + if(extra!=NULL){ + if(extra->sendcounts!=NULL) + xbt_free(extra->sendcounts); + if(extra->recvcounts!=NULL) + xbt_free(extra->recvcounts); + xbt_free(extra); + } +} + void TRACE_internal_smpi_set_category (const char *category) { if (!TRACE_smpi_is_enabled()) return; @@ -142,7 +176,7 @@ const char *TRACE_internal_smpi_get_category (void) void TRACE_smpi_alloc() { - keys = xbt_dict_new_homogeneous(xbt_free); + keys = xbt_dict_new_homogeneous(xbt_dynar_free_voidp); process_category = xbt_dict_new_homogeneous(xbt_free); } @@ -180,9 +214,12 @@ void TRACE_smpi_finalize(int rank) PJ_container_free (container); } -void TRACE_smpi_collective_in(int rank, int root, const char *operation) +void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra) { - if (!TRACE_smpi_is_enabled()) return; + if (!TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + return; + } char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); @@ -190,9 +227,10 @@ void TRACE_smpi_collective_in(int rank, int root, const char *operation) 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); + new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra); } + void TRACE_smpi_collective_out(int rank, int root, const char *operation) { if (!TRACE_smpi_is_enabled()) return; @@ -221,17 +259,20 @@ void TRACE_smpi_computing_init(int rank) new_pajePushState (SIMIX_get_clock(), container, type, value); } -void TRACE_smpi_computing_in(int rank) +void TRACE_smpi_computing_in(int rank, instr_extra_data extra) { //do not forget to set the color first, otherwise this will explode - if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) return; + if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_computing()) { + cleanup_extra_data(extra); + 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); + new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra); } void TRACE_smpi_computing_out(int rank) @@ -244,10 +285,81 @@ void TRACE_smpi_computing_out(int rank) new_pajePopState (SIMIX_get_clock(), container, type); } -void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation) +void TRACE_smpi_sleeping_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_sleeping()) 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 ("sleeping"); + val_t value = PJ_value_get_or_new ("sleeping", color, type); + new_pajePushState (SIMIX_get_clock(), container, type, value); +} + +void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra) +{ + //do not forget to set the color first, otherwise this will explode + if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) { + cleanup_extra_data(extra); + 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 ("sleeping", NULL, type); + new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra); +} + +void TRACE_smpi_sleeping_out(int rank) +{ + if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) 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); +} + + +void TRACE_smpi_testing_in(int rank, instr_extra_data extra) +{ + //do not forget to set the color first, otherwise this will explode + if (!TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + 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 ("test", NULL, type); + new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra); +} + +void TRACE_smpi_testing_out(int rank) { if (!TRACE_smpi_is_enabled()) 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); +} +void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_extra_data extra) +{ + if (!TRACE_smpi_is_enabled()) { + cleanup_extra_data(extra); + return; + } char str[INSTR_DEFAULT_STR_SIZE]; smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE); @@ -255,7 +367,7 @@ void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation) 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); + new_pajePushStateWithExtra (SIMIX_get_clock(), container, type, value, (void*)extra); } void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) @@ -270,12 +382,11 @@ void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation) new_pajePopState (SIMIX_get_clock(), container, type); } -void TRACE_smpi_send(int rank, int src, int dst) +void TRACE_smpi_send(int rank, int src, int dst, int size) { if (!TRACE_smpi_is_enabled()) return; - char key[INSTR_DEFAULT_STR_SIZE]; - bzero (key, INSTR_DEFAULT_STR_SIZE); + char key[INSTR_DEFAULT_STR_SIZE] = {0}; TRACE_smpi_put_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); char str[INSTR_DEFAULT_STR_SIZE]; @@ -283,15 +394,14 @@ void TRACE_smpi_send(int rank, int src, int dst) container_t container = PJ_container_get (str); type_t type = PJ_type_get ("MPI_LINK", PJ_type_get_root()); - new_pajeStartLink (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key); + new_pajeStartLinkWithSize (SIMIX_get_clock(), PJ_container_get_root(), type, container, "PTP", key, size); } 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); + char key[INSTR_DEFAULT_STR_SIZE] = {0}; TRACE_smpi_get_key(src, dst, key, INSTR_DEFAULT_STR_SIZE); char str[INSTR_DEFAULT_STR_SIZE];