X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d3a632d7de077980120453b3863065bed65201c..be433eeb2c53b337a26b3d712f64b408fca53ae9:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 4f93445a4b..e90bfa4741 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); @@ -222,20 +208,6 @@ void simcall_process_suspend(smx_actor_t process) simcall_BODY_process_suspend(process); } -/** - * \ingroup simix_process_management - * \brief Resumes a suspended process. - * - * This function resumes a suspended process by resuming the synchro - * it was waiting for completion. - * - * \param process a SIMIX process - */ -void simcall_process_resume(smx_actor_t process) -{ - simcall_BODY_process_resume(process); -} - /** * \ingroup simix_process_management * \brief Returns the amount of SIMIX processes in the system @@ -269,42 +241,22 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr) return; - XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->cname()); + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->getCname()); process->kill_timer = SIMIX_timer_set(kill_time, [=] { simix_global->kill_process_function(process); process->kill_timer=nullptr; }); } -/** - * \ingroup simix_process_management - * \brief Get the kill time of a process (or 0 if unset). - */ -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 * - * This functions returns the properties associated with this process + * This function returns the properties associated with this process */ xbt_dict_t simcall_process_get_properties(smx_actor_t process) { - return SIMIX_process_get_properties(process); + return process->properties; } /** * \ingroup simix_process_management @@ -355,7 +307,7 @@ 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, +void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t 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) { @@ -383,7 +335,7 @@ 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, +smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, size_t 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), @@ -689,52 +641,6 @@ 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(surf_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(surf_file_t fd) -{ - return simcall_BODY_file_get_size(fd); -} - -/** - * \ingroup simix_file_management - * - */ -sg_size_t simcall_file_tell(surf_file_t fd) -{ - return simcall_BODY_file_tell(fd); -} - -/** - * \ingroup simix_file_management - * - */ -int simcall_file_seek(surf_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(surf_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);