X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b547799240cfe5d60c1c4161e3fc8849095e2ca..514576f5a568bd452cb00faf460f191a07773d52:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index d32231a1ae..48365ed7a1 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -13,14 +13,10 @@ #include "mc/mc.h" #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" @@ -28,38 +24,7 @@ #include #include #include - -/** - * @ingroup simix_host_management - * @brief Waits for the completion of an execution synchro and destroy it. - * - * @param execution The execution synchro - */ -simgrid::kernel::activity::State simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* 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; -} - -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; -} - -bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution) // XBT_ATTRIB_DEPRECATED_v330 -{ - return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); -} - -bool simcall_execution_test(const simgrid::kernel::activity::ActivityImplPtr& execution) // XBT_ATTRIB_DEPRECATED_v330 -{ - return simgrid::kernel::actor::simcall([execution] { return execution->test(); }); -} +XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count, double timeout) // XBT_ATTRIB_DEPRECATED_v331 @@ -75,12 +40,6 @@ unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* &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; -} - /** * @ingroup simix_comm_management */ @@ -172,28 +131,6 @@ simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, siz /** * @ingroup simix_comm_management */ -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::kernel::actor::simcall([mbox, type, match_fun, data] { return mbox->iprobe(type, match_fun, data); }); -} - -/** - * @ingroup simix_comm_management - */ -unsigned int simcall_comm_waitany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count, - double timeout) // XBT_ATTRIB_DEPRECATED_v330 -{ - std::vector rcomms(count); - std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { - return static_cast(comm.get()); - }); - return static_cast(simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout)); -} - ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout) { return simcall_BODY_comm_waitany(comms, count, timeout); @@ -202,17 +139,6 @@ ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_ /** * @ingroup simix_comm_management */ -int simcall_comm_testany(simgrid::kernel::activity::ActivityImplPtr comms[], size_t count) // XBT_ATTRIB_DEPRECATED_v330 -{ - if (count == 0) - return -1; - std::vector rcomms(count); - std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) { - return static_cast(comm.get()); - }); - return static_cast(simcall_BODY_comm_testany(rcomms.data(), rcomms.size())); -} - ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count) { if (count == 0) @@ -238,20 +164,6 @@ bool simcall_comm_test(simgrid::kernel::activity::ActivityImpl* comm) return simcall_BODY_comm_test(static_cast(comm)); } -/** - * @ingroup simix_synchro_management - * - */ -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::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); }); -} - /** * @ingroup simix_synchro_management * @@ -279,15 +191,6 @@ void simcall_mutex_unlock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331 mutex->mutex().unlock(); } -/** - * @ingroup simix_synchro_management - * - */ -smx_cond_t simcall_cond_init() // XBT_ATTRIB_DEPRECATED_v330 -{ - return simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); -} - /** * @ingroup simix_synchro_management * @@ -325,32 +228,6 @@ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) // XBT_ATTRIB_DEP return sem->sem().acquire_timeout(timeout); } -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 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; @@ -392,7 +269,7 @@ namespace simix { void unblock(smx_actor_t actor) { - xbt_assert(SIMIX_is_maestro()); + xbt_assert(s4u::Actor::is_maestro()); actor->simcall_answer(); } } // namespace simix