X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/61427a88a76a2c2ef25d0d5b8132995c6f550e5c..431765cb8198579ac316fa0875b5c8988a501675:/src/simix/popping_bodies.cpp diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index 2c1ad74d74..c2c83cc915 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -60,24 +60,6 @@ inline static void simcall_BODY_process_suspend(smx_actor_t process) { return simcall(SIMCALL_PROCESS_SUSPEND, 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) SIMIX_process_resume(process); - return simcall(SIMCALL_PROCESS_RESUME, process); - } - -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); - } - -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); - } - 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); @@ -90,40 +72,62 @@ inline static int simcall_BODY_process_sleep(double duration) { return simcall(SIMCALL_PROCESS_SLEEP, duration); } -inline static smx_activity_t simcall_BODY_execution_start(const char* name, double flops_amount, double priority, double bound) { + inline static boost::intrusive_ptr + 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); - return simcall(SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); + return simcall, const char*, double, double, double>( + SIMCALL_EXECUTION_START, name, flops_amount, priority, bound); } -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) { + inline static boost::intrusive_ptr + simcall_BODY_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_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, timeout); - return simcall(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, timeout); + if (0) + SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + return simcall, const char*, int, sg_host_t*, double*, + double*, double, double>(SIMCALL_EXECUTION_PARALLEL_START, name, host_nb, host_list, flops_amount, + bytes_amount, rate, timeout); } -inline static void simcall_BODY_execution_cancel(smx_activity_t execution) { + inline static void + simcall_BODY_execution_cancel(boost::intrusive_ptr 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_activity_t execution, double priority) { + inline static void + simcall_BODY_execution_set_priority(boost::intrusive_ptr 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, double>( + SIMCALL_EXECUTION_SET_PRIORITY, execution, priority); } -inline static void simcall_BODY_execution_set_bound(smx_activity_t execution, double bound) { + inline static void + simcall_BODY_execution_set_bound(boost::intrusive_ptr 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); + return simcall, double>( + SIMCALL_EXECUTION_SET_BOUND, execution, bound); } -inline static int simcall_BODY_execution_wait(smx_activity_t execution) { + inline static int simcall_BODY_execution_wait(boost::intrusive_ptr 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_actor_t process, int_f_pvoid_pvoid_t fun, void* data) { @@ -132,22 +136,14 @@ inline static void simcall_BODY_process_on_exit(smx_actor_t process, int_f_pvoid return simcall(SIMCALL_PROCESS_ON_EXIT, process, fun, data); } -inline static void simcall_BODY_process_auto_restart_set(smx_actor_t process, int auto_restart) { + inline static boost::intrusive_ptr + simcall_BODY_comm_iprobe(smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data) + { /* 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); - } - -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_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); + if (0) + simcall_HANDLER_comm_iprobe(&SIMIX_process_self()->simcall, mbox, type, match_fun, data); + return simcall, smx_mailbox_t, int, + simix_match_func_t, void*>(SIMCALL_COMM_IPROBE, mbox, type, match_fun, data); } 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) { @@ -156,10 +152,17 @@ inline static void simcall_BODY_comm_send(smx_actor_t sender, smx_mailbox_t mbox 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_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) { + inline static boost::intrusive_ptr + 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, smx_actor_t, smx_mailbox_t, double, + double, void*, size_t, simix_match_func_t, simix_clean_func_t, simix_copy_data_func_t, void*, int>( + 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_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) { @@ -168,10 +171,15 @@ inline static void simcall_BODY_comm_recv(smx_actor_t receiver, smx_mailbox_t mb return simcall(SIMCALL_COMM_RECV, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, timeout, 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) { + inline static boost::intrusive_ptr + 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, smx_actor_t, smx_mailbox_t, void*, + size_t*, simix_match_func_t, simix_copy_data_func_t, void*, double>( + 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) { @@ -180,28 +188,29 @@ 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_activity_t comm, double timeout) { + inline static void simcall_BODY_comm_wait(boost::intrusive_ptr 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, double>(SIMCALL_COMM_WAIT, comm, + timeout); } -inline static int simcall_BODY_comm_test(smx_activity_t comm) { + inline static int simcall_BODY_comm_test(boost::intrusive_ptr 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_activity_t* comms, size_t count) { + inline static int simcall_BODY_comm_testany(boost::intrusive_ptr* 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); - } - -inline static smx_mutex_t simcall_BODY_mutex_init() { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_mutex_init(&SIMIX_process_self()->simcall); - return simcall(SIMCALL_MUTEX_INIT); + return simcall*, size_t>(SIMCALL_COMM_TESTANY, + comms, count); } inline static void simcall_BODY_mutex_lock(smx_mutex_t mutex) { @@ -252,24 +261,6 @@ inline static void simcall_BODY_cond_broadcast(smx_cond_t cond) { return simcall(SIMCALL_COND_BROADCAST, cond); } -inline static smx_sem_t simcall_BODY_sem_init(unsigned int capacity) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_sem_init(capacity); - return simcall(SIMCALL_SEM_INIT, capacity); - } - -inline static void simcall_BODY_sem_release(smx_sem_t sem) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_sem_release(&SIMIX_process_self()->simcall, sem); - return simcall(SIMCALL_SEM_RELEASE, sem); - } - -inline static int simcall_BODY_sem_would_block(smx_sem_t sem) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_sem_would_block(&SIMIX_process_self()->simcall, sem); - return simcall(SIMCALL_SEM_WOULD_BLOCK, sem); - } - inline static void simcall_BODY_sem_acquire(smx_sem_t sem) { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_sem_acquire(&SIMIX_process_self()->simcall, sem); @@ -282,70 +273,20 @@ inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeou return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); } -inline static int simcall_BODY_sem_get_capacity(smx_sem_t sem) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_sem_get_capacity(&SIMIX_process_self()->simcall, sem); - return simcall(SIMCALL_SEM_GET_CAPACITY, sem); - } - -inline static sg_size_t simcall_BODY_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size, host); - return simcall(SIMCALL_FILE_READ, fd, size, host); - } - -inline static sg_size_t simcall_BODY_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size, host); - return simcall(SIMCALL_FILE_WRITE, fd, size, host); - } - -inline static smx_file_t simcall_BODY_file_open(const char* fullpath, sg_host_t host) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_open(&SIMIX_process_self()->simcall, fullpath, host); - return simcall(SIMCALL_FILE_OPEN, fullpath, host); - } - -inline static int simcall_BODY_file_close(smx_file_t fd, sg_host_t host) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_close(&SIMIX_process_self()->simcall, fd, host); - return simcall(SIMCALL_FILE_CLOSE, fd, host); - } - -inline static int simcall_BODY_file_unlink(smx_file_t fd, sg_host_t host) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) SIMIX_file_unlink(fd, host); - return simcall(SIMCALL_FILE_UNLINK, fd, host); - } - -inline static sg_size_t simcall_BODY_file_get_size(smx_file_t fd) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_get_size(&SIMIX_process_self()->simcall, fd); - return simcall(SIMCALL_FILE_GET_SIZE, fd); - } - -inline static sg_size_t simcall_BODY_file_tell(smx_file_t fd) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_tell(&SIMIX_process_self()->simcall, fd); - return simcall(SIMCALL_FILE_TELL, fd); - } - -inline static int simcall_BODY_file_seek(smx_file_t fd, sg_offset_t offset, int origin) { - /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_seek(&SIMIX_process_self()->simcall, fd, offset, origin); - return simcall(SIMCALL_FILE_SEEK, fd, offset, origin); - } - -inline static xbt_dynar_t simcall_BODY_file_get_info(smx_file_t fd) { + inline static sg_size_t simcall_BODY_file_read(surf_file_t fd, sg_size_t size) + { /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_get_info(&SIMIX_process_self()->simcall, fd); - return simcall(SIMCALL_FILE_GET_INFO, fd); + if (0) + simcall_HANDLER_file_read(&SIMIX_process_self()->simcall, fd, size); + return simcall(SIMCALL_FILE_READ, fd, size); } -inline static int simcall_BODY_file_move(smx_file_t fd, const char* fullpath) { + inline static sg_size_t simcall_BODY_file_write(surf_file_t fd, sg_size_t size) + { /* Go to that function to follow the code flow through the simcall barrier */ - if (0) simcall_HANDLER_file_move(&SIMIX_process_self()->simcall, fd, fullpath); - return simcall(SIMCALL_FILE_MOVE, fd, fullpath); + if (0) + simcall_HANDLER_file_write(&SIMIX_process_self()->simcall, fd, size); + return simcall(SIMCALL_FILE_WRITE, fd, size); } inline static int simcall_BODY_mc_random(int min, int max) { @@ -354,10 +295,13 @@ inline static int simcall_BODY_mc_random(int min, int max) { return simcall(SIMCALL_MC_RANDOM, min, max); } -inline static void simcall_BODY_set_category(smx_activity_t synchro, const char* category) { + inline static void simcall_BODY_set_category(boost::intrusive_ptr 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, const char*>( + SIMCALL_SET_CATEGORY, synchro, category); } inline static void simcall_BODY_run_kernel(std::function const* code) {