cxxabi: abort_message: Add info about dispatcher, core id and thread id.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/lib/cxx/cxxabi/abort_message.cpp b/lib/cxx/cxxabi/abort_message.cpp
index 3158ada..d0c7497 100644 (file)
--- a/lib/cxx/cxxabi/abort_message.cpp
+++ b/lib/cxx/cxxabi/abort_message.cpp
@@ -26,6 +26,19 @@
 #   endif
 #endif
 
+#ifdef BARRELFISH
+// XXX: do not want to include <barrelfish/domain.h> <barrelfish/dispatch.h>
+// and <barrelfish/threads.h> here, so we give the plain declarations for the
+// functions we need to get Barrelfish styling in the abort message.
+// -SG, 2015-02-18
+#define DISP_NAME_LEN   16
+extern "C" {
+extern const char *disp_name(void);
+extern coreid_t disp_get_core_id(void);
+extern uintptr_t thread_id(void);
+}
+#endif
+
 __attribute__((visibility("hidden"), noreturn))
 void abort_message(const char* format, ...)
 {
@@ -33,6 +46,13 @@ void abort_message(const char* format, ...)
 #if __APPLE__
     fprintf(stderr, "libc++abi.dylib: ");
 #endif
+
+#ifdef BARRELFISH
+    // use Barrelfish debug_printf style to get info about dispatcher and
+    // thread.
+    fprintf(stderr, "\033[34m%.*s.\033[31m%u.%lu\033[0m: ", DISP_NAME_LEN,
+            disp_name(), disp_get_core_id(), thread_id());
+#endif
     va_list list;
     va_start(list, format);
     vfprintf(stderr, format, list);