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

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

diff --git a/src/simix/process_private.h b/src/simix/process_private.h
index 54f4196..8df718c 100644 (file)
--- a/src/simix/process_private.h
+++ b/src/simix/process_private.h
@@ -27,9 +27,10 @@ typedef struct s_smx_process {
   int doexception:1;
   int blocked:1;
   int suspended:1;
+  smx_host_t new_host;          /* if not null, the host on which the process must migrate to */
   smx_action_t waiting_action;
   xbt_dict_t properties;
-  smx_req_t request;
+  s_smx_req_t request;
   void *data;                   /* kept for compatibility, it should be replaced with moddata */
 
 } s_smx_process_t;
@@ -45,22 +46,27 @@ typedef struct s_smx_process_arg {
   xbt_dict_t properties;
 } s_smx_process_arg_t, *smx_process_arg_t;
 
-smx_process_t SIMIX_process_create(const char *name,
-                                   xbt_main_func_t code,
-                                   void *data,
-                                   const char *hostname,
-                                   int argc, char **argv,
-                                   xbt_dict_t properties);
-void SIMIX_process_kill(smx_process_t process, smx_process_t killer);
-void SIMIX_process_killall(void);
+void SIMIX_process_create(smx_process_t *process,
+                          const char *name,
+                          xbt_main_func_t code,
+                          void *data,
+                          const char *hostname,
+                          int argc, char **argv,
+                          xbt_dict_t properties);
+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);
 void SIMIX_create_maestro_process(void);
+void SIMIX_process_cleanup(smx_process_t arg);
 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);
@@ -68,8 +74,8 @@ 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);
-int SIMIX_process_is_enabled(smx_process_t process);
 xbt_dict_t SIMIX_process_get_properties(smx_process_t process);
 void SIMIX_pre_process_sleep(smx_req_t req);
 smx_action_t SIMIX_process_sleep(smx_process_t process, double duration);