X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be3bc4127b2e514da9b6d4baab02e3cc22a5617a..8f1ee3e1004fed6acef03da662a0590da900a7d8:/include/simgrid/Exception.hpp

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index 7a2ba1ed83..675d959f66 100644
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -14,6 +14,7 @@
 #include <xbt/backtrace.hpp>
 #include <xbt/ex.h>
 
+#include <atomic>
 #include <stdexcept>
 #include <string>
 
@@ -33,7 +34,7 @@ class ThrowPoint {
 public:
   ThrowPoint() = default;
   explicit ThrowPoint(const char* file, int line, const char* function, Backtrace bt, std::string actor_name, int pid)
-      : file_(file), line_(line), function_(function), backtrace_(bt), procname_(actor_name), pid_(pid)
+      : file_(file), line_(line), function_(function), backtrace_(std::move(bt)), procname_(actor_name), pid_(pid)
   {
   }
 
@@ -47,7 +48,8 @@ public:
 
 /** Create a ThrowPoint with (__FILE__, __LINE__, __func__) */
 #define XBT_THROW_POINT                                                                                                \
-  ::simgrid::xbt::ThrowPoint(__FILE__, __LINE__, __func__, simgrid::xbt::backtrace(), xbt_procname(), xbt_getpid())
+  ::simgrid::xbt::ThrowPoint(__FILE__, __LINE__, __func__, std::move(simgrid::xbt::Backtrace()), xbt_procname(),       \
+                             xbt_getpid())
 } // namespace xbt
 
 /** Ancestor class of all SimGrid exception */
@@ -61,6 +63,8 @@ public:
   /** Return the information about where the exception was thrown */
   xbt::ThrowPoint const& throw_point() const { return throwpoint_; }
 
+  std::string const resolve_backtrace() const { return throwpoint_.backtrace_.resolve(); }
+
 private:
   xbt::ThrowPoint throwpoint_;
 };
@@ -88,6 +92,8 @@ public:
    * @param message    Exception message
    */
   xbt_ex(simgrid::xbt::ThrowPoint throwpoint, std::string message) : simgrid::Exception(throwpoint, message) {}
+  
+  xbt_ex(const xbt_ex&) = default;
 
   ~xbt_ex(); // DO NOT define it here -- see ex.cpp for a rationale
 
@@ -109,7 +115,7 @@ public:
   }
 };
 
-/** Exception raised when an host fails */
+/** Exception raised when a host fails */
 class HostFailureException : public xbt_ex {
 public:
   HostFailureException(simgrid::xbt::ThrowPoint throwpoint, std::string message) : xbt_ex(throwpoint, message)
@@ -120,6 +126,11 @@ public:
 
 /** Exception raised when a communication fails because of the network */
 class NetworkFailureException : public xbt_ex {
+public:
+  NetworkFailureException(simgrid::xbt::ThrowPoint throwpoint, std::string message) : xbt_ex(throwpoint, message)
+  {
+    category = network_error;
+  }
 };
 
 /** Exception raised when something got canceled before completion */