X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/183a6118a95c570b0c66695505dab7dbebc0c7b3..acd555b41f9a71f6e3ed538f00d1e84fe6d19024:/src/simix/libsmx.cpp?ds=sidebyside diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 96cd223368..0e3ba0c89b 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -189,20 +189,6 @@ void simcall_process_cleanup(smx_actor_t process) simcall_BODY_process_cleanup(process); } -/** - * \ingroup simix_process_management - * \brief Migrates an agent to another location. - * - * This function changes the value of the host on which \a process is running. - * - * \param process the process to migrate - * \param dest name of the new host - */ -void simcall_process_set_host(smx_actor_t process, sg_host_t dest) -{ - simcall_BODY_process_set_host(process, dest); -} - void simcall_process_join(smx_actor_t process, double timeout) { simcall_BODY_process_join(process, timeout); @@ -283,19 +269,6 @@ double simcall_process_get_kill_time(smx_actor_t process) { return SIMIX_timer_get_date(process->kill_timer); } -/** - * \ingroup simix_process_management - * \brief Returns true if the process is suspended . - * - * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion. - * \param process SIMIX process - * \return 1, if the process is suspended, else 0. - */ -int simcall_process_is_suspended(smx_actor_t process) -{ - return simcall_BODY_process_is_suspended(process); -} - /** * \ingroup simix_process_management * \brief Return the properties @@ -355,11 +328,9 @@ e_smx_state_t simcall_process_sleep(double duration) /** * \ingroup simix_comm_management */ -void 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 *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, - double timeout) +void 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) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -385,13 +356,11 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, /** * \ingroup simix_comm_management */ -smx_activity_t 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 *, smx_activity_t), - void (*clean_fun)(void *), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, - int detached) +smx_activity_t 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) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -407,10 +376,9 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double /** * \ingroup simix_comm_management */ -void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, double timeout, double rate) +void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_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, double rate) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); xbt_assert(mbox, "No rendez-vous point defined for recv"); @@ -431,10 +399,9 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, /** * \ingroup simix_comm_management */ -smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, double rate) +smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate) { xbt_assert(mbox, "No rendez-vous point defined for irecv"); @@ -446,7 +413,7 @@ smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void * \ingroup simix_comm_management */ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void *, void *, smx_activity_t), void *data) + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); @@ -663,7 +630,7 @@ int simcall_sem_get_capacity(smx_sem_t sem) * \ingroup simix_file_management * */ -sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) +sg_size_t simcall_file_read(surf_file_t fd, sg_size_t size, sg_host_t host) { return simcall_BODY_file_read(fd, size, host); } @@ -672,7 +639,7 @@ sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, sg_host_t host) * \ingroup simix_file_management * */ -sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) +sg_size_t simcall_file_write(surf_file_t fd, sg_size_t size, sg_host_t host) { return simcall_BODY_file_write(fd, size, host); } @@ -681,7 +648,7 @@ sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, sg_host_t host) * \ingroup simix_file_management * \brief */ -smx_file_t simcall_file_open(const char* mount, const char* path, sg_storage_t st) +surf_file_t simcall_file_open(const char* mount, const char* path, sg_storage_t st) { return simcall_BODY_file_open(mount, path, st); } @@ -690,54 +657,11 @@ smx_file_t simcall_file_open(const char* mount, const char* path, sg_storage_t s * \ingroup simix_file_management * */ -int simcall_file_close(smx_file_t fd, sg_host_t host) +int simcall_file_close(surf_file_t fd, sg_host_t host) { return simcall_BODY_file_close(fd, host); } -/** - * \ingroup simix_file_management - * - */ -int simcall_file_unlink(smx_file_t fd, sg_host_t host) -{ - return simcall_BODY_file_unlink(fd, host); -} - -/** - * \ingroup simix_file_management - * - */ -sg_size_t simcall_file_get_size(smx_file_t fd){ - return simcall_BODY_file_get_size(fd); -} - -/** - * \ingroup simix_file_management - * - */ -sg_size_t simcall_file_tell(smx_file_t fd){ - return simcall_BODY_file_tell(fd); -} - -/** - * \ingroup simix_file_management - * - */ -int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){ - return simcall_BODY_file_seek(fd, offset, origin); -} - -/** - * \ingroup simix_file_management - * \brief Move a file to another location on the *same mount point*. - * - */ -int simcall_file_move(smx_file_t fd, const char* fullpath) -{ - return simcall_BODY_file_move(fd, fullpath); -} - void simcall_run_kernel(std::function const& code) { simcall_BODY_run_kernel(&code);