X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ed37babb2fa9097abe82df299c0aa259ed84d5a..ab5814bd4ea6117ecf9ac2df328333e89eb45f5f:/src/xbt/exception.cpp

diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 5196c3b4e6..e4d1755bef 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -17,9 +17,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
 
 void _xbt_throw(char* message, const char* file, int line, const char* func)
 {
-  simgrid::Exception e(
-      simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), xbt_procname(), xbt_getpid()),
-      message ? message : "");
+  simgrid::Exception e(simgrid::xbt::ThrowPoint(file, line, func, simgrid::xbt::Backtrace(), sg_actor_self_get_name(),
+                                                sg_actor_self_get_pid()),
+                       message ? message : "");
   xbt_free(message);
   throw e;
 }
@@ -35,9 +35,9 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
   try {
     std::string name = boost::core::demangle(typeid(exception).name());
 
-    auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
+    const auto* with_context = dynamic_cast<const simgrid::Exception*>(&exception);
     if (with_context != nullptr) {
-      XBT_LOG(prio, "%s %s by %s/%d: %s", context, name.c_str(), with_context->throw_point().procname_.c_str(),
+      XBT_LOG(prio, "%s %s by %s/%ld: %s", context, name.c_str(), with_context->throw_point().procname_.c_str(),
               with_context->throw_point().pid_, exception.what());
       // Do we have a backtrace?
       if (not simgrid::config::get_value<bool>("exception/cutpath")) {
@@ -54,7 +54,7 @@ void log_exception(e_xbt_log_priority_t prio, const char* context, std::exceptio
 
   try {
     // Do we have a nested exception?
-    auto* with_nested = dynamic_cast<const std::nested_exception*>(&exception);
+    const auto* with_nested = dynamic_cast<const std::nested_exception*>(&exception);
     if (with_nested != nullptr && with_nested->nested_ptr() != nullptr)
       with_nested->rethrow_nested();
   } catch (const std::exception& nested_exception) {
@@ -103,8 +103,7 @@ XBT_ATTRIB_NORETURN static void handler()
   }
 
   catch (const simgrid::ForcefulKillException&) {
-    XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Maybe a Java->C++ call that is not "
-              "protected in a try/catch?");
+    XBT_ERROR("Received a ForcefulKillException at the top-level exception handler. Please help fix this bug.");
   }
 
   // We don't know how to manage other exceptions