X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1228c92443915a8014838a52661ce062bb7a075d..8a9af89e44c0f7f2f648d402e89a26799910ee31:/src/xbt/backtrace_linux.cpp

diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp
index 49ec6a110c..cb8ef6d1cb 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,7 +20,6 @@
 #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 */
@@ -62,7 +60,7 @@ 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
  * */
 
@@ -158,7 +156,7 @@ std::vector<std::string> 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:
@@ -342,26 +340,22 @@ std::vector<std::string> resolveBacktrace(
 
 #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;