From c11fb556a8fb48bec2403d962e5dbbb66584d809 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Fri, 20 May 2016 18:54:32 +0200 Subject: [PATCH] [SMPI] Fix segfaults introduced by 772f8dd3b48f0c9dff20f67a4c2ea1cbbe673f8d This changeset fixes tests such as msg-trace-masterworker. --- src/instr/instr_trace.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/instr/instr_trace.cpp b/src/instr/instr_trace.cpp index 149f9371f9..cfa70ee568 100644 --- a/src/instr/instr_trace.cpp +++ b/src/instr/instr_trace.cpp @@ -342,10 +342,11 @@ void new_pajeSetState (double timestamp, container_t container, type_t type, val ((setState_t)(event->data))->container = container; ((setState_t)(event->data))->value = value; - smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); - - ((setState_t)(event->data))->filename = loc->filename; - ((setState_t)(event->data))->linenumber = loc->linenumber; + if (xbt_cfg_get_boolean("smpi/trace-call-location")) { + smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); + ((setState_t)(event->data))->filename = loc->filename; + ((setState_t)(event->data))->linenumber = loc->linenumber; + } XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); @@ -366,9 +367,11 @@ void new_pajePushStateWithExtra (double timestamp, container_t container, type_t ((pushState_t)(event->data))->value = value; ((pushState_t)(event->data))->extra = extra; - smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); - ((pushState_t)(event->data))->filename = loc->filename; - ((pushState_t)(event->data))->linenumber = loc->linenumber; + if (xbt_cfg_get_boolean("smpi/trace-call-location")) { + smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); + ((pushState_t)(event->data))->filename = loc->filename; + ((pushState_t)(event->data))->linenumber = loc->linenumber; + } XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp); -- 2.20.1