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 <unwind.h>
struct trace_arg {
void **array;
/** @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;
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;
}
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:
while (!found) {
long int first, 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';
#if 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;
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;