X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98df1910047ee49bd36a800594ea6b90a732d9e6..b23e21f8228228b65702ca054fccf092b73e8aab:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index a7461149a4..8d915db35b 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,7 +5,7 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -20,104 +20,69 @@ #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" /** - * @ingroup simix_process_management - * @brief Creates a synchro that may involve parallel computation on - * several hosts and communication between them. + * @ingroup simix_host_management + * @brief Waits for the completion of an execution synchro and destroy it. * - * @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 execution The execution synchro */ -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) +simgrid::kernel::activity::State simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 { - /* checking for infinite values */ - 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 (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); - } - } - } + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::simcall_blocking( + [execution, issuer, timeout] { execution->wait_for(issuer, timeout); }); + return simgrid::kernel::activity::State::DONE; +} - xbt_assert(std::isfinite(rate), "rate is not finite!"); +simgrid::kernel::activity::State simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 +{ + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::simcall_blocking( + [execution, issuer, timeout] { execution->wait_for(issuer, timeout); }); + return simgrid::kernel::activity::State::DONE; +} - 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); - }); +bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution) // XBT_ATTRIB_DEPRECATED_v330 +{ + return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); } -/** - * @ingroup simix_host_management - * @brief Waits for the completion of an execution synchro and destroy it. - * - * @param execution The execution synchro - */ -e_smx_state_t simcall_execution_wait(const smx_activity_t& execution) +bool simcall_execution_test(const simgrid::kernel::activity::ActivityImplPtr& execution) // XBT_ATTRIB_DEPRECATED_v330 { - return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get())); + return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); } -e_smx_state_t simcall_execution_test(const smx_activity_t& execution) +unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout) { - return (e_smx_state_t)simcall_BODY_execution_test(static_cast(execution.get())); + return simcall_BODY_execution_waitany_for(execs, count, timeout); } -void simcall_process_join(smx_actor_t process, double timeout) +void simcall_process_join(smx_actor_t process, double timeout) // XBT_DEPRECATED_v328 { - simcall_BODY_process_join(process, timeout); + simgrid::kernel::actor::ActorImpl::self()->join(process, timeout); } -/** - * @ingroup simix_process_management - * @brief Suspends an actor - */ -void simcall_process_suspend(smx_actor_t process) +void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328 { - simcall_BODY_process_suspend(process); + process->iface()->suspend(); } -/** - * @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 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 - */ -e_smx_state_t simcall_process_sleep(double duration) +simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329 { - /* checking for infinite values */ - xbt_assert(std::isfinite(duration), "duration is not finite!"); - return (e_smx_state_t) simcall_BODY_process_sleep(duration); + simgrid::kernel::actor::ActorImpl::self()->sleep(duration); + return simgrid::kernel::activity::State::DONE; } /** * @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*), + size_t src_buff_size, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout) { @@ -130,27 +95,27 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ + simgrid::kernel::activity::ActivityImplPtr 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); + simcall_comm_wait(comm.get(), timeout); comm = nullptr; } else { - simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size, - match_fun, copy_data_fun, data, timeout); + simcall_BODY_comm_send(sender, mbox, task_size, rate, static_cast(src_buff), src_buff_size, + match_fun, copy_data_fun, data, timeout); } } /** * @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*, simgrid::kernel::activity::CommImpl*), - void (*clean_fun)(void*), - void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), - void* data, int detached) +simgrid::kernel::activity::ActivityImplPtr +simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, + size_t src_buff_size, bool (*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, bool detached) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -158,16 +123,15 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double xbt_assert(mbox, "No rendez-vous point defined for isend"); - return simcall_BODY_comm_isend(sender, mbox, task_size, rate, src_buff, - src_buff_size, match_fun, - clean_fun, copy_data_fun, data, detached); + return simcall_BODY_comm_isend(sender, mbox, task_size, rate, static_cast(src_buff), src_buff_size, + match_fun, clean_fun, copy_data_fun, data, detached); } /** * @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*), + bool (*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) { @@ -176,49 +140,52 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ + simgrid::kernel::activity::ActivityImplPtr 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); + simcall_comm_wait(comm.get(), timeout); comm = nullptr; } else { - simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, timeout, rate); + simcall_BODY_comm_recv(receiver, mbox, static_cast(dst_buff), dst_buff_size, match_fun, + copy_data_fun, data, timeout, rate); } } /** * @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*), - void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), - void* data, double rate) +simgrid::kernel::activity::ActivityImplPtr +simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, + bool (*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"); - return simcall_BODY_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, - match_fun, copy_data_fun, data, rate); + return simcall_BODY_comm_irecv(receiver, mbox, static_cast(dst_buff), dst_buff_size, match_fun, + copy_data_fun, data, rate); } /** * @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) +simgrid::kernel::activity::ActivityImplPtr +simcall_comm_iprobe(smx_mailbox_t mbox, int type, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void* data) // XBT_ATTRIB_DEPRECATED_v330 { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); - return simgrid::simix::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); + return simgrid::kernel::actor::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); } /** * @ingroup simix_comm_management */ -unsigned int simcall_comm_waitany(smx_activity_t comms[], size_t count, double timeout) +unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 { std::unique_ptr rcomms(new simgrid::kernel::activity::CommImpl*[count]); - std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) { + std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { return static_cast(comm.get()); }); return simcall_BODY_comm_waitany(rcomms.get(), count, timeout); @@ -232,12 +199,12 @@ unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], /** * @ingroup simix_comm_management */ -int simcall_comm_testany(smx_activity_t comms[], size_t count) +int simcall_comm_testany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count) // XBT_ATTRIB_DEPRECATED_v330 { if (count == 0) return -1; std::unique_ptr rcomms(new simgrid::kernel::activity::CommImpl*[count]); - std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) { + std::transform(comms, comms + count, rcomms.get(), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { return static_cast(comm.get()); }); return simcall_BODY_comm_testany(rcomms.get(), count); @@ -253,33 +220,33 @@ int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t co /** * @ingroup simix_comm_management */ -void simcall_comm_wait(const smx_activity_t& comm, double timeout) +void simcall_comm_wait(simgrid::kernel::activity::ActivityImpl* comm, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - simcall_BODY_comm_wait(static_cast(comm.get()), timeout); + simcall_BODY_comm_wait(static_cast(comm), timeout); } /** * @ingroup simix_comm_management * */ -int simcall_comm_test(const smx_activity_t& comm) +bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) { - return simcall_BODY_comm_test(static_cast(comm.get())); + return simcall_BODY_comm_test(static_cast(comm)); } /** * @ingroup simix_synchro_management * */ -smx_mutex_t simcall_mutex_init() +smx_mutex_t simcall_mutex_init() // XBT_ATTRIB_DEPRECATED_v330 { 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 simgrid::simix::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); + return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); } /** @@ -313,9 +280,9 @@ void simcall_mutex_unlock(smx_mutex_t mutex) * @ingroup simix_synchro_management * */ -smx_cond_t simcall_cond_init() +smx_cond_t simcall_cond_init() // XBT_ATTRIB_DEPRECATED_v330 { - return simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); + return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** @@ -356,18 +323,41 @@ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) return simcall_BODY_sem_acquire_timeout(sem, timeout); } -e_smx_state_t simcall_io_wait(const smx_activity_t& io) +simgrid::kernel::activity::State simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 +{ + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::simcall_blocking([io, issuer, timeout] { io->wait_for(issuer, timeout); }); + return simgrid::kernel::activity::State::DONE; +} + +simgrid::kernel::activity::State simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 +{ + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::simcall_blocking([io, issuer, timeout] { io->wait_for(issuer, timeout); }); + return simgrid::kernel::activity::State::DONE; +} + +bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io) // XBT_ATTRIB_DEPRECATED_v330 +{ + return simgrid::kernel::actor::simcall([io] { return io->test(); }); +} + +bool simcall_io_test(const simgrid::kernel::activity::ActivityImplPtr& io) // XBT_ATTRIB_DEPRECATD_v330 { - return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get())); + return simgrid::kernel::actor::simcall([io] { return io->test(); }); } -void simcall_run_kernel(std::function const& code) +void simcall_run_kernel(std::function const& code, simgrid::mc::SimcallInspector* t) { + simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; simcall_BODY_run_kernel(&code); } -void simcall_run_blocking(std::function const& code) +void simcall_run_blocking(std::function const& code, simgrid::mc::SimcallInspector* t = nullptr) { + simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; simcall_BODY_run_blocking(&code); } @@ -385,52 +375,10 @@ const char *SIMIX_simcall_name(e_smx_simcall_t kind) { namespace simgrid { namespace simix { -void unblock(smx_actor_t process) +void unblock(smx_actor_t actor) { xbt_assert(SIMIX_is_maestro()); - SIMIX_simcall_answer(&process->simcall); + actor->simcall_answer(); } } // 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(); -}