X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13f164230f8da32094edbe9811a81221454d461b..a784ea0b57101613a92e9fe1403d224e7ea4d501:/src/simix/simcalls.in diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in index 66aa969ca9..f015038774 100644 --- a/src/simix/simcalls.in +++ b/src/simix/simcalls.in @@ -10,10 +10,10 @@ # int foo(int x, int y) [[nohandler]]; # int foo(int x, int y) [[block, nohandler]]; # -# The `block` attribut is used for calls which do not return in the same +# The `block` attribute is used for calls which do not return in the same # scheduling round. The answer requires some interaction with SURF, -# even if this can still occure at the same timestamp under some -# circonstances (eg if the surf_action cannot start because of resources +# even if this can still occur at the same timestamp under some +# circumstances (eg if the surf_action cannot start because of resources # that are down) examples: things that last some time (communicate, execute, # mutex_lock). # @@ -24,55 +24,44 @@ # by the kernel. # The only remaining use of that mechanism is to add the caller # identity as a parameter of internal call, but that could be -# automatized too (eg by having a special parameter type called "self") +# automated too (eg by having a special parameter type called "self") # Please note that in addition to completing this file with your new simcall, # you should complete the libsmx.c file by adding the corresponding function -# (aka. stub). Anyway, if you omit to do it, the invocation of ./simcalls.py will notify you ;) +# (a.k.a. stub). Anyway, if you omit to do it, the invocation of ./simcalls.py will notify you ;) # If you want to remove an handler, it is important to remove although # the corresponding code (simcall_HANDLER_name_of_simcall(xxx) (note that comment the code # is not sufficient, the python script does not check whether the code is commented or not). # Last but not the least, you should declare the new simix call in -# ./include/simgrid/simix.h (otherwise you will get a warning at the -# compilation time) - -void vm_suspend(sg_host_t ind_vm); -void vm_resume(sg_host_t ind_vm) [[nohandler]]; -void vm_shutdown(sg_host_t ind_vm); +# ./include/simgrid/simix.h (otherwise you will get a warning at compile time) void process_kill(smx_actor_t process); void process_killall(int reset_pid); 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_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]]; +boost::intrusive_ptr execution_start(const char* name, double flops_amount, double priority, double bound); +boost::intrusive_ptr 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(boost::intrusive_ptr execution) [[nohandler]]; +void execution_set_priority(boost::intrusive_ptr execution, double priority) [[nohandler]]; +void execution_set_bound(boost::intrusive_ptr execution, double bound) [[nohandler]]; +int execution_wait(boost::intrusive_ptr execution) [[block]]; 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_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_actor_t process_restart(smx_actor_t process); + +boost::intrusive_ptr comm_iprobe(smx_mailbox_t mbox, int type, 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]]; +boost::intrusive_ptr 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]]; +boost::intrusive_ptr 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(boost::intrusive_ptr comm, double timeout) [[block]]; +int comm_test(boost::intrusive_ptr comm) [[block]]; +int comm_testany(boost::intrusive_ptr* comms, size_t count) [[block]]; smx_mutex_t mutex_init(); void mutex_lock(smx_mutex_t mutex) [[block]]; @@ -92,24 +81,13 @@ void sem_acquire(smx_sem_t sem) [[block]]; void sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]]; int sem_get_capacity(smx_sem_t sem); -sg_size_t file_read(smx_file_t fd, sg_size_t size, sg_host_t host) [[block]]; -sg_size_t file_write(smx_file_t fd, sg_size_t size, sg_host_t host) [[block]]; -smx_file_t file_open(const char* fullpath, sg_host_t host) [[block]]; -int file_close(smx_file_t fd, sg_host_t host) [[block]]; -int file_unlink(smx_file_t fd, sg_host_t host) [[nohandler]]; -sg_size_t file_get_size(smx_file_t fd); -sg_size_t file_tell(smx_file_t fd); -int file_seek(smx_file_t fd, sg_offset_t offset, int origin); -xbt_dynar_t file_get_info(smx_file_t fd); -int file_move(smx_file_t fd, const char* fullpath); - -sg_size_t storage_get_free_size(smx_storage_t storage); -sg_size_t storage_get_used_size(smx_storage_t name); -xbt_dict_t storage_get_properties(smx_storage_t storage) [[nohandler]]; -xbt_dict_t storage_get_content(smx_storage_t storage) [[nohandler]]; +sg_size_t file_read(surf_file_t fd, sg_size_t size, sg_host_t host) [[block]]; +sg_size_t file_write(surf_file_t fd, sg_size_t size, sg_host_t host) [[block]]; +surf_file_t file_open(const char* mount, const char* path, sg_storage_t st) [[block]]; +int file_close(surf_file_t fd, sg_host_t host) [[block]]; int mc_random(int min, int max); -void set_category(smx_activity_t synchro, const char* category) [[nohandler]]; +void set_category(boost::intrusive_ptr synchro, const char* category) [[nohandler]]; void run_kernel(std::function const* code) [[nohandler]]; void run_blocking(std::function const* code) [[block,nohandler]];