From 4f71cacf02b2aedd0d6c546f908f48a71014913d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 11 Jan 2019 13:32:10 +0100 Subject: [PATCH] Slightly simplify logic. --- src/smpi/internals/smpi_global.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index c337d3e9d5..3eca3f2fad 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -323,17 +323,15 @@ void smpi_global_init() int event_code = PAPI_NULL; char* event_name = const_cast((*events_it).c_str()); - if (PAPI_event_name_to_code(event_name, &event_code) == PAPI_OK) { - if (PAPI_add_event(event_set, event_code) != PAPI_OK) { - XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name); - continue; - } else { - XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name); - } - } else { + if (PAPI_event_name_to_code(event_name, &event_code) != PAPI_OK) { XBT_CRITICAL("Could not find PAPI event '%s'. Skipping.", event_name); continue; } + if (PAPI_add_event(event_set, event_code) != PAPI_OK) { + XBT_ERROR("Could not add PAPI event '%s'. Skipping.", event_name); + continue; + } + XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name); counters2values.push_back( // We cannot just pass *events_it, as this is of type const basic_string -- 2.20.1