X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index cb14efd423..61d57bcbd1 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-2017. 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,9 @@ #include "simgrid/simix/blocking_simcall.hpp" #include "smx_private.hpp" #include "src/kernel/activity/CommImpl.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 +35,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->cname(), SIMIX_simcall_name(actor->simcall.call), + XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->getCname(), SIMIX_simcall_name(actor->simcall.call), (int)actor->simcall.call); SIMIX_process_yield(actor); } else { @@ -56,15 +56,14 @@ void simcall_call(smx_actor_t actor) * \param bound * \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 simcall_BODY_execution_start(name, flops_amount, priority, bound, host); } /** @@ -111,13 +110,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 +137,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_->setSharingWeight(priority); }); } @@ -155,8 +155,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_->setBound(bound); }); } @@ -171,6 +171,11 @@ e_smx_state_t simcall_execution_wait(smx_activity_t execution) return (e_smx_state_t) simcall_BODY_execution_wait(execution); } +e_smx_state_t simcall_execution_test(smx_activity_t execution) +{ + return (e_smx_state_t)simcall_BODY_execution_test(execution); +} + /** * \ingroup simix_process_management * \brief Kills all SIMIX processes. @@ -242,7 +247,7 @@ 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->cname(), process->host->getCname()); + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->getCname(), process->host->getCname()); process->kill_timer = SIMIX_timer_set(kill_time, [process] { simix_global->kill_process_function(process); process->kill_timer=nullptr; @@ -445,7 +450,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(); }); } /** @@ -506,9 +511,7 @@ 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) +void 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); @@ -542,22 +545,14 @@ void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) 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)