X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e35c127ca0563fa6b778ca0b715fdbf3648fe0b6..3cbf54871089cc3dc50b6832652b5765e1601039:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 69db925aac..b6f81fd0c4 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -85,12 +85,6 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) } } -sg_host_t sg_host_self() -{ - smx_actor_t process = SIMIX_process_self(); - return (process == nullptr) ? nullptr : process->host; -} - /* needs to be public and without simcall for exceptions and logging events */ const char* sg_host_self_get_name() { @@ -112,25 +106,22 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std:: double kill_time, std::map* properties, int auto_restart) { - smx_process_arg_t arg = new simgrid::simix::ProcessArg(); - arg->name = name; - arg->code = std::move(code); - arg->data = data; - arg->host = host; - arg->kill_time = kill_time; + simgrid::kernel::actor::ProcessArg* arg = + new simgrid::kernel::actor::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart); arg->properties.reset(properties, [](decltype(properties)) {}); - arg->auto_restart = auto_restart; if (host->isOff() && watched_hosts.find(host->getCname()) == watched_hosts.end()) { watched_hosts.insert(host->getCname()); XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->getCname()); } + XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->getCname()); host->extension()->auto_restart_processes.push_back(arg); } + /** @brief Restart the list of processes that have been registered to the host */ void SIMIX_host_autorestart(sg_host_t host) { - std::vector process_list = + std::vector process_list = host->extension()->auto_restart_processes; for (auto const& arg : process_list) { @@ -146,17 +137,8 @@ void SIMIX_host_autorestart(sg_host_t host) } boost::intrusive_ptr -simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority, - double bound, sg_host_t host) +SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host) { - return SIMIX_execution_start(simcall->issuer, name, flops_amount, priority, bound, host); -} - -boost::intrusive_ptr SIMIX_execution_start(smx_actor_t issuer, const char* name, - double flops_amount, double priority, - double bound, sg_host_t host) -{ - /* alloc structures and initialize */ simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, host)); @@ -165,14 +147,15 @@ boost::intrusive_ptr SIMIX_execution_start( if (not MC_is_active() && not MC_record_replay_is_active()) { exec->surfAction_ = host->pimpl_cpu->execution_start(flops_amount); - exec->surfAction_->setData(exec.get()); - exec->surfAction_->setSharingWeight(priority); + exec->surfAction_->set_data(exec.get()); + exec->surfAction_->set_priority(priority); if (bound > 0) - static_cast(exec->surfAction_)->setBound(bound); + static_cast(exec->surfAction_)->set_bound(bound); } XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str()); + simgrid::kernel::activity::ExecImpl::onCreation(exec); return exec; } @@ -199,10 +182,10 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li sg_host_t* host_list_cpy = new sg_host_t[host_nb]; std::copy_n(host_list, host_nb, host_list_cpy); exec->surfAction_ = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - exec->surfAction_->setData(exec.get()); + exec->surfAction_->set_data(exec.get()); if (timeout > 0) { exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); - exec->timeoutDetector->setData(exec.get()); + exec->timeoutDetector->set_data(exec.get()); } } XBT_DEBUG("Create parallel execute synchro %p", exec.get()); @@ -212,8 +195,6 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro) { - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(synchro); XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state); /* Associate this simcall to the synchro */ @@ -223,18 +204,37 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchr /* set surf's synchro */ if (MC_is_active() || MC_record_replay_is_active()) { synchro->state = SIMIX_DONE; - SIMIX_execution_finish(exec); + SIMIX_execution_finish(synchro); return; } /* If the synchro is already finished then perform the error handling */ if (synchro->state != SIMIX_RUNNING) - SIMIX_execution_finish(exec); + SIMIX_execution_finish(synchro); } -void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) +void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro) { - for (smx_simcall_t const& simcall : exec->simcalls) { + simcall_execution_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING)); + if (simcall_execution_test__get__result(simcall)) { + synchro->simcalls.push_back(simcall); + SIMIX_execution_finish(synchro); + } else { + SIMIX_simcall_answer(simcall); + } + /* If the synchro is already finished then perform the error handling */ + if (synchro->state != SIMIX_RUNNING) + SIMIX_execution_finish(synchro); +} + +void SIMIX_execution_finish(smx_activity_t synchro) +{ + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(synchro); + + while (not synchro->simcalls.empty()) { + smx_simcall_t simcall = synchro->simcalls.front(); + synchro->simcalls.pop_front(); switch (exec->state) { case SIMIX_DONE: @@ -280,13 +280,13 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category) simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(synchro); if (exec != nullptr) { - exec->surfAction_->setCategory(category); + exec->surfAction_->set_category(category); return; } simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { - comm->surfAction_->setCategory(category); + comm->surfAction_->set_category(category); } }