Getting rid of C exceptions

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

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index 22af111..87c9b10 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include <xbt/base.h>
+#include <xbt/string.hpp>
 
 #include <simgrid/simix.hpp>
 #include "simgrid/simix.h"
@@ -46,13 +47,12 @@ public:
 
   unsigned long pid = 0;
   unsigned long ppid = 0;
-  std::string name;
+  simgrid::xbt::string name;
   sg_host_t host = nullptr;     /* the host on which the process is running */
   smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
-  xbt_running_ctx_t *running_ctx = nullptr;
 
   // TODO, pack them
-  bool doexception = false;
+  std::exception_ptr exception;
   bool blocked = false;
   bool suspended = false;
   bool auto_restart = false;
@@ -96,7 +96,6 @@ XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg);
 XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg);
 XBT_PRIVATE void SIMIX_process_empty_trash(void);
 XBT_PRIVATE void SIMIX_process_yield(smx_process_t self);
-XBT_PRIVATE xbt_running_ctx_t *SIMIX_process_get_running_context(void);
 XBT_PRIVATE void SIMIX_process_exception_terminate(xbt_ex_t * e);
 XBT_PRIVATE void SIMIX_process_change_host(smx_process_t process,
              sg_host_t dest);
@@ -118,8 +117,8 @@ XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_synchro_t synchro);
 XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart);
 XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer);
 
-void SIMIX_segment_index_set(smx_process_t, int);
-extern void (*SMPI_switch_data_segment)(int);
+void SIMIX_segment_index_set(smx_process_t process, int segment_index);
+extern void (*SMPI_switch_data_segment)(int dest);
 
 SG_END_DECL()