X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0322a73bb9bb8b3285c6d7fce7e19a40e5025823..7c4bef6efee6ba4a06f99e78ea1198d74dc520fc:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 0b243660c1..81cf2385b9 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -219,7 +219,6 @@ XBT_PUBLIC(void) simcall_process_set_data(smx_actor_t process, void *data); XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_actor_t host); XBT_PUBLIC(void) simcall_process_set_kill_time(smx_actor_t process, double kill_time); XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data); -XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart); XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process); XBT_PUBLIC(void) simcall_process_join(smx_actor_t process, double timeout); /* Sleep control */ @@ -229,12 +228,12 @@ SG_END_DECL() /************************** Comunication simcalls *****************************/ XBT_PUBLIC(void) -simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff, +simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout); XBT_PUBLIC(smx_activity_t) -simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff, +simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, int detached); @@ -250,8 +249,8 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate); XBT_PUBLIC(smx_activity_t) -simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data); +simcall_comm_iprobe(smx_mailbox_t mbox, int type, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void* data); XBT_PUBLIC(void) simcall_comm_cancel(smx_activity_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ @@ -289,10 +288,8 @@ XBT_PUBLIC(void) simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration) XBT_PUBLIC(int) simcall_sem_get_capacity(smx_sem_t sem); /***************************** File **********************************/ -XBT_PUBLIC(sg_size_t) simcall_file_read(surf_file_t fd, sg_size_t size, sg_host_t host); -XBT_PUBLIC(sg_size_t) simcall_file_write(surf_file_t fd, sg_size_t size, sg_host_t host); -XBT_PUBLIC(surf_file_t) simcall_file_open(const char* mount, const char* path, sg_storage_t st); -XBT_PUBLIC(int) simcall_file_close(surf_file_t fd, sg_host_t host); +XBT_PUBLIC(sg_size_t) simcall_file_read(surf_file_t fd, sg_size_t size); +XBT_PUBLIC(sg_size_t) simcall_file_write(surf_file_t fd, sg_size_t size); /************************** MC simcalls **********************************/ XBT_PUBLIC(int) simcall_mc_random(int min, int max);