X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a784ea0b57101613a92e9fe1403d224e7ea4d501..939476f1fc7630eb237535b07ed0deef77ce1b24:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index c05655a657..0ec3f3987a 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,87 +5,70 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2018. 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 "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/CommImpl.hpp" -#include "src/mc/mc_forward.hpp" -#include "src/mc/mc_replay.h" +#include "src/kernel/activity/ConditionVariableImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.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.h" -#include "xbt/ex.h" -#include "xbt/functional.hpp" +#include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_io_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_actor_t actor) -{ - 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(&actor->simcall, 0); - } -} - /** - * \ingroup simix_process_management - * \brief Creates a synchro that executes some computation of an host. + * @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 - * \return A new SIMIX execution synchronization + * @param name Name of the execution synchro to create + * @param flops_amount amount Computation amount (in flops) + * @param priority computation priority + * @param bound + * @param host host where the synchro will be executed + * @return A new SIMIX execution synchronization */ -smx_activity_t simcall_execution_start(const char *name, - double flops_amount, - double priority, double bound) +smx_activity_t simcall_execution_start(std::string name, std::string category, double flops_amount, double priority, + double bound, simgrid::s4u::Host* host) { /* 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); + return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { + return SIMIX_execution_start(name, category, flops_amount, priority, bound, host); + }); } /** - * \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 - * \param timeout timeout - * \return A new SIMIX execution synchronization + * @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, - double timeout) +smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, + double* flops_amount, double* bytes_amount, double rate, double timeout) { /* checking for infinite values */ for (int i = 0 ; i < host_nb ; ++i) { @@ -98,95 +81,80 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s } } - 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, - timeout); + return simgrid::simix::simcall([name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout] { + return SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + }); } /** - * \ingroup simix_process_management - * \brief Cancels an execution synchro. + * @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 + * @param execution The execution synchro to cancel */ void simcall_execution_cancel(smx_activity_t execution) { - simcall_BODY_execution_cancel(execution); + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(execution); + if (exec->surf_action_ == nullptr) // FIXME: One test fails if I remove this, but I don't get why... + return; + simgrid::simix::simcall([exec] { exec->cancel(); }); } /** - * \ingroup simix_process_management - * \brief Changes the priority of an execution synchro. + * @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 + * @param execution The execution synchro + * @param priority The new priority */ void simcall_execution_set_priority(smx_activity_t execution, double priority) { /* checking for infinite values */ xbt_assert(std::isfinite(priority), "priority is not finite!"); + simgrid::simix::simcall([execution, priority] { - simcall_BODY_execution_set_priority(execution, priority); + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(execution); + exec->set_priority(priority); + }); } /** - * \ingroup simix_process_management - * \brief Changes the capping (the maximum CPU utilization) of an execution synchro. + * @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 + * @param execution The execution synchro + * @param bound The new bound */ void simcall_execution_set_bound(smx_activity_t execution, double bound) { - simcall_BODY_execution_set_bound(execution, bound); + simgrid::simix::simcall([execution, bound] { + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(execution); + exec->set_bound(bound); + }); } /** - * \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_activity_t execution) { return (e_smx_state_t) simcall_BODY_execution_wait(execution); } -/** - * \ingroup simix_process_management - * \brief Kills a SIMIX process. - * - * This function simply kills a process. - * - * \param process poor victim - */ -void simcall_process_kill(smx_actor_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_actor_t process) +e_smx_state_t simcall_execution_test(smx_activity_t execution) { - simcall_BODY_process_cleanup(process); + return (e_smx_state_t)simcall_BODY_execution_test(execution); } void simcall_process_join(smx_actor_t process, double timeout) @@ -195,13 +163,13 @@ void simcall_process_join(smx_actor_t process, double timeout) } /** - * \ingroup simix_process_management - * \brief Suspends a process. + * @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 + * @param process a SIMIX process */ void simcall_process_suspend(smx_actor_t process) { @@ -209,93 +177,44 @@ void simcall_process_suspend(smx_actor_t process) } /** - * \ingroup simix_process_management - * \brief Returns the amount of SIMIX processes in the system + * @ingroup simix_process_management + * @brief Set the user data of a #smx_actor_t. * - * Maestro internal process is not counted, only user code processes are - */ -int simcall_process_count() -{ - return simgrid::simix::kernelImmediate(SIMIX_process_count); -} - -/** - * \ingroup simix_process_management - * \brief Set the user data of a #smx_actor_t. - * - * This functions sets the user data associated to \a process. - * \param process SIMIX process - * \param data User data + * This functions sets the user data associated to @a process. + * @param process SIMIX process + * @param data User data */ void simcall_process_set_data(smx_actor_t process, void *data) { - simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); }); + simgrid::simix::simcall([process, data] { process->set_user_data(data); }); } /** - * \ingroup simix_process_management - * \brief Set the kill time of a process. + * @ingroup simix_process_management + * @brief Set the kill time of a process. */ 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->getCname()); - process->kill_timer = SIMIX_timer_set(kill_time, [=] { + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->get_cname(), process->host_->get_cname()); + process->kill_timer = SIMIX_timer_set(kill_time, [process] { simix_global->kill_process_function(process); process->kill_timer=nullptr; }); } /** - * \ingroup simix_process_management - * \brief Return the properties - * - * This function returns the properties associated with this process - */ -xbt_dict_t simcall_process_get_properties(smx_actor_t process) -{ - return process->properties; -} -/** - * \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_actor_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_actor_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_actor_t) simcall_process_restart(smx_actor_t process) -{ - return (smx_actor_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 * 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) { @@ -305,7 +224,7 @@ e_smx_state_t simcall_process_sleep(double duration) } /** - * \ingroup simix_comm_management + * @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*, simgrid::kernel::activity::CommImpl*), @@ -333,7 +252,7 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, } /** - * \ingroup simix_comm_management + * @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, @@ -353,7 +272,7 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double } /** - * \ingroup simix_comm_management + * @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*, simgrid::kernel::activity::CommImpl*), @@ -376,7 +295,7 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, } } /** - * \ingroup simix_comm_management + * @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*, simgrid::kernel::activity::CommImpl*), @@ -389,7 +308,7 @@ smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data) @@ -400,11 +319,11 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ void simcall_comm_cancel(smx_activity_t synchro) { - simgrid::simix::kernelImmediate([synchro] { + simgrid::simix::simcall([synchro] { simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); comm->cancel(); @@ -412,7 +331,7 @@ void simcall_comm_cancel(smx_activity_t synchro) } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) { @@ -420,7 +339,7 @@ unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ int simcall_comm_testany(smx_activity_t* comms, size_t count) { @@ -430,7 +349,7 @@ int simcall_comm_testany(smx_activity_t* comms, size_t count) } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management */ void simcall_comm_wait(smx_activity_t comm, double timeout) { @@ -439,22 +358,22 @@ void simcall_comm_wait(smx_activity_t comm, double timeout) } /** - * \brief Set the category of an synchro. + * @brief Set the category of an synchro. * * This functions changes the category only. It calls a surf function. - * \param synchro The execution synchro - * \param category The tracing category + * @param synchro The execution synchro + * @param category The tracing category */ -void simcall_set_category(smx_activity_t synchro, const char *category) +void simcall_set_category(smx_activity_t synchro, std::string category) { - if (category == nullptr) { + if (category.empty()) { return; } - simcall_BODY_set_category(synchro, category); + simgrid::simix::simcall([synchro, category] { SIMIX_set_category(synchro, category); }); } /** - * \ingroup simix_comm_management + * @ingroup simix_comm_management * */ int simcall_comm_test(smx_activity_t comm) @@ -463,7 +382,7 @@ int simcall_comm_test(smx_activity_t comm) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ smx_mutex_t simcall_mutex_init() @@ -472,11 +391,11 @@ smx_mutex_t simcall_mutex_init() 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(); } - 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) @@ -485,7 +404,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) @@ -494,7 +413,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) @@ -503,25 +422,16 @@ void simcall_mutex_unlock(smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ smx_cond_t simcall_cond_init() { - return simcall_BODY_cond_init(); + return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** - * \ingroup simix_synchro_management - * - */ -void simcall_cond_signal(smx_cond_t cond) -{ - simcall_BODY_cond_signal(cond); -} - -/** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) @@ -530,55 +440,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); -} - -/** - * \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); + return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_sem_acquire(smx_sem_t sem) @@ -587,58 +459,31 @@ 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); + return simcall_BODY_sem_acquire_timeout(sem, timeout); } -/** - * \ingroup simix_synchro_management - * - */ -int simcall_sem_get_capacity(smx_sem_t sem) +smx_activity_t simcall_io_start(std::string name, sg_size_t size, simgrid::s4u::Storage* storage) { - return simcall_BODY_sem_get_capacity(sem); -} - -/** - * \ingroup simix_file_management - * - */ -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); -} + /* checking for infinite values */ + xbt_assert(std::isfinite(size), "size is not finite!"); -/** - * \ingroup simix_file_management - * - */ -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); + return simgrid::simix::simcall([name, size, storage] { return SIMIX_io_start(name, size, storage); }); } -/** - * \ingroup simix_file_management - * \brief - */ -surf_file_t simcall_file_open(const char* mount, const char* path, sg_storage_t st) +sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size) { - return simcall_BODY_file_open(mount, path, st); + return simcall_BODY_storage_read(st, size); } -/** - * \ingroup simix_file_management - * - */ -int simcall_file_close(surf_file_t fd, sg_host_t host) +sg_size_t simcall_storage_write(surf_storage_t st, sg_size_t size) { - return simcall_BODY_file_close(fd, host); + return simcall_BODY_storage_write(st, size); } void simcall_run_kernel(std::function const& code)