X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ee0641f32c8e47aa709bbd472a4d0d2b4cc3663..706a0c36671aa5ab7afe12afe987cc1c72f049ac:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 5a0ab1219d..8a71f117c5 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,589 +5,106 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include /* std::isfinite() */ - -#include - -#include - -#include - -#include "src/mc/mc_replay.h" -#include "smx_private.h" -#include "src/mc/mc_forward.hpp" -#include "xbt/ex.h" #include "mc/mc.h" -#include "src/simix/smx_host_private.h" -#include "src/kernel/activity/SynchroComm.hpp" - -#include +#include "simgrid/simix/blocking_simcall.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/ConditionVariableImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" +#include "src/kernel/activity/MutexImpl.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/simix/smx_host_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_process_t process) -{ - 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); - } else { - SIMIX_simcall_handle(&process->simcall, 0); - } -} - -// ***** AS simcalls - -/** - * \ingroup simix_host_management - * \brief Returns a dict of the properties assigned to a router or AS. - * - * \param name The name of the router or AS - * \return The properties - */ -xbt_dict_t simcall_asr_get_properties(const char *name) -{ - return simcall_BODY_asr_get_properties(name); -} - -/** - * \ingroup simix_process_management - * \brief Creates a synchro that executes some computation of an host. - * - * This function creates a SURF action and allocates the data necessary - * to create the SIMIX synchro. It can raise a host_error exception if the host crashed. - * - * \param name Name of the execution synchro to create - * \param flops_amount amount Computation amount (in flops) - * \param priority computation priority - * \param bound - * \param affinity_mask - * \return A new SIMIX execution synchronization - */ -smx_synchro_t simcall_execution_start(const char *name, - double flops_amount, - double priority, double bound, unsigned long affinity_mask) -{ - /* checking for infinite values */ - xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!"); - xbt_assert(std::isfinite(priority), "priority is not finite!"); - - return simcall_BODY_execution_start(name, flops_amount, priority, bound, affinity_mask); -} - /** - * \ingroup simix_process_management - * \brief Creates a synchro that may involve parallel computation on + * @ingroup simix_process_management + * @brief Creates a synchro that may involve parallel computation on * several hosts and communication between them. * - * \param name Name of the execution synchro to create - * \param host_nb Number of hosts where the synchro will be executed - * \param host_list Array (of size host_nb) of hosts where the synchro will be executed - * \param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes) - * \param bytes_amount Array (of size host_nb * host_nb) representing the communication + * @param name Name of the execution synchro to create + * @param host_nb Number of hosts where the synchro will be executed + * @param host_list Array (of size host_nb) of hosts where the synchro will be executed + * @param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes) + * @param bytes_amount Array (of size host_nb * host_nb) representing the communication * amount between each pair of hosts - * \param amount the SURF action amount - * \param rate the SURF action rate - * \return A new SIMIX execution synchronization + * @param rate the SURF action rate + * @param timeout timeout + * @return A new SIMIX execution synchronization */ -smx_synchro_t simcall_execution_parallel_start(const char *name, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double amount, - double rate) +smx_activity_t simcall_execution_parallel_start(const std::string& name, int host_nb, const sg_host_t* host_list, + const double* flops_amount, const double* bytes_amount, double rate, + double timeout) { - int i,j; /* checking for infinite values */ - for (i = 0 ; i < host_nb ; ++i) { - xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); + for (int i = 0 ; i < host_nb ; ++i) { + if (flops_amount != nullptr) + 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); } } } - xbt_assert(std::isfinite(amount), "amount is not finite!"); xbt_assert(std::isfinite(rate), "rate is not finite!"); - return simcall_BODY_execution_parallel_start(name, host_nb, host_list, - flops_amount, - bytes_amount, - amount, rate); - -} - -/** - * \ingroup simix_process_management - * \brief Cancels an execution synchro. - * - * This functions stops the execution. It calls a surf function. - * \param execution The execution synchro to cancel - */ -void simcall_execution_cancel(smx_synchro_t execution) -{ - simcall_BODY_execution_cancel(execution); -} - -/** - * \ingroup simix_process_management - * \brief Changes the priority of an execution synchro. - * - * This functions changes the priority only. It calls a surf function. - * \param execution The execution synchro - * \param priority The new priority - */ -void simcall_execution_set_priority(smx_synchro_t execution, double priority) -{ - /* checking for infinite values */ - xbt_assert(std::isfinite(priority), "priority is not finite!"); - - simcall_BODY_execution_set_priority(execution, priority); -} - -/** - * \ingroup simix_process_management - * \brief Changes the capping (the maximum CPU utilization) of an execution synchro. - * - * This functions changes the capping only. It calls a surf function. - * \param execution The execution synchro - * \param bound The new bound - */ -void simcall_execution_set_bound(smx_synchro_t execution, double bound) -{ - simcall_BODY_execution_set_bound(execution, bound); -} - -/** - * \ingroup simix_process_management - * \brief Changes the CPU affinity of an execution synchro. - * - * This functions changes the CPU affinity of an execution synchro. See taskset(1) on Linux. - * \param execution The execution synchro - * \param host Host - * \param mask Affinity mask - */ -void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask) -{ - simcall_BODY_execution_set_affinity(execution, host, mask); + return simgrid::simix::simcall([name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout] { + return SIMIX_execution_parallel_start(std::move(name), host_nb, host_list, flops_amount, bytes_amount, rate, + timeout); + }); } /** - * \ingroup simix_host_management - * \brief Waits for the completion of an execution synchro and destroy it. + * @ingroup simix_host_management + * @brief Waits for the completion of an execution synchro and destroy it. * - * \param execution The execution synchro + * @param execution The execution synchro */ -e_smx_state_t simcall_execution_wait(smx_synchro_t execution) +e_smx_state_t simcall_execution_wait(smx_activity_t execution) { return (e_smx_state_t) simcall_BODY_execution_wait(execution); } - -/** - * \ingroup simix_vm_management - * \brief Create a VM on the given physical host. - * - * \param name VM name - * \param host Physical host - * - * \return The host object of the VM - */ -void* simcall_vm_create(const char *name, sg_host_t phys_host) -{ - return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host)); -} - -/** - * \ingroup simix_vm_management - * \brief Start the given VM to the given physical host - * - * \param vm VM - */ -void simcall_vm_start(sg_host_t vm) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm)); -} - -/** - * \ingroup simix_vm_management - * \brief Get the state of the given VM - * - * \param vm VM - * \return The state of the VM - */ -int simcall_vm_get_state(sg_host_t vm) -{ - return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_state, vm)); -} - -/** - * \ingroup simix_vm_management - * \brief Get the name of the physical host on which the given VM runs. - * - * \param vm VM - * \return The name of the physical host - */ -void *simcall_vm_get_pm(sg_host_t vm) -{ - return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm)); -} - -void simcall_vm_set_bound(sg_host_t vm, double bound) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound)); -} - -void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_affinity, vm, pm, mask)); -} - -/** - * \ingroup simix_vm_management - * \brief Migrate the given VM to the given physical host - * - * \param vm VM - * \param host Destination physical host - */ -void simcall_vm_migrate(sg_host_t vm, sg_host_t host) +e_smx_state_t simcall_execution_test(smx_activity_t execution) { - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host)); + return (e_smx_state_t)simcall_BODY_execution_test(execution); } -/** - * \ingroup simix_vm_management - * \brief Suspend the given VM - * - * \param vm VM - */ -void simcall_vm_suspend(sg_host_t vm) -{ - simcall_BODY_vm_suspend(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Resume the given VM - * - * \param vm VM - */ -void simcall_vm_resume(sg_host_t vm) -{ - simcall_BODY_vm_resume(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Save the given VM - * - * \param vm VM - */ -void simcall_vm_save(sg_host_t vm) -{ - simcall_BODY_vm_save(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Restore the given VM - * - * \param vm VM - */ -void simcall_vm_restore(sg_host_t vm) -{ - simcall_BODY_vm_restore(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Shutdown the given VM - * - * \param vm VM - */ -void simcall_vm_shutdown(sg_host_t vm) -{ - simcall_BODY_vm_shutdown(vm); -} - -/** - * \ingroup simix_vm_management - * \brief Destroy the given VM - * - * \param vm VM - */ -void simcall_vm_destroy(sg_host_t vm) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_destroy, vm)); -} - -/** - * \ingroup simix_vm_management - * \brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration - * The simcall actually invokes the following calls: - * simcall_vm_set_affinity(vm, src_pm, 0); - * simcall_vm_migrate(vm, dst_pm); - * simcall_vm_resume(vm); - * - * It is called at the end of the migration_rx_fun function from msg/msg_vm.c - * - * \param vm VM to migrate - * \param src_pm Source physical host - * \param dst_pmt Destination physical host - */ -void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm) -{ - simgrid::simix::kernelImmediate(std::bind( - SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm)); -} - -/** - * \ingroup simix_process_management - * \brief Kills a SIMIX process. - * - * This function simply kills a process. - * - * \param process poor victim - */ -void simcall_process_kill(smx_process_t process) -{ - simcall_BODY_process_kill(process); -} - -/** - * \ingroup simix_process_management - * \brief Kills all SIMIX processes. - */ -void simcall_process_killall(int reset_pid) -{ - simcall_BODY_process_killall(reset_pid); -} - -/** - * \ingroup simix_process_management - * \brief Cleans up a SIMIX process. - * \param process poor victim (must have already been killed) - */ -void simcall_process_cleanup(smx_process_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_process_t process, sg_host_t dest) -{ - simcall_BODY_process_set_host(process, dest); -} - -void simcall_process_join(smx_process_t process, double timeout) +void simcall_process_join(smx_actor_t process, double timeout) { simcall_BODY_process_join(process, timeout); } /** - * \ingroup simix_process_management - * \brief Suspends a process. - * - * This function suspends the process by suspending the synchro - * it was waiting for completion. - * - * \param process a SIMIX process + * @ingroup simix_process_management + * @brief Suspends an actor */ -void simcall_process_suspend(smx_process_t process) +void simcall_process_suspend(smx_actor_t process) { - xbt_assert(process, "Invalid parameters"); - 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_process_t process) -{ - simcall_BODY_process_resume(process); -} - -/** - * \ingroup simix_process_management - * \brief Returns the amount of SIMIX processes in the system - * - * Maestro internal process is not counted, only user code processes are - */ -int simcall_process_count(void) -{ - return simgrid::simix::kernelImmediate(SIMIX_process_count); -} - -/** - * \ingroup simix_process_management - * \brief Return the PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process - */ -int simcall_process_get_PID(smx_process_t process) -{ - return SIMIX_process_get_PID(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the parent PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process parenrt - */ -int simcall_process_get_PPID(smx_process_t process) -{ - return SIMIX_process_get_PPID(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the user data of a #smx_process_t. - * \param process a SIMIX process - * \return the user data of this process - */ -void* simcall_process_get_data(smx_process_t process) -{ - return SIMIX_process_get_data(process); -} - -/** - * \ingroup simix_process_management - * \brief Set the user data of a #smx_process_t. - * - * This functions sets the user data associated to \a process. - * \param process SIMIX process - * \param data User data - */ -void simcall_process_set_data(smx_process_t process, void *data) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data)); -} - -/** - * \ingroup simix_process_management - * \brief Set the kill time of a process. - */ -void simcall_process_set_kill_time(smx_process_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->name.c_str(), sg_host_get_name(process->host)); - 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_process_t process) { - return SIMIX_timer_get_date(process->kill_timer); -} - -/** - * \ingroup simix_process_management - * \brief Return the name of an agent. - * - * This functions checks whether \a process is a valid pointer or not and return its name. - * \param process SIMIX process - * \return The process name - */ -const char* simcall_process_get_name(smx_process_t process) -{ - return SIMIX_process_get_name(process); -} - -/** - * \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_process_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 - */ -xbt_dict_t simcall_process_get_properties(smx_process_t process) -{ - return SIMIX_process_get_properties(process); -} -/** - * \ingroup simix_process_management - * \brief Add an on_exit function - * Add an on_exit function which will be executed when the process exits/is killed. - */ -XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data) -{ - 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_process_t process, int auto_restart) -{ - simcall_BODY_process_auto_restart_set(process, auto_restart); -} - -/** - * \ingroup simix_process_management - * \brief Restarts the process, killing it and starting it again from scratch. - */ -XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process) -{ - return (smx_process_t) simcall_BODY_process_restart(process); -} -/** - * \ingroup simix_process_management - * \brief Creates a new sleep SIMIX synchro. + * @ingroup simix_process_management + * @brief Creates a new sleep SIMIX synchro. * * This function creates a SURF action and allocates the data necessary - * to create the SIMIX synchro. It can raise a host_error exception if the + * to create the SIMIX synchro. It can raise a HostFailureException if the * host crashed. The default SIMIX name of the synchro is "sleep". * - * \param duration Time duration of the sleep. - * \return A result telling whether the sleep was successful + * @param duration Time duration of the sleep. + * @return A result telling whether the sleep was successful */ e_smx_state_t simcall_process_sleep(double duration) { @@ -597,29 +114,12 @@ e_smx_state_t simcall_process_sleep(double 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 + * @ingroup simix_comm_management */ -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_process_t process) -{ - simcall_BODY_mbox_set_receiver(mbox, process); -} - -/** - * \ingroup simix_comm_management - */ -void simcall_comm_send(smx_process_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_synchro_t), - void (*copy_data_fun)(smx_synchro_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)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, + double timeout) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -630,7 +130,7 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ + smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ comm = simcall_comm_isend(sender, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); simcall_comm_wait(comm, timeout); @@ -643,15 +143,14 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -smx_synchro_t simcall_comm_isend(smx_process_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_synchro_t), - void (*clean_fun)(void *), - void (*copy_data_fun)(smx_synchro_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)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, int detached) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -665,19 +164,19 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, doubl } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_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)(simgrid::kernel::activity::CommImpl*, 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"); if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ + smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); simcall_comm_wait(comm, timeout); @@ -689,12 +188,12 @@ void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buf } } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_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)(simgrid::kernel::activity::CommImpl*, void*, size_t), + void* data, double rate) { xbt_assert(mbox, "No rendez-vous point defined for irecv"); @@ -703,39 +202,28 @@ smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, voi } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void *, void *, smx_synchro_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); -} - -/** - * \ingroup simix_comm_management - */ -void simcall_comm_cancel(smx_synchro_t synchro) -{ - simgrid::simix::kernelImmediate([synchro]{ - simgrid::kernel::activity::Comm *comm = static_cast(synchro); - comm->cancel(); - }); + return simgrid::simix::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) +unsigned int simcall_comm_waitany(smx_activity_t* comms, size_t count, double timeout) { - return simcall_BODY_comm_waitany(comms, timeout); + return simcall_BODY_comm_waitany(comms, count, timeout); } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -int simcall_comm_testany(smx_synchro_t* comms, size_t count) +int simcall_comm_testany(smx_activity_t* comms, size_t count) { if (count == 0) return -1; @@ -743,53 +231,39 @@ int simcall_comm_testany(smx_synchro_t* comms, size_t count) } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ -void simcall_comm_wait(smx_synchro_t comm, double timeout) +void simcall_comm_wait(smx_activity_t comm, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); simcall_BODY_comm_wait(comm, 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 category The tracing category - */ -void simcall_set_category(smx_synchro_t synchro, const char *category) -{ - if (category == nullptr) { - return; - } - simcall_BODY_set_category(synchro, category); -} - -/** - * \ingroup simix_comm_management + * @ingroup simix_comm_management * */ -int simcall_comm_test(smx_synchro_t comm) +int simcall_comm_test(smx_activity_t comm) { return simcall_BODY_comm_test(comm); } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ -smx_mutex_t simcall_mutex_init(void) +smx_mutex_t simcall_mutex_init() { - if(!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 + if (simix_global == nullptr) { + fprintf(stderr, "You must initialize the SimGrid engine before using it\n"); // We can't use xbt_die since we may + // get there before the initialization xbt_abort(); } - return simcall_BODY_mutex_init(); + return simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_mutex_lock(smx_mutex_t mutex) @@ -798,7 +272,7 @@ void simcall_mutex_lock(smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ int simcall_mutex_trylock(smx_mutex_t mutex) @@ -807,7 +281,7 @@ int simcall_mutex_trylock(smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_mutex_unlock(smx_mutex_t mutex) @@ -816,25 +290,16 @@ void simcall_mutex_unlock(smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management - * - */ -smx_cond_t simcall_cond_init(void) -{ - return simcall_BODY_cond_init(); -} - -/** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ -void simcall_cond_signal(smx_cond_t cond) +smx_cond_t simcall_cond_init() { - simcall_BODY_cond_signal(cond); + return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) @@ -843,55 +308,17 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ -void simcall_cond_wait_timeout(smx_cond_t cond, - smx_mutex_t mutex, - double timeout) +int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_cond_wait_timeout(cond, mutex, timeout); + return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); } /** - * \ingroup simix_synchro_management - * - */ -void simcall_cond_broadcast(smx_cond_t cond) -{ - simcall_BODY_cond_broadcast(cond); -} - -/** - * \ingroup simix_synchro_management - * - */ -smx_sem_t simcall_sem_init(int capacity) -{ - return simcall_BODY_sem_init(capacity); -} - -/** - * \ingroup simix_synchro_management - * - */ -void simcall_sem_release(smx_sem_t sem) -{ - simcall_BODY_sem_release(sem); -} - -/** - * \ingroup simix_synchro_management - * - */ -int simcall_sem_would_block(smx_sem_t sem) -{ - return simcall_BODY_sem_would_block(sem); -} - -/** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_sem_acquire(smx_sem_t sem) @@ -900,154 +327,18 @@ void simcall_sem_acquire(smx_sem_t sem) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ -void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) +int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_sem_acquire_timeout(sem, timeout); -} - -/** - * \ingroup simix_synchro_management - * - */ -int simcall_sem_get_capacity(smx_sem_t sem) -{ - return simcall_BODY_sem_get_capacity(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) -{ - return simcall_BODY_file_write(fd, size, host); -} - -/** - * \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); + return simcall_BODY_sem_acquire_timeout(sem, timeout); } -/** - * \ingroup simix_file_management - * - */ -xbt_dynar_t simcall_file_get_info(smx_file_t fd) +e_smx_state_t simcall_io_wait(const smx_activity_t& io) { - 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) -{ - return simcall_BODY_storage_get_content(storage); + return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get())); } void simcall_run_kernel(std::function const& code) @@ -1074,11 +365,52 @@ const char *SIMIX_simcall_name(e_smx_simcall_t kind) { namespace simgrid { namespace simix { -void unblock(smx_process_t process) +void unblock(smx_actor_t process) { xbt_assert(SIMIX_is_maestro()); SIMIX_simcall_answer(&process->simcall); } +} // namespace simix +} // namespace simgrid +/* ****************************DEPRECATED CALLS******************************* */ +void simcall_process_set_kill_time(smx_actor_t process, double kill_time) +{ + simgrid::simix::simcall([process, kill_time] { process->set_kill_time(kill_time); }); +} +void simcall_comm_cancel(smx_activity_t comm) +{ + simgrid::simix::simcall([comm] { boost::static_pointer_cast(comm)->cancel(); }); } +void simcall_execution_cancel(smx_activity_t exec) +{ + simgrid::simix::simcall([exec] { boost::static_pointer_cast(exec)->cancel(); }); +} +void simcall_execution_set_priority(smx_activity_t exec, double priority) +{ + simgrid::simix::simcall([exec, priority] { + boost::static_pointer_cast(exec)->set_priority(priority); + }); +} + +void simcall_execution_set_bound(smx_activity_t exec, double bound) +{ + simgrid::simix::simcall( + [exec, bound] { boost::static_pointer_cast(exec)->set_bound(bound); }); +} + +smx_activity_t simcall_execution_start(const std::string& name, const std::string& category, double flops_amount, + double priority, double bound, sg_host_t host) +{ + return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { + return simgrid::kernel::activity::ExecImplPtr( + new simgrid::kernel::activity::ExecImpl(std::move(name), std::move(category), nullptr, host)) + ->start(flops_amount, priority, bound); + }); +} + +// deprecated +void SIMIX_comm_finish(smx_activity_t synchro) +{ + boost::static_pointer_cast(synchro)->finish(); }