X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4052b6d9960bd9792127d006c4f359b946cb7baa..138a767165df006f5ae2a28a5d0db79f06c6a7fb:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 13b9cc1bbd..447032f7fb 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,87 +5,69 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2018. 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.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/MutexImpl.hpp" -#include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" -#include "xbt/ex.h" -#include "xbt/functional.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->get_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 - * \param host host where the synchro will be executed - * \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, - simgrid::s4u::Host* host) +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 simgrid::simix::simcall([name, flops_amount, priority, bound, host] { - return SIMIX_execution_start(name, flops_amount, priority, bound, host); + 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 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, +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 */ @@ -107,11 +89,11 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s } /** - * \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) { @@ -123,12 +105,12 @@ void simcall_execution_cancel(smx_activity_t execution) } /** - * \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) { @@ -143,12 +125,12 @@ void simcall_execution_set_priority(smx_activity_t execution, double 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) { @@ -160,10 +142,10 @@ void simcall_execution_set_bound(smx_activity_t execution, double 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) { @@ -181,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) { @@ -195,28 +177,28 @@ void simcall_process_suspend(smx_actor_t process) } /** - * \ingroup simix_process_management - * \brief Set the user data of a #smx_actor_t. + * @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::simcall([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->get_cname(), process->host->get_cname()); + 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; @@ -224,15 +206,15 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) } /** - * \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) { @@ -242,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*), @@ -270,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, @@ -290,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*), @@ -313,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*), @@ -326,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) @@ -337,7 +319,7 @@ 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) { @@ -349,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) { @@ -357,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) { @@ -367,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) { @@ -376,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; } 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) @@ -400,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() @@ -413,7 +395,7 @@ smx_mutex_t simcall_mutex_init() } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_mutex_lock(smx_mutex_t mutex) @@ -422,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) @@ -431,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) @@ -440,7 +422,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ smx_cond_t simcall_cond_init() @@ -449,7 +431,7 @@ smx_cond_t simcall_cond_init() } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) @@ -458,7 +440,7 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) @@ -468,7 +450,7 @@ int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ void simcall_sem_acquire(smx_sem_t sem) @@ -477,7 +459,7 @@ void simcall_sem_acquire(smx_sem_t sem) } /** - * \ingroup simix_synchro_management + * @ingroup simix_synchro_management * */ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)