Simix: clean unfinished comms when terminating a process

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

diff --git a/src/simix/process_private.h b/src/simix/process_private.h
index 5d06f2c..cfc9501 100644 (file)
--- a/src/simix/process_private.h
+++ b/src/simix/process_private.h
@@ -9,11 +9,9 @@
 
 #include "simix/datatypes.h"
 #include "smurf_private.h"
-#include "xbt/setset.h"
 
 /** @brief Process datatype */
 typedef struct s_smx_process {
-  XBT_SETSET_HEADERS;
   s_xbt_swag_hookup_t process_hookup;
   s_xbt_swag_hookup_t synchro_hookup;   /* process_to_run or mutex->sleeping and co */
   s_xbt_swag_hookup_t host_proc_hookup;
@@ -27,7 +25,9 @@ typedef struct s_smx_process {
   int doexception:1;
   int blocked:1;
   int suspended:1;
-  smx_action_t waiting_action;
+  smx_host_t new_host;          /* if not null, the host on which the process must migrate to */
+  smx_action_t waiting_action;  /* the current blocking action if any */
+  xbt_fifo_t comms;       /* the current non-blocking communication actions */
   xbt_dict_t properties;
   s_smx_req_t request;
   void *data;                   /* kept for compatibility, it should be replaced with moddata */
@@ -52,6 +52,7 @@ void SIMIX_process_create(smx_process_t *process,
                           const char *hostname,
                           int argc, char **argv,
                           xbt_dict_t properties);
+void SIMIX_process_runall(void);
 void SIMIX_process_kill(smx_process_t process);
 void SIMIX_process_killall(smx_process_t issuer);
 smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args);
@@ -61,8 +62,11 @@ void SIMIX_process_empty_trash(void);
 void SIMIX_process_yield(void);
 xbt_running_ctx_t *SIMIX_process_get_running_context(void);
 void SIMIX_process_exception_terminate(xbt_ex_t * e);
+void SIMIX_pre_process_change_host(smx_process_t process,
+                                  smx_host_t dest);
 void SIMIX_process_change_host(smx_process_t process,
-    const char *source, const char *dest);
+                              smx_host_t dest);
+void SIMIX_pre_process_change_host(smx_process_t process, smx_host_t host);
 void SIMIX_pre_process_suspend(smx_req_t req);
 void SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
 void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
@@ -70,6 +74,7 @@ void* SIMIX_process_get_data(smx_process_t process);
 void SIMIX_process_set_data(smx_process_t process, void *data);
 smx_host_t SIMIX_process_get_host(smx_process_t process);
 const char* SIMIX_process_get_name(smx_process_t process);
+smx_process_t SIMIX_process_get_by_name(const char* name);
 int SIMIX_process_is_suspended(smx_process_t process);
 xbt_dict_t SIMIX_process_get_properties(smx_process_t process);
 void SIMIX_pre_process_sleep(smx_req_t req);