Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
proper check for the -std=gnu++11 standard, and take in on clang too
[simgrid.git] / src / simix / smx_process_private.h
index c07ac3c..1aadc50 100644 (file)
@@ -31,15 +31,15 @@ typedef struct s_smx_process_arg {
 
 /** @brief Process datatype */
 typedef struct s_smx_process {
-  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;
-  s_xbt_swag_hookup_t destroy_hookup;
+  s_xbt_swag_hookup_t process_hookup;   /* simix_global->process_list */
+  s_xbt_swag_hookup_t synchro_hookup;   /* {mutex,cond,sem}->sleeping */
+  s_xbt_swag_hookup_t host_proc_hookup; /* smx_host->process_lis */
+  s_xbt_swag_hookup_t destroy_hookup;   /* simix_global->process_to_destroy */
 
   unsigned long pid;
   unsigned long ppid;
   char *name;                   /**< @brief process name if any */
-  smx_host_t smx_host;          /* the host on which the process is running */
+  sg_host_t host;          /* the host on which the process is running */
   smx_context_t context;        /* the context (uctx/raw/thread) that executes the user function */
   xbt_running_ctx_t *running_ctx;
   unsigned doexception:1;
@@ -47,9 +47,9 @@ typedef struct s_smx_process {
   unsigned suspended:1;
   unsigned auto_restart:1;
 
-  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 */
+  sg_host_t new_host;          /* if not null, the host on which the process must migrate to */
+  smx_synchro_t waiting_synchro;  /* the current blocking synchro if any */
+  xbt_fifo_t comms;       /* the current non-blocking communication synchros */
   xbt_dict_t properties;
   s_smx_simcall_t simcall;
   void *data;                   /* kept for compatibility, it should be replaced with moddata */
@@ -58,12 +58,11 @@ typedef struct s_smx_process {
   xbt_main_func_t code;
   int argc;
   char **argv;
-  double kill_time;
-
+  smx_timer_t kill_timer;
 } s_smx_process_t;
 
 
-void SIMIX_process_create(smx_process_t *process,
+smx_process_t SIMIX_process_create(
                           const char *name,
                           xbt_main_func_t code,
                           void *data,
@@ -84,60 +83,29 @@ void SIMIX_process_empty_trash(void);
 void SIMIX_process_yield(smx_process_t self);
 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_simcall_t, smx_process_t process,
-           smx_host_t dest);
 void SIMIX_process_change_host(smx_process_t process,
-             smx_host_t dest);
-void SIMIX_pre_process_suspend(smx_simcall_t simcall, smx_process_t process);
-smx_action_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
+             sg_host_t dest);
+smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer);
 void SIMIX_process_resume(smx_process_t process, smx_process_t issuer);
 int SIMIX_process_get_PID(smx_process_t self);
 int SIMIX_process_get_PPID(smx_process_t self);
 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);
+sg_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_join(smx_simcall_t simcall, smx_process_t process, double timeout);
-smx_action_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout);
-void SIMIX_pre_process_sleep(smx_simcall_t simcall, double duration);
-smx_action_t SIMIX_process_sleep(smx_process_t process, double duration);
-void SIMIX_post_process_sleep(smx_action_t action);
+smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout);
+smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration);
+void SIMIX_post_process_sleep(smx_synchro_t synchro);
 
-void SIMIX_process_sleep_suspend(smx_action_t action);
-void SIMIX_process_sleep_resume(smx_action_t action);
-void SIMIX_process_sleep_destroy(smx_action_t action);
+void SIMIX_process_sleep_suspend(smx_synchro_t synchro);
+void SIMIX_process_sleep_resume(smx_synchro_t synchro);
+void SIMIX_process_sleep_destroy(smx_synchro_t synchro);
 void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart);
 smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer);
 
-// pre prototypes
-void SIMIX_pre_process_create(smx_simcall_t simcall, smx_process_t *process,
-                             const char *name, xbt_main_func_t code, void *data,
-                             const char *hostname, double kill_time, int argc,
-                             char **argv, xbt_dict_t properties, int auto_restart);
-void SIMIX_pre_process_kill(smx_simcall_t simcall, smx_process_t process);
-void SIMIX_pre_process_killall(smx_simcall_t simcall, int reset_pid);
-void SIMIX_pre_process_cleanup(smx_simcall_t simcall, smx_process_t process);
-void SIMIX_pre_process_resume(smx_simcall_t simcall, smx_process_t process);
-int SIMIX_pre_process_count(smx_simcall_t simcall);
-void* SIMIX_pre_process_self_get_data(smx_simcall_t simcall, smx_process_t process);
-int SIMIX_pre_process_get_PID(smx_simcall_t simcall, smx_process_t self);
-int SIMIX_pre_process_get_PPID(smx_simcall_t simcall, smx_process_t self);
-void* SIMIX_pre_process_get_data(smx_simcall_t simcall, smx_process_t process);
-void SIMIX_pre_process_set_data(smx_simcall_t simcall, smx_process_t process,
-                                void *data);
-smx_host_t SIMIX_pre_process_get_host(smx_simcall_t simcall, smx_process_t process);
-const char* SIMIX_pre_process_get_name(smx_simcall_t simcall, smx_process_t process);
-int SIMIX_pre_process_is_suspended(smx_simcall_t simcall, smx_process_t process);
-xbt_dict_t SIMIX_pre_process_get_properties(smx_simcall_t simcall, smx_process_t process);
-void SIMIX_pre_process_on_exit(smx_simcall_t simcall, smx_process_t process,
-                              int_f_pvoid_pvoid_t fun, void *data);
-void SIMIX_pre_process_auto_restart_set(smx_simcall_t simcall, smx_process_t process,
-                                       int auto_restart);
-smx_process_t SIMIX_pre_process_restart(smx_simcall_t simcall, smx_process_t process);
-
 SG_END_DECL()
 
 #endif