X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4aea7e49e47243417f094ee62b8e43de066e56d2..7c4bef6efee6ba4a06f99e78ea1198d74dc520fc:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index c92f4e3b5c..1d1b2a682b 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -15,34 +15,31 @@ #include -#include - -#include -#include - #include "mc/mc.h" +#include "simgrid/s4u/VirtualMachine.hpp" +#include "simgrid/simix.hpp" +#include "simgrid/simix/blocking_simcall.hpp" #include "smx_private.h" -#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.h" #include "xbt/ex.h" - -#include +#include "xbt/functional.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_actor_t process) +void simcall_call(smx_actor_t actor) { - if (process != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(), - SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call); - SIMIX_process_yield(process); + if (actor != simix_global->maestro_process) { + XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->cname(), SIMIX_simcall_name(actor->simcall.call), + (int)actor->simcall.call); + SIMIX_process_yield(actor); } else { - SIMIX_simcall_handle(&process->simcall, 0); + SIMIX_simcall_handle(&actor->simcall, 0); } } @@ -90,12 +87,11 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s double* flops_amount, double* bytes_amount, double amount, double rate, double timeout) { - int i,j; /* checking for infinite values */ - for (i = 0 ; i < host_nb ; ++i) { + for (int i = 0 ; i < host_nb ; ++i) { xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); if (bytes_amount != nullptr) { - for (j = 0 ; j < host_nb ; ++j) { + for (int j = 0 ; j < host_nb ; ++j) { xbt_assert(std::isfinite(bytes_amount[i + host_nb * j]), "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j); } @@ -193,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); @@ -226,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 @@ -251,17 +219,6 @@ int simcall_process_count() return simgrid::simix::kernelImmediate(SIMIX_process_count); } -/** - * \ingroup simix_process_management - * \brief Return the user data of a #smx_actor_t. - * \param process a SIMIX process - * \return the user data of this process - */ -void* simcall_process_get_data(smx_actor_t process) -{ - return SIMIX_process_get_data(process); -} - /** * \ingroup simix_process_management * \brief Set the user data of a #smx_actor_t. @@ -272,7 +229,7 @@ void* simcall_process_get_data(smx_actor_t process) */ void simcall_process_set_data(smx_actor_t process, void *data) { - simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data)); + simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); }); } /** @@ -284,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 @@ -330,16 +267,6 @@ XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_ { simcall_BODY_process_on_exit(process, fun, data); } -/** - * \ingroup simix_process_management - * \brief Sets the process to be auto-restarted or not by SIMIX when its host comes back up. - * Will restart the process when the host comes back up if auto_restart is set to 1. - */ - -XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart) -{ - simcall_BODY_process_auto_restart_set(process, auto_restart); -} /** * \ingroup simix_process_management @@ -367,30 +294,12 @@ e_smx_state_t simcall_process_sleep(double duration) return (e_smx_state_t) simcall_BODY_process_sleep(duration); } -/** - * \ingroup simix_mbox_management - * \brief Creates a new rendez-vous point - * \param name The name of the rendez-vous point - * \return The created rendez-vous point - */ -smx_mailbox_t simcall_mbox_create(const char *name) -{ - return simcall_BODY_mbox_create(name); -} - -void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process) -{ - simcall_BODY_mbox_set_receiver(mbox, process); -} - /** * \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!"); @@ -416,13 +325,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!"); @@ -438,10 +345,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"); @@ -462,10 +368,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"); @@ -476,12 +381,12 @@ 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) +smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); - return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data); + return simcall_BODY_comm_iprobe(mbox, type, match_fun, data); } /** @@ -489,8 +394,9 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int ta */ void simcall_comm_cancel(smx_activity_t synchro) { - simgrid::simix::kernelImmediate([synchro]{ - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::simix::kernelImmediate([synchro] { + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); comm->cancel(); }); } @@ -526,7 +432,7 @@ void simcall_comm_wait(smx_activity_t comm, double timeout) * \brief Set the category of an synchro. * * This functions changes the category only. It calls a surf function. - * \param execution The execution synchro + * \param synchro The execution synchro * \param category The tracing category */ void simcall_set_category(smx_activity_t synchro, const char *category) @@ -552,7 +458,7 @@ int simcall_comm_test(smx_activity_t comm) */ smx_mutex_t simcall_mutex_init() { - if(!simix_global) { + if (not simix_global) { fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization xbt_abort(); } @@ -693,132 +599,18 @@ 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) -{ - return simcall_BODY_file_read(fd, size, 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_read(surf_file_t fd, sg_size_t size) { - return simcall_BODY_file_write(fd, size, host); + return simcall_BODY_file_read(fd, size); } /** * \ingroup simix_file_management - * \brief - */ -smx_file_t simcall_file_open(const char* fullpath, sg_host_t host) -{ - return simcall_BODY_file_open(fullpath, host); -} - -/** - * \ingroup simix_file_management - * - */ -int simcall_file_close(smx_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 - * - */ -xbt_dynar_t simcall_file_get_info(smx_file_t fd) -{ - return simcall_BODY_file_get_info(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); -} - -/** - * \ingroup simix_storage_management - * \brief Returns the free space size on a given storage element. - * \param storage a storage - * \return Return the free space size on a given storage element (as sg_size_t) - */ -sg_size_t simcall_storage_get_free_size (smx_storage_t storage){ - return simcall_BODY_storage_get_free_size(storage); -} - -/** - * \ingroup simix_storage_management - * \brief Returns the used space size on a given storage element. - * \param storage a storage - * \return Return the used space size on a given storage element (as sg_size_t) - */ -sg_size_t simcall_storage_get_used_size (smx_storage_t storage){ - return simcall_BODY_storage_get_used_size(storage); -} - -/** - * \ingroup simix_storage_management - * \brief Returns a dict of the properties assigned to a storage element. - * - * \param storage A storage element - * \return The properties of this storage element - */ -xbt_dict_t simcall_storage_get_properties(smx_storage_t storage) -{ - return simcall_BODY_storage_get_properties(storage); -} - -/** - * \ingroup simix_storage_management - * \brief Returns a dict containing the content of a storage element. * - * \param storage A storage element - * \return The content of this storage element as a dict (full path file => size) */ -xbt_dict_t simcall_storage_get_content(smx_storage_t storage) +sg_size_t simcall_file_write(surf_file_t fd, sg_size_t size) { - return simcall_BODY_storage_get_content(storage); + return simcall_BODY_file_write(fd, size); } void simcall_run_kernel(std::function const& code)