X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2df13795e01302813a6aef10825ec7e922ce530..194df46818e3f10278130de231015fb42a6b29f7:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index db37ffb679..34cf63e69a 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -33,6 +33,9 @@
 //#define TIME_BENCH_PER_SR /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */
 //#define TIME_BENCH_AMDAHL /* this aims at measuring the porting of time that could be parallelized at maximum (to get the optimal speedup by applying the amdahl law). */
 
+#ifdef TIME_BENCH_PER_SR
+void smx_ctx_raw_new_sr(void);
+#endif
 /********************************** Simix Global ******************************/
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
@@ -62,17 +65,17 @@ extern xbt_dict_t watched_hosts_lib;
 #ifdef __cplusplus
 extern "C" {
 #endif
-void SIMIX_clean(void);
+XBT_PUBLIC(void) SIMIX_clean(void);
 #ifdef __cplusplus
 }
 #endif
 
 /******************************** Exceptions *********************************/
-
-#define SMX_EXCEPTION(issuer, c, v, m)                                  \
+/** @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);                         \
-    THROW_PREPARE(_smx_throw_issuer->running_ctx, (c), (v), xbt_strdup(m)); \
+    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;                                 \
   } else ((void)0)
 
@@ -99,6 +102,7 @@ typedef enum {
   SIMIX_ACTION_EXECUTE,
   SIMIX_ACTION_PARALLEL_EXECUTE,
   SIMIX_ACTION_COMMUNICATE,
+  SIMIX_ACTION_JOIN,
   SIMIX_ACTION_SLEEP,
   SIMIX_ACTION_SYNCHRO,
   SIMIX_ACTION_IO,
@@ -154,6 +158,7 @@ typedef struct s_smx_action {
       int (*match_fun)(void*,void*,smx_action_t);  /* Filter function used by the other side. It is used when
                                          looking if a given communication matches my needs. For that, myself must match the
                                          expectations of the other side, too. See  */
+      void (*copy_data_fun) (smx_action_t, void*, size_t);
 
       /* Surf action data */
       surf_action_t surf_comm;        /* The Surf communication action encapsulated */
@@ -209,7 +214,9 @@ typedef struct s_smx_action {
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 
+#ifndef WIN32
 XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
+#endif
 
 /* We are using the bottom of the stack to save some information, like the
  * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining