From 765ca7ac3efd59d260163fa0a7d34ee2eb674f47 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 7 Jun 2017 09:20:13 +0200 Subject: [PATCH] Reduce the displayed backtrace --- src/xbt/backtrace.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp index fa82b4d617..022ae52a55 100644 --- a/src/xbt/backtrace.cpp +++ b/src/xbt/backtrace.cpp @@ -1,10 +1,11 @@ -/* Copyright (c) 2005-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2005-2017. 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. */ #include #include +#include #include @@ -27,6 +28,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace"); } +static bool startWith(std::string str, const char* prefix) +{ + return strncmp(str.c_str(), prefix, strlen(prefix)) == 0; +} + void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count) { #ifdef HAVE_BACKTRACE @@ -36,8 +42,15 @@ void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count) return; } fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name()); - for (std::string const& s : backtrace) - fprintf(stderr, "---> %s\n", s.c_str()); + for (std::string const& s : backtrace) { + if (startWith(s, "xbt_backtrace_display_current")) + continue; + + std::fprintf(stderr, "---> '%s'\n", s.c_str()); + if (startWith(s, "SIMIX_simcall_handle") || + startWith(s, "simgrid::xbt::MainFunction") /* main used with thread factory */) + break; + } #else XBT_ERROR("Cannot display backtrace when compiled without libunwind."); #endif -- 2.20.1