don't include execinfo.h directly, but using portable.h; only use backtrace() when...

[simgrid.git] / src / xbt / ex.c

diff --git a/src/xbt/ex.c b/src/xbt/ex.c
index 1f0c064..62aa962 100644 (file)
--- a/src/xbt/ex.c
+++ b/src/xbt/ex.c
@@ -31,8 +31,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <execinfo.h>
 
+#include "portable.h" /* execinfo when available */
 #include "xbt/ex.h"
 
 /* default __ex_ctx callback function */
@@ -44,8 +44,6 @@ ex_ctx_t *__xbt_ex_ctx_default(void) {
 
 /* default __ex_terminate callback function */
 void __xbt_ex_terminate_default(xbt_ex_t *e)  {
-  char **strings;
-  size_t i;
 
   fprintf(stderr,
          "** SimGrid: UNCAUGHT EXCEPTION: category: %s; value: %d\n"
@@ -55,6 +53,11 @@ void __xbt_ex_terminate_default(xbt_ex_t *e)  {
          e->procname, (e->host?"@":""),(e->host?e->host:"localhost"),
          e->file,e->line,e->func);
 
+#ifdef HAVE_EXECINFO_H
+ {
+  char **strings;
+  size_t i;
+
   fprintf(stderr,"** Backtrace:\n");
   strings = backtrace_symbols (e->bt, e->used);
 
@@ -62,6 +65,9 @@ void __xbt_ex_terminate_default(xbt_ex_t *e)  {
      printf ("   %s\n", strings[i]);
 
   free (strings);
+ }
+#endif
+
   abort();
 }
 
@@ -71,18 +77,28 @@ ex_term_cb_t __xbt_ex_terminate = &__xbt_ex_terminate_default;
 
 void xbt_ex_free(xbt_ex_t e) {
   free(e.msg);
+  free(e.procname);
 }
 
 /** \brief returns a short name for the given exception category */
 const char * xbt_ex_catname(xbt_errcat_t cat) {
   switch (cat) {
-  case unknown_error: return  "unknown_err";
-  case arg_error:      return "invalid_arg";
-  case mismatch_error: return "mismatch";
-  case system_error:   return "system_err";
-  case network_error:  return "network_err";
-  case timeout_error:  return "timeout";
-  case thread_error:   return "thread_err";
-  default:             return "INVALID_ERR";
+  case unknown_error:   return  "unknown_err";
+  case arg_error:       return "invalid_arg";
+  case mismatch_error:  return "mismatch";
+  case not_found_error: return "not found";
+  case system_error:    return "system_err";
+  case network_error:   return "network_err";
+  case timeout_error:   return "timeout";
+  case thread_error:    return "thread_err";
+  default:              return "INVALID_ERR";
   }
 }
+
+#ifndef HAVE_EXECINFO_H
+/* dummy implementation. We won't use the result, but ex.h needs it to be defined */
+int backtrace (void **__array, int __size) {
+  return 0;
+}
+
+#endif