X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/892e136b3be07e45110a5a2db2889470386e954a..1d04f47ddcc46f37eca622ca5a343c7197115990:/src/xbt/ex.cpp

diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp
index 821d1acbdf..d2061eba8c 100644
--- a/src/xbt/ex.cpp
+++ b/src/xbt/ex.cpp
@@ -45,8 +45,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <xbt/backtrace.hpp>
 #include "src/internal_config.h"           /* execinfo when available */
 #include "xbt/ex.h"
+#include <xbt/ex.hpp>
+#include "xbt/log.h"
+#include "xbt/log.hpp"
+#include "xbt/backtrace.h"
+#include "xbt/backtrace.hpp"
 #include "xbt/str.h"
 #include "xbt/synchro_core.h"
 #include "src/xbt_modinter.h"       /* backtrace initialization headers */
@@ -56,129 +62,47 @@
 
 #include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
 
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism");
 
 xbt_ex::~xbt_ex() {}
 
 /* Change raw libc symbols to file names and line numbers */
-void xbt_ex_setup_backtrace(xbt_ex_t * e);
+void xbt_setup_backtrace(xbt_backtrace_location_t** loc, std::size_t count,
+  char** res);
 
-void xbt_backtrace_display(xbt_ex_t * e)
+void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count)
 {
-  // TODO, backtrace
-#if 0
-  xbt_ex_setup_backtrace(e);
-
 #ifdef HAVE_BACKTRACE
-  if (e->bt_strings.empty()) {
+  std::vector<std::string> backtrace =
+    simgrid::xbt::resolveBacktrace(loc, count);
+  if (backtrace.empty()) {
     fprintf(stderr, "(backtrace not set)\n");
-  } else {
-    fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name());
-    for (std::string const& s : e->bt_strings) /* no need to display "xbt_backtrace_display" */
-      fprintf(stderr, "---> %s\n", s.c_str() + 4);
+    return;
   }
-  xbt_ex_free(*e);
+  fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name());
+  for (std::string const& s : backtrace)
+    fprintf(stderr, "---> %s\n", s.c_str());
 #else
   XBT_ERROR("No backtrace on this arch");
 #endif
-  #endif
-}
-
-/** \brief show the backtrace of the current point (lovely while debuging) */
-void xbt_backtrace_display_current(void)
-{
-  xbt_ex_t e;
-  xbt_backtrace_current(&e);
-  xbt_backtrace_display(&e);
 }
 
-#if HAVE_BACKTRACE && HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
-# include "src/xbt/backtrace_linux.c"
-#else
-# include "src/xbt/backtrace_dummy.c"
-#endif
-
-void xbt_throw(
+void _xbt_throw(
   char* message, xbt_errcat_t errcat, int value, 
   const char* file, int line, const char* func)
 {
-  xbt_ex e(message);
+  xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func), message);
   free(message);
   e.category = errcat;
   e.value = value;
-  e.file = file;
-  e.line = line;
-  e.func = func;
-  e.procname = xbt_procname();
-  e.pid = xbt_getpid();
   throw e;
 }
 
 /** @brief shows an exception content and the associated stack if available */
 void xbt_ex_display(xbt_ex_t * e)
 {
-  char *thrower = NULL;
-  if (e->pid != xbt_getpid())
-    thrower = bprintf(" on process %d",e->pid);
-
-  fprintf(stderr, "** SimGrid: UNCAUGHT EXCEPTION received on %s(%d): category: %s; value: %d\n"
-          "** %s\n"
-          "** Thrown by %s()%s\n",
-          xbt_binary_name, xbt_getpid(), xbt_ex_catname(e->category), e->value, e->what(),
-          e->procname.c_str(), thrower ? thrower : " in this process");
-  XBT_CRITICAL("%s", e->what());
-  xbt_free(thrower);
-
-  if (xbt_initialized==0 || smx_cleaned) {
-    fprintf(stderr, "Ouch. SimGrid is not initialized yet, or already closing. No backtrace available.\n");
-    return; /* Not started yet or already closing. Trying to generate a backtrace would probably fail */
-  }
-
-  if (e->bt_strings.empty())
-    xbt_ex_setup_backtrace(e);
-
-#ifdef HAVE_BACKTRACE
-  if (!e->bt.empty() && !e->bt_strings.empty()) {
-    /* We have everything to build neat backtraces */
-    int cutpath = 0;
-    try { // We don't want to have an exception while checking how to deal with the one we already have, do we?
-      cutpath = xbt_cfg_get_boolean("exception/cutpath");
-    }
-    catch(xbt_ex& e) {
-      // Nothing to do
-    }
-
-    fprintf(stderr, "\n");
-    for (std::string const& s : e->bt_strings) {
-
-      if (cutpath) {
-        // TODO, backtrace
-        /*
-        char* p = e->bt_strings[i];
-        xbt_str_rtrim(p, ":0123456789");
-        char* filename = strrchr(p, '/')+1;
-        char* end_of_message  = strrchr(p, ' ');
-
-        int length = strlen(p)-strlen(end_of_message);
-        char* dest = malloc(length);
-
-        memcpy(dest, &p[0], length);
-        dest[length] = 0;
-
-        fprintf(stderr, "%s %s\n", dest, filename);
-
-        free(dest);
-        */
-      }
-      else {
-        fprintf(stderr, "%s\n", s.c_str());
-      }
-    }
-  } else
-#endif
-    fprintf(stderr, "\n"
-        "**   In %s() at %s:%d\n"
-        "**   (no backtrace available)\n", e->func, e->file, e->line);
+  simgrid::xbt::logException(xbt_log_priority_critical, "UNCAUGHT EXCEPTION", *e);
 }
 
 /** \brief returns a short name for the given exception category */
@@ -220,6 +144,7 @@ const char *xbt_ex_catname(xbt_errcat_t cat)
 #ifdef SIMGRID_TEST
 #include <stdio.h>
 #include "xbt/ex.h"
+#include <xbt/ex.hpp>
 
 XBT_TEST_SUITE("xbt_ex", "Exception Handling");