X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f389553c3b6a2070fca0562c8143ff0b143ab52..d6d15fab29caf0608cc43bffc3fa8f16baf6e638:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index a9ad2c9471..482750dd27 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -25,8 +25,8 @@ #include "src/kernel/activity/SynchroComm.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 "src/surf/VirtualMachineImpl.hpp" #include "xbt/ex.h" #include @@ -35,31 +35,17 @@ 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); } } -// ***** 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. @@ -97,22 +83,18 @@ smx_activity_t simcall_execution_start(const char *name, * amount between each pair of hosts * \param amount the SURF action amount * \param rate the SURF action rate + * \param timeout timeout * \return A new SIMIX execution synchronization */ -smx_activity_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 char* name, int host_nb, sg_host_t* host_list, + 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); } @@ -122,11 +104,8 @@ smx_activity_t simcall_execution_parallel_start(const char *name, 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); - + return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, + timeout); } /** @@ -181,162 +160,6 @@ 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 dest Physical host on which to create the VM - * - * \return The host object of the VM - */ -sg_host_t simcall_vm_create(const char* name, sg_host_t dest) -{ - return simgrid::simix::kernelImmediate([&name, &dest] { - sg_host_t host = new simgrid::s4u::VirtualMachine(name, dest); - host->extension_set(new simgrid::simix::Host()); - - return 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)); -} - -/** - * \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) -{ - simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host)); -} - -/** - * \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_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. @@ -399,8 +222,6 @@ void simcall_process_join(smx_actor_t process, double timeout) */ void simcall_process_suspend(smx_actor_t process) { - xbt_assert(process, "Invalid parameters"); - simcall_BODY_process_suspend(process); } @@ -429,17 +250,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. @@ -462,8 +272,7 @@ 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->name.c_str(), sg_host_get_name(process->host)); + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->cname()); process->kill_timer = SIMIX_timer_set(kill_time, [=] { simix_global->kill_process_function(process); process->kill_timer=nullptr; @@ -546,22 +355,6 @@ 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 */ @@ -705,7 +498,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)