/* 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. */
#include <xbt/string.hpp>
#include <xbt/backtrace.hpp>
#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 */
/** @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
* */
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:
#if HAVE_MC
int xbt_libunwind_backtrace(void** bt, int size){
- int i = 0;
- for(i=0; i < size; i++)
+ for (int i = 0; i < size; i++)
bt[i] = nullptr;
- i=0;
-
unw_cursor_t c;
unw_context_t uc;
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;