X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/931c72e9293d64a1797a6187dd0e744408c23d59..a92d7b716f51a53dea7f59db8524d4add713b910:/src/xbt/backtrace_linux.cpp diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp index 80cd509da3..c61c519e8b 100644 --- a/src/xbt/backtrace_linux.cpp +++ b/src/xbt/backtrace_linux.cpp @@ -1,8 +1,7 @@ /* backtrace_linux - backtrace displaying on linux platform */ /* This file is included by ex.cpp on need (have execinfo.h, popen & addrline)*/ -/* Copyright (c) 2008-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-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. */ @@ -21,12 +20,11 @@ #include #include #include "xbt/ex.h" -#include "src/xbt/ex_interface.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/module.h" /* xbt_binary_name */ #include "src/xbt_modinter.h" /* backtrace initialization headers */ -#if HAVE_MC +#if SIMGRID_HAVE_MC #define UNW_LOCAL_ONLY #include #endif @@ -34,19 +32,11 @@ extern char **environ; /* the environment, as specified by the opengroup */ -/* Module creation/destruction: nothing to do on linux */ -void xbt_backtrace_preinit(void) -{ -} - -void xbt_backtrace_postexit(void) -{ -} - #include struct trace_arg { - void **array; - int cnt, size; + void** array; + int cnt; + int size; }; static _Unwind_Reason_Code @@ -71,14 +61,14 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a) /** @brief reimplementation of glibc backtrace based directly on gcc library, without implicit malloc * - * See http://webloria.loria.fr/~quinson/blog/2012/0208/system_programming_fun_in_SimGrid/ + * See http://people.irisa.fr/Martin.Quinson/blog/2012/0208/system_programming_fun_in_SimGrid/ * for the motivation behind this function * */ int xbt_backtrace_no_malloc(void **array, int size) { int i = 0; for(i=0; i < size; i++) - array[i] = NULL; + array[i] = nullptr; struct trace_arg arg; arg .array = array; @@ -88,9 +78,9 @@ int xbt_backtrace_no_malloc(void **array, int size) { if (size >= 1) _Unwind_Backtrace(backtrace_helper, &arg); - /* _Unwind_Backtrace on IA-64 seems to put NULL address above + /* _Unwind_Backtrace on IA-64 seems to put nullptr address above _start. Fix it up here. */ - if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) + if (arg.cnt > 1 && arg.array[arg.cnt - 1] == nullptr) --arg.cnt; return arg.cnt != -1 ? arg.cnt : 0; } @@ -167,7 +157,7 @@ std::vector resolveBacktrace( if (binary_name.empty()) { for (std::size_t i = 0; i < count; i++) result.push_back(simgrid::xbt::string_printf("%p", loc[i])); - return std::move(result); + return result; } // Create the system command for add2line: @@ -196,12 +186,13 @@ std::vector resolveBacktrace( XBT_VERB("Fire a first command: '%s'", cmd.c_str()); FILE* pipe = popen(cmd.c_str(), "r"); - if (!pipe) { + if (not pipe) { xbt_die("Cannot fork addr2line to display the backtrace"); } /* To read the output of addr2line */ - char line_func[1024], line_pos[1024]; + char line_func[1024]; + char line_pos[1024]; for (std::size_t i = 0; i < count; i++) { XBT_DEBUG("Looking for symbol %zd, addr = '%s'", i, addrs[i].c_str()); if (fgets(line_func, 1024, pipe)) { @@ -228,7 +219,8 @@ std::vector resolveBacktrace( char maps_buff[512]; long int offset = 0; - char *p, *p2; + char* p; + char* p2; int found = 0; /* let's look for the offset of this library in our addressing space */ @@ -243,10 +235,11 @@ std::vector resolveBacktrace( XBT_DEBUG("addr=%s (as string) =%#lx (as number)", addrs[i].c_str(), addr); - while (!found) { - long int first, last; + while (not found) { + long int first; + long int last; - if (fgets(maps_buff, 512, maps) == NULL) + if (fgets(maps_buff, 512, maps) == nullptr) break; if (i == 0) { maps_buff[strlen(maps_buff) - 1] = '\0'; @@ -268,7 +261,7 @@ std::vector resolveBacktrace( free(maps_name); addrs[i].clear(); - if (!found) { + if (not found) { XBT_VERB("Problem while reading the maps file. Following backtrace will be mangled."); XBT_DEBUG("No dynamic. Static symbol: %s", backtrace_syms[i]); result.push_back(simgrid::xbt::string_printf("?? (%s)", backtrace_syms[i])); @@ -301,7 +294,7 @@ std::vector resolveBacktrace( free(p); XBT_VERB("Fire a new command: '%s'", subcmd); FILE* subpipe = popen(subcmd, "r"); - if (!subpipe) { + if (not subpipe) { xbt_die("Cannot fork addr2line to display the backtrace"); } if (fgets(line_func, 1024, subpipe)) { @@ -336,9 +329,9 @@ std::vector resolveBacktrace( addrs[i].clear(); /* Mask the bottom of the stack */ - if (!strncmp("main", line_func, strlen("main")) || - !strncmp("xbt_thread_context_wrapper", line_func, strlen("xbt_thread_context_wrapper")) - || !strncmp("smx_ctx_sysv_wrapper", line_func, strlen("smx_ctx_sysv_wrapper"))) + if (not strncmp("main", line_func, strlen("main")) || + not strncmp("xbt_thread_context_wrapper", line_func, strlen("xbt_thread_context_wrapper")) || + not strncmp("smx_ctx_sysv_wrapper", line_func, strlen("smx_ctx_sysv_wrapper"))) break; } pclose(pipe); @@ -349,13 +342,10 @@ std::vector resolveBacktrace( } } -#if HAVE_MC +#if SIMGRID_HAVE_MC int xbt_libunwind_backtrace(void** bt, int size){ - int i = 0; - for(i=0; i < size; i++) - bt[i] = NULL; - - i=0; + for (int i = 0; i < size; i++) + bt[i] = nullptr; unw_cursor_t c; unw_context_t uc; @@ -363,14 +353,13 @@ int xbt_libunwind_backtrace(void** bt, int size){ unw_getcontext (&uc); unw_init_local (&c, &uc); - unw_word_t ip; - unw_step(&c); - while(unw_step(&c) >= 0 && i < size){ + int i; + for (i = 0; unw_step(&c) >= 0 && i < size; i++) { + unw_word_t ip; unw_get_reg(&c, UNW_REG_IP, &ip); bt[i] = (void*)(long)ip; - i++; } return i;