X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baebdceda7d5a8232effba9ace34c0c6c1dadac3..d938d09d362186118485ebc3ad0a9d9ce4079bfa:/src/smpi/smpi_pmpi.c diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c index 86cb9d2856..67499281b2 100644 --- a/src/smpi/smpi_pmpi.c +++ b/src/smpi/smpi_pmpi.c @@ -13,26 +13,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, #ifdef HAVE_TRACING //this function need to be here because of the calls to smpi_bench -int TRACE_smpi_set_category(const char *category) +void TRACE_smpi_set_category(const char *category) { //need to end bench otherwise categories for execution tasks are wrong smpi_bench_end(); - int ret; - if (!IS_TRACING){ - ret = 1; - }else{ - if (category != NULL) { - ret = TRACE_category(category); - TRACE_category_set(SIMIX_process_self(), category); - }else{ - //if category is NULL, trace of platform is disabled for this process - TRACE_category_unset(SIMIX_process_self()); - ret = 0; - } - } + TRACE_internal_smpi_set_category (category); //begin bench after changing process's category smpi_bench_begin(); - return ret; } #endif @@ -101,7 +88,7 @@ int PMPI_Abort(MPI_Comm comm, int errorcode) smpi_bench_end(); smpi_process_destroy(); // FIXME: should kill all processes in comm instead - SIMIX_process_kill(SIMIX_process_self()); + SIMIX_req_process_kill(SIMIX_process_self()); return MPI_SUCCESS; }