X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29036bc0419a7bd0b531370ec066948b49af5602..dbae853c4de0c0d66c97c961c370448bee5e1ab4:/src/simix/simcalls.in

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index dbef0797a4..1aa78dd556 100644
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -37,45 +37,43 @@
 # compilation time)
 
 void vm_suspend(sg_host_t ind_vm);
-void vm_resume(sg_host_t ind_vm);
+void vm_resume(sg_host_t ind_vm) [[nohandler]];
 void vm_shutdown(sg_host_t ind_vm);
 void vm_save(sg_host_t ind_vm);
-void vm_restore(sg_host_t ind_vm);
 
-void process_kill(smx_process_t process);
+void process_kill(smx_actor_t process);
 void process_killall(int reset_pid);
-void process_cleanup(smx_process_t process) [[nohandler]];
-void process_suspend(smx_process_t process) [[block]];
-void process_resume(smx_process_t process);
-void process_set_host(smx_process_t process, sg_host_t dest);
-int  process_is_suspended(smx_process_t process) [[nohandler]];
-int  process_join(smx_process_t process, double timeout) [[block]];
+void process_cleanup(smx_actor_t process) [[nohandler]];
+void process_suspend(smx_actor_t process) [[block]];
+void process_resume(smx_actor_t process) [[nohandler]];
+void process_set_host(smx_actor_t process, sg_host_t dest);
+int  process_is_suspended(smx_actor_t process) [[nohandler]];
+int  process_join(smx_actor_t process, double timeout) [[block]];
 int  process_sleep(double duration) [[block]];
 
-smx_synchro_t execution_start(const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask);
-smx_synchro_t execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate) [[nohandler]];
-void          execution_cancel(smx_synchro_t execution) [[nohandler]];
-void          execution_set_priority(smx_synchro_t execution, double priority) [[nohandler]];
-void          execution_set_bound(smx_synchro_t execution, double bound) [[nohandler]];
-void          execution_set_affinity(smx_synchro_t execution, sg_host_t ws, unsigned long mask) [[nohandler]];
-int           execution_wait(smx_synchro_t execution) [[block]];
+smx_activity_t execution_start(const char* name, double flops_amount, double priority, double bound);
+smx_activity_t execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) [[nohandler]];
+void          execution_cancel(smx_activity_t execution) [[nohandler]];
+void          execution_set_priority(smx_activity_t execution, double priority) [[nohandler]];
+void          execution_set_bound(smx_activity_t execution, double bound) [[nohandler]];
+int           execution_wait(smx_activity_t execution) [[block]];
 
-void          process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void* data) [[nohandler]];
-void          process_auto_restart_set(smx_process_t process, int auto_restart) [[nohandler]];
-smx_process_t process_restart(smx_process_t process);
+void          process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) [[nohandler]];
+void          process_auto_restart_set(smx_actor_t process, int auto_restart) [[nohandler]];
+smx_actor_t process_restart(smx_actor_t process);
 
 smx_mailbox_t mbox_create(const char* name) [[nohandler]];
-void          mbox_set_receiver(smx_mailbox_t mbox, smx_process_t receiver) [[nohandler]];
-
-smx_synchro_t comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data);
-void          comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout) [[block]];
-smx_synchro_t comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
-void          comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate) [[block]];
-smx_synchro_t comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
-int           comm_waitany(xbt_dynar_t comms) [[block]];
-void          comm_wait(smx_synchro_t comm, double timeout) [[block]];
-int           comm_test(smx_synchro_t comm) [[block]];
-int           comm_testany(smx_synchro_t* comms, size_t count) [[block]];
+void          mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t receiver) [[nohandler]];
+
+smx_activity_t comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data);
+void          comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout) [[block]];
+smx_activity_t comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, simix_match_func_t match_fun, simix_clean_func_t clean_fun, simix_copy_data_func_t copy_data_fun, void* data, int detached);
+void          comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double timeout, double rate) [[block]];
+smx_activity_t comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, simix_match_func_t match_fun, simix_copy_data_func_t copy_data_fun, void* data, double rate);
+int           comm_waitany(xbt_dynar_t comms, double timeout) [[block]];
+void          comm_wait(smx_activity_t comm, double timeout) [[block]];
+int           comm_test(smx_activity_t comm) [[block]];
+int           comm_testany(smx_activity_t* comms, size_t count) [[block]];
 
 smx_mutex_t mutex_init();
 void        mutex_lock(smx_mutex_t mutex) [[block]];
@@ -113,7 +111,7 @@ xbt_dict_t storage_get_content(smx_storage_t storage) [[nohandler]];
 
 xbt_dict_t asr_get_properties(const char* name);
 int        mc_random(int min, int max);
-void       set_category(smx_synchro_t synchro, const char* category) [[nohandler]];
+void       set_category(smx_activity_t synchro, const char* category) [[nohandler]];
 
 void       run_kernel(std::function<void()> const* code) [[nohandler]];
 void       run_blocking(std::function<void()> const* code) [[block,nohandler]];