X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/173e6cb373d42d61f6eb620771dc5a2e5492173b..17288b1b642b369a5377677875d08a82d37a5f67:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 275c34d62d..41a204bbf7 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,21 +5,23 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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 "mc/mc.h" -#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/kernel/activity/SemaphoreImpl.hpp" +#include "src/kernel/actor/SimcallObserver.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "xbt/random.hpp" #include "popping_bodies.cpp" @@ -29,32 +31,47 @@ * * @param execution The execution synchro */ -e_smx_state_t simcall_execution_wait(const smx_activity_t& execution) +simgrid::kernel::activity::State simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 { - return (e_smx_state_t)simcall_BODY_execution_wait(static_cast(execution.get())); + 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; } -bool simcall_execution_test(const smx_activity_t& execution) +simgrid::kernel::activity::State simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 { - return simcall_BODY_execution_test(static_cast(execution.get())); + 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; } -unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout) +bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution) // XBT_ATTRIB_DEPRECATED_v330 { - return simcall_BODY_execution_waitany_for(execs, count, timeout); + return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); } -void simcall_process_join(smx_actor_t process, double timeout) // XBT_DEPRECATED_v328 +bool simcall_execution_test(const simgrid::kernel::activity::ActivityImplPtr& execution) // XBT_ATTRIB_DEPRECATED_v330 { - simgrid::kernel::actor::ActorImpl::self()->join(process, timeout); + return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); } -void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328 +unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, + double timeout) // XBT_ATTRIB_DEPRECATED_v331 { - process->iface()->suspend(); -} - -e_smx_state_t simcall_process_sleep(double duration) // XBT_DEPRECATED_v329 + std::vector execsv(execs, execs + count); + simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self(); + simgrid::kernel::actor::ExecutionWaitanySimcall observer{issuer, &execsv, timeout}; + return simgrid::kernel::actor::simcall_blocking( + [&observer] { + simgrid::kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), + observer.get_timeout()); + }, + &observer); +} + +simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329 { simgrid::kernel::actor::ActorImpl::self()->sleep(duration); return simgrid::kernel::activity::State::DONE; @@ -64,7 +81,7 @@ e_smx_state_t simcall_process_sleep(double duration) // XBT_DEPRECATED_v329 * @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) { @@ -77,10 +94,11 @@ 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 */ - 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); + 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, false); + simcall_comm_wait(comm.get(), timeout); comm = nullptr; } else { @@ -92,12 +110,11 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, /** * @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, bool 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!"); @@ -113,7 +130,7 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double * @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) { @@ -122,10 +139,11 @@ 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 { @@ -136,10 +154,10 @@ void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, /** * @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"); @@ -150,8 +168,9 @@ smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void /** * @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"); @@ -161,13 +180,14 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, /** * @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::vector rcomms(count); + std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { return static_cast(comm.get()); }); - return simcall_BODY_comm_waitany(rcomms.get(), count, timeout); + return simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout); } unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout) @@ -178,15 +198,15 @@ 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::vector rcomms(count); + std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { return static_cast(comm.get()); }); - return simcall_BODY_comm_testany(rcomms.get(), count); + return simcall_BODY_comm_testany(rcomms.data(), rcomms.size()); } int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) @@ -199,26 +219,26 @@ 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 * */ -bool 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 @@ -232,34 +252,34 @@ smx_mutex_t simcall_mutex_init() * @ingroup simix_synchro_management * */ -void simcall_mutex_lock(smx_mutex_t mutex) +void simcall_mutex_lock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331 { - simcall_BODY_mutex_lock(mutex); + mutex->mutex().lock(); } /** * @ingroup simix_synchro_management * */ -int simcall_mutex_trylock(smx_mutex_t mutex) +int simcall_mutex_trylock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331 { - return simcall_BODY_mutex_trylock(mutex); + return mutex->mutex().try_lock(); } /** * @ingroup simix_synchro_management * */ -void simcall_mutex_unlock(smx_mutex_t mutex) +void simcall_mutex_unlock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331 { - simcall_BODY_mutex_unlock(mutex); + mutex->mutex().unlock(); } /** * @ingroup simix_synchro_management * */ -smx_cond_t simcall_cond_init() +smx_cond_t simcall_cond_init() // XBT_ATTRIB_DEPRECATED_v330 { return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } @@ -268,66 +288,90 @@ smx_cond_t simcall_cond_init() * @ingroup simix_synchro_management * */ -void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) +void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATED_v331 { - simcall_BODY_cond_wait(cond, mutex); + cond->get_iface()->wait(std::unique_lock(mutex->mutex())); } /** * @ingroup simix_synchro_management * */ -int 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_ATTRIB_DEPRECATD_v331 { - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); + return cond->get_iface()->wait_for(std::unique_lock(mutex->mutex()), timeout) == + std::cv_status::timeout; } /** * @ingroup simix_synchro_management * */ -void simcall_sem_acquire(smx_sem_t sem) +void simcall_sem_acquire(smx_sem_t sem) // XBT_ATTRIB_DEPRECATD_v331 { - simcall_BODY_sem_acquire(sem); + return sem->sem().acquire(); } /** * @ingroup simix_synchro_management * */ -int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) +int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) // XBT_ATTRIB_DEPRECATD_v331 { - xbt_assert(std::isfinite(timeout), "timeout is not finite!"); - return simcall_BODY_sem_acquire_timeout(sem, timeout); + return sem->sem().acquire_timeout(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 { - return (e_smx_state_t)simcall_BODY_io_wait(static_cast(io.get())); + 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; } -void simcall_run_kernel(std::function const& code, simgrid::mc::SimcallInspector* t) +simgrid::kernel::activity::State simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io, + double timeout) // XBT_ATTRIB_DEPRECATED_v330 { - simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; + 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 simgrid::kernel::actor::simcall([io] { return io->test(); }); +} + +void simcall_run_kernel(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) +{ + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; simcall_BODY_run_kernel(&code); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; } -void simcall_run_blocking(std::function const& code, simgrid::mc::SimcallInspector* t = nullptr) +void simcall_run_blocking(std::function const& code, simgrid::kernel::actor::SimcallObserver* observer) { - simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t; + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer; simcall_BODY_run_blocking(&code); + simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr; } -int simcall_mc_random(int min, int max) { - return simcall_BODY_mc_random(min, max); +int simcall_mc_random(int min, int max) // XBT_ATTRIB_DEPRECATD_v331 +{ + return MC_random(min, max); } /* ************************************************************************** */ /** @brief returns a printable string representing a simcall */ -const char *SIMIX_simcall_name(e_smx_simcall_t kind) { - return simcall_names[kind]; +const char* SIMIX_simcall_name(Simcall kind) +{ + return simcall_names[static_cast(kind)]; } namespace simgrid {