X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..8efeb3a6aa2c201800a3ba19416ea9728af3bff6:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 6ba3e713b3..3647e351e8 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,8 +5,7 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2017. 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. */ @@ -21,8 +20,10 @@ #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/MutexImpl.hpp" #include "src/mc/mc_forward.hpp" -#include "src/mc/mc_replay.h" +#include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" #include "xbt/ex.h" @@ -35,7 +36,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); void simcall_call(smx_actor_t actor) { if (actor != simix_global->maestro_process) { - XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->getCname(), SIMIX_simcall_name(actor->simcall.call), + 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 { @@ -54,17 +55,19 @@ void simcall_call(smx_actor_t actor) * \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(const char* name, 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::kernelImmediate([name, flops_amount, priority, bound, host] { + return SIMIX_execution_start(name, flops_amount, priority, bound, host); + }); } /** @@ -78,7 +81,6 @@ smx_activity_t simcall_execution_start(const char *name, * \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 @@ -99,7 +101,9 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s xbt_assert(std::isfinite(rate), "rate is not finite!"); - return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout); + return simgrid::simix::kernelImmediate([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); + }); } /** @@ -111,13 +115,14 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s */ void simcall_execution_cancel(smx_activity_t execution) { - simgrid::simix::kernelImmediate([execution] { - XBT_DEBUG("Cancel synchro %p", execution.get()); - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(execution); - - if (exec->surf_exec) - exec->surf_exec->cancel(); + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(execution); + if (not exec->surfAction_) + return; + simgrid::simix::kernelImmediate([exec] { + XBT_DEBUG("Cancel synchro %p", exec.get()); + if (exec->surfAction_) + exec->surfAction_->cancel(); }); } @@ -137,8 +142,8 @@ void simcall_execution_set_priority(smx_activity_t execution, double priority) simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(execution); - if (exec->surf_exec) - exec->surf_exec->setSharingWeight(priority); + if (exec->surfAction_) + exec->surfAction_->set_priority(priority); }); } @@ -155,8 +160,8 @@ void simcall_execution_set_bound(smx_activity_t execution, double bound) simgrid::simix::kernelImmediate([execution, bound] { simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(execution); - if (exec->surf_exec) - static_cast(exec->surf_exec)->setBound(bound); + if (exec->surfAction_) + exec->surfAction_->set_bound(bound); }); } @@ -171,23 +176,9 @@ 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 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) @@ -209,17 +200,6 @@ void simcall_process_suspend(smx_actor_t process) simcall_BODY_process_suspend(process); } -/** - * \ingroup simix_process_management - * \brief Returns the amount of SIMIX processes in the system - * - * 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. @@ -242,23 +222,13 @@ 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->getCname(), process->host->getCname()); + 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 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 Creates a new sleep SIMIX synchro. @@ -423,7 +393,7 @@ void simcall_set_category(smx_activity_t synchro, const char *category) if (category == nullptr) { return; } - simcall_BODY_set_category(synchro, category); + simgrid::simix::kernelImmediate([synchro, category] { SIMIX_set_category(synchro, category); }); } /** @@ -445,7 +415,7 @@ 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 simgrid::simix::kernelImmediate([] { return new simgrid::simix::MutexImpl(); }); + return simgrid::simix::kernelImmediate([] { return new simgrid::kernel::activity::MutexImpl(); }); } /** @@ -481,16 +451,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex) */ smx_cond_t simcall_cond_init() { - return simcall_BODY_cond_init(); -} - -/** - * \ingroup simix_synchro_management - * - */ -void simcall_cond_signal(smx_cond_t cond) -{ - simcall_BODY_cond_signal(cond); + return simgrid::simix::kernelImmediate([] { return new simgrid::kernel::activity::ConditionVariableImpl(); }); } /** @@ -506,21 +467,10 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) * \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); + return simcall_BODY_cond_wait_timeout(cond, mutex, timeout); } /** @@ -536,28 +486,20 @@ void simcall_sem_acquire(smx_sem_t sem) * \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_file_management - * - */ -sg_size_t simcall_file_read(surf_file_t fd, sg_size_t size) +sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size) { - return simcall_BODY_file_read(fd, size); + return simcall_BODY_storage_read(st, size); } -/** - * \ingroup simix_file_management - * - */ -sg_size_t simcall_file_write(surf_file_t fd, sg_size_t size) +sg_size_t simcall_storage_write(surf_storage_t st, sg_size_t size) { - return simcall_BODY_file_write(fd, size); + return simcall_BODY_storage_write(st, size); } void simcall_run_kernel(std::function const& code)