Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index d0384513a9a742ba37f326776b05675cf9bb4a06..feb99909ebb3acf6b0503c6a05c85b2b2ff7eed9 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,6 +7,8 @@
 #ifndef _SIMIX_PRIVATE_H
 #define _SIMIX_PRIVATE_H
 
+#include <functional>
+
 #include "src/internal_config.h"
 #include "simgrid/simix.h"
 #include "surf/surf.h"
@@ -82,11 +84,16 @@ XBT_PUBLIC(void) SIMIX_clean(void);
 
 /******************************** Exceptions *********************************/
 /** @brief Ask to the provided simix process to raise the provided exception */
-#define SMX_EXCEPTION(issuer, cat, val, msg)                            \
-  if (1) {                                                              \
-    smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */\
-    THROW_PREPARE(_smx_throw_issuer->running_ctx, (cat), (val), xbt_strdup(msg)); \
-    _smx_throw_issuer->doexception = 1;                                 \
+#define SMX_EXCEPTION(issuer, cat, val, msg) \
+  if (1) { \
+  smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
+  xbt_ex e(msg); \
+  e.category = cat; \
+  e.value = val; \
+  e.file = __FILE__; \
+  e.line = __LINE__; \
+  e.func = __func__; \
+  _smx_throw_issuer->exception = std::make_exception_ptr(e); \
   } else ((void)0)
 
 /* ******************************** File ************************************ */
@@ -99,7 +106,7 @@ XBT_PRIVATE void SIMIX_context_mod_init(void);
 XBT_PRIVATE void SIMIX_context_mod_exit(void);
 
 XBT_PRIVATE smx_context_t SIMIX_context_new(
-  xbt_main_func_t code, int argc, char **argv,
+  std::function<void()> code,
   void_pfn_smxprocess_t cleanup_func,
   smx_process_t simix_process);