hopefully fixes for backtrace handling

[senf.git] / senf / Scheduler / FIFORunner.cc

diff --git a/senf/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc
index 915d853..295e10e 100644 (file)
--- a/senf/Scheduler/FIFORunner.cc
+++ b/senf/Scheduler/FIFORunner.cc
@@ -30,14 +30,13 @@
 #include <signal.h>
 #include <time.h>
 #include <cassert>
-#ifdef SENF_DEBUG
+#include <senf/config.hh>
+#ifdef SENF_BACKTRACE
     #include <execinfo.h>
 #endif
-#include <senf/config.hh>
 #include <stdint.h>
 #include <stdio.h>
 #include <senf/Utils/Exception.hh>
-#include <senf/Utils/senfassert.hh>
 #include "senf/Utils/IgnoreValue.hh"
 #include <senf/Utils/Console/ScopedDirectory.hh>
 #include <senf/Utils/Console/ParsedCommand.hh>
@@ -229,9 +228,9 @@ prefix_ void senf::scheduler::detail::FIFORunner::run(TaskList::iterator f, Task
             if (task.runnable_) {
                 task.runnable_ = false;
                 runningName_ = task.name();
-    #       ifdef SENF_DEBUG
+# ifdef SENF_BACKTRACE
                 runningBacktrace_ = task.backtrace_;
-    #       endif
+# endif
                 TaskList::iterator i (next_);
                 ++ next_;
                 tasks_.splice(l, tasks_, i);
@@ -291,12 +290,12 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
     senf::IGNORE( write(1, "): ", 3) );
     senf::IGNORE( write(1, runningName_.c_str(), runningName_.size()) );
     senf::IGNORE( write(1, " at\n ", 3) );
-#ifdef SENF_DEBUG
+#ifdef SENF_BACKTRACE
     static char const hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                                 'a', 'b', 'c', 'd', 'e', 'f' };
     static void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
-    unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
-    for (unsigned i (0); i < nEntries; ++i) {
+    int nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
+    for (int i=0; i < nEntries; ++i) {
         senf::IGNORE( write(1, " 0x", 3) );
         for (unsigned j (sizeof(void*)); j > 0; --j) {
             uintptr_t v ( reinterpret_cast<uintptr_t>(entries[i]) >> (8*(j-1)) );
@@ -307,7 +306,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::watchdogError()
 #endif
     senf::IGNORE( write(1, "\n", 1) );
 
-#ifdef SENF_DEBUG
+#ifdef SENF_BACKTRACE
     senf::IGNORE( write(1, "Task was initialized at\n", 24) );
     senf::IGNORE( write(1, runningBacktrace_.c_str(), runningBacktrace_.size()) );
 #endif