X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b51da37243dc16575499f4cb7729fe8bdd7fa514..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/simix/popping_bodies.cpp?ds=sidebyside diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 191080887b..ccdeaaf337 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -23,7 +23,7 @@ template inline static R simcall(e_smx_simcall_t call, T const&... t) { - smx_process_t self = SIMIX_process_self(); + smx_actor_t self = SIMIX_process_self(); simgrid::simix::marshal(&self->simcall, call, t...); if (self != simix_global->maestro_process) { XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(), @@ -35,40 +35,10 @@ inline static R simcall(e_smx_simcall_t call, T const&... t) return simgrid::simix::unmarshal(self->simcall.result); } -inline static void simcall_BODY_vm_suspend(sg_host_t ind_vm) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_vm_suspend(&SIMIX_process_self()->simcall, ind_vm); - return simcall(SIMCALL_VM_SUSPEND, ind_vm); - } - -inline static void simcall_BODY_vm_resume(sg_host_t ind_vm) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_vm_resume(&SIMIX_process_self()->simcall, ind_vm); - return simcall(SIMCALL_VM_RESUME, ind_vm); - } - -inline static void simcall_BODY_vm_shutdown(sg_host_t ind_vm) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_vm_shutdown(&SIMIX_process_self()->simcall, ind_vm); - return simcall(SIMCALL_VM_SHUTDOWN, ind_vm); - } - -inline static void simcall_BODY_vm_save(sg_host_t ind_vm) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_vm_save(&SIMIX_process_self()->simcall, ind_vm); - return simcall(SIMCALL_VM_SAVE, ind_vm); - } - -inline static void simcall_BODY_vm_restore(sg_host_t ind_vm) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_vm_restore(&SIMIX_process_self()->simcall, ind_vm); - return simcall(SIMCALL_VM_RESTORE, ind_vm); - } - -inline static void simcall_BODY_process_kill(smx_process_t process) { +inline static void simcall_BODY_process_kill(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_process_kill(&SIMIX_process_self()->simcall, process); - return simcall(SIMCALL_PROCESS_KILL, process); + return simcall(SIMCALL_PROCESS_KILL, process); } inline static void simcall_BODY_process_killall(int reset_pid) { @@ -77,40 +47,40 @@ inline static void simcall_BODY_process_killall(int reset_pid) { return simcall(SIMCALL_PROCESS_KILLALL, reset_pid); } -inline static void simcall_BODY_process_cleanup(smx_process_t process) { +inline static void simcall_BODY_process_cleanup(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_process_cleanup(process); - return simcall(SIMCALL_PROCESS_CLEANUP, process); + return simcall(SIMCALL_PROCESS_CLEANUP, process); } -inline static void simcall_BODY_process_suspend(smx_process_t process) { +inline static void simcall_BODY_process_suspend(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_process_suspend(&SIMIX_process_self()->simcall, process); - return simcall(SIMCALL_PROCESS_SUSPEND, process); + return simcall(SIMCALL_PROCESS_SUSPEND, process); } -inline static void simcall_BODY_process_resume(smx_process_t process) { +inline static void simcall_BODY_process_resume(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_process_resume(&SIMIX_process_self()->simcall, process); - return simcall(SIMCALL_PROCESS_RESUME, process); + if (0) SIMIX_process_resume(process); + return simcall(SIMCALL_PROCESS_RESUME, process); } -inline static void simcall_BODY_process_set_host(smx_process_t process, sg_host_t dest) { +inline static void simcall_BODY_process_set_host(smx_actor_t process, sg_host_t dest) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_process_set_host(&SIMIX_process_self()->simcall, process, dest); - return simcall(SIMCALL_PROCESS_SET_HOST, process, dest); + return simcall(SIMCALL_PROCESS_SET_HOST, process, dest); } -inline static int simcall_BODY_process_is_suspended(smx_process_t process) { +inline static int simcall_BODY_process_is_suspended(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_process_is_suspended(process); - return simcall(SIMCALL_PROCESS_IS_SUSPENDED, process); + return simcall(SIMCALL_PROCESS_IS_SUSPENDED, process); } -inline static int simcall_BODY_process_join(smx_process_t process, double timeout) { +inline static int simcall_BODY_process_join(smx_actor_t process, double timeout) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_process_join(&SIMIX_process_self()->simcall, process, timeout); - return simcall(SIMCALL_PROCESS_JOIN, process, timeout); + return simcall(SIMCALL_PROCESS_JOIN, process, timeout); } inline static int simcall_BODY_process_sleep(double duration) { @@ -119,106 +89,88 @@ inline static int simcall_BODY_process_sleep(double duration) { return simcall(SIMCALL_PROCESS_SLEEP, duration); } -inline static smx_synchro_t simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) { +inline static smx_activity_t simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound) { /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound, affinity_mask); - return simcall(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound, affinity_mask); + if (0) simcall_HANDLER_execution_start(&SIMIX_process_self()->simcall, name, flops_amount, priority, bound); + return simcall(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); } -inline static smx_synchro_t simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double amount, double rate) { +inline static smx_activity_t simcall_BODY_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) { /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate); - return simcall(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, amount, rate); + if (0) SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout); + return simcall(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout); } -inline static void simcall_BODY_execution_cancel(smx_synchro_t execution) { +inline static void simcall_BODY_execution_cancel(smx_activity_t execution) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_execution_cancel(execution); - return simcall(SIMCALL_EXECUTION_CANCEL, execution); + return simcall(SIMCALL_EXECUTION_CANCEL, execution); } -inline static void simcall_BODY_execution_set_priority(smx_synchro_t execution, double priority) { +inline static void simcall_BODY_execution_set_priority(smx_activity_t execution, double priority) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_execution_set_priority(execution, priority); - return simcall(SIMCALL_EXECUTION_SET_PRIORITY, execution, priority); + return simcall(SIMCALL_EXECUTION_SET_PRIORITY, execution, priority); } -inline static void simcall_BODY_execution_set_bound(smx_synchro_t execution, double bound) { +inline static void simcall_BODY_execution_set_bound(smx_activity_t execution, double bound) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_execution_set_bound(execution, bound); - return simcall(SIMCALL_EXECUTION_SET_BOUND, execution, bound); - } - -inline static void simcall_BODY_execution_set_affinity(smx_synchro_t execution, sg_host_t ws, unsigned long mask) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_execution_set_affinity(execution, ws, mask); - return simcall(SIMCALL_EXECUTION_SET_AFFINITY, execution, ws, mask); + return simcall(SIMCALL_EXECUTION_SET_BOUND, execution, bound); } -inline static int simcall_BODY_execution_wait(smx_synchro_t execution) { +inline static int simcall_BODY_execution_wait(smx_activity_t execution) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_execution_wait(&SIMIX_process_self()->simcall, execution); - return simcall(SIMCALL_EXECUTION_WAIT, execution); + return simcall(SIMCALL_EXECUTION_WAIT, execution); } -inline static void simcall_BODY_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void* data) { +inline static void simcall_BODY_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_process_on_exit(process, fun, data); - return simcall(SIMCALL_PROCESS_ON_EXIT, process, fun, data); + return simcall(SIMCALL_PROCESS_ON_EXIT, process, fun, data); } -inline static void simcall_BODY_process_auto_restart_set(smx_process_t process, int auto_restart) { +inline static void simcall_BODY_process_auto_restart_set(smx_actor_t process, int auto_restart) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_process_auto_restart_set(process, auto_restart); - return simcall(SIMCALL_PROCESS_AUTO_RESTART_SET, process, auto_restart); + return simcall(SIMCALL_PROCESS_AUTO_RESTART_SET, process, auto_restart); } -inline static smx_process_t simcall_BODY_process_restart(smx_process_t process) { +inline static smx_actor_t simcall_BODY_process_restart(smx_actor_t process) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_process_restart(&SIMIX_process_self()->simcall, process); - return simcall(SIMCALL_PROCESS_RESTART, process); - } - -inline static smx_mailbox_t simcall_BODY_mbox_create(const char* name) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_mbox_create(name); - return simcall(SIMCALL_MBOX_CREATE, name); + return simcall(SIMCALL_PROCESS_RESTART, process); } -inline static void simcall_BODY_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t receiver) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_mbox_set_receiver(mbox, receiver); - return simcall(SIMCALL_MBOX_SET_RECEIVER, mbox, receiver); - } - -inline static smx_synchro_t simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data) { +inline static smx_activity_t simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, simix_match_func_t match_fun, void* data) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_iprobe(&SIMIX_process_self()->simcall, mbox, type, src, tag, match_fun, data); - return simcall(SIMCALL_COMM_IPROBE, mbox, type, src, tag, match_fun, data); + return simcall(SIMCALL_COMM_IPROBE, mbox, type, src, tag, match_fun, data); } -inline static void simcall_BODY_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) { +inline static void simcall_BODY_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) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_send(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); - return simcall(SIMCALL_COMM_SEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); + return simcall(SIMCALL_COMM_SEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, copy_data_fun, data, timeout); } -inline static smx_synchro_t simcall_BODY_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) { +inline static smx_activity_t simcall_BODY_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) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_isend(&SIMIX_process_self()->simcall, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); - return simcall(SIMCALL_COMM_ISEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); + return simcall(SIMCALL_COMM_ISEND, sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, clean_fun, copy_data_fun, data, detached); } -inline static void simcall_BODY_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) { +inline static void simcall_BODY_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) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_recv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); - return simcall(SIMCALL_COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); + return simcall(SIMCALL_COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, rate); } -inline static smx_synchro_t simcall_BODY_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) { +inline static smx_activity_t simcall_BODY_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) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_irecv(&SIMIX_process_self()->simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); - return simcall(SIMCALL_COMM_IRECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); + return simcall(SIMCALL_COMM_IRECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); } inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms, double timeout) { @@ -227,22 +179,22 @@ inline static int simcall_BODY_comm_waitany(xbt_dynar_t comms, double timeout) { return simcall(SIMCALL_COMM_WAITANY, comms, timeout); } -inline static void simcall_BODY_comm_wait(smx_synchro_t comm, double timeout) { +inline static void simcall_BODY_comm_wait(smx_activity_t comm, double timeout) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_wait(&SIMIX_process_self()->simcall, comm, timeout); - return simcall(SIMCALL_COMM_WAIT, comm, timeout); + return simcall(SIMCALL_COMM_WAIT, comm, timeout); } -inline static int simcall_BODY_comm_test(smx_synchro_t comm) { +inline static int simcall_BODY_comm_test(smx_activity_t comm) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_test(&SIMIX_process_self()->simcall, comm); - return simcall(SIMCALL_COMM_TEST, comm); + return simcall(SIMCALL_COMM_TEST, comm); } -inline static int simcall_BODY_comm_testany(smx_synchro_t* comms, size_t count) { +inline static int simcall_BODY_comm_testany(smx_activity_t* comms, size_t count) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_comm_testany(&SIMIX_process_self()->simcall, comms, count); - return simcall(SIMCALL_COMM_TESTANY, comms, count); + return simcall(SIMCALL_COMM_TESTANY, comms, count); } inline static smx_mutex_t simcall_BODY_mutex_init() { @@ -419,22 +371,16 @@ inline static xbt_dict_t simcall_BODY_storage_get_content(smx_storage_t storage) return simcall(SIMCALL_STORAGE_GET_CONTENT, storage); } -inline static xbt_dict_t simcall_BODY_asr_get_properties(const char* name) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_asr_get_properties(&SIMIX_process_self()->simcall, name); - return simcall(SIMCALL_ASR_GET_PROPERTIES, name); - } - inline static int simcall_BODY_mc_random(int min, int max) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_mc_random(&SIMIX_process_self()->simcall, min, max); return simcall(SIMCALL_MC_RANDOM, min, max); } -inline static void simcall_BODY_set_category(smx_synchro_t synchro, const char* category) { +inline static void simcall_BODY_set_category(smx_activity_t synchro, const char* category) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) SIMIX_set_category(synchro, category); - return simcall(SIMCALL_SET_CATEGORY, synchro, category); + return simcall(SIMCALL_SET_CATEGORY, synchro, category); } inline static void simcall_BODY_run_kernel(std::function const* code) {