X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf51d55db1e6cb288ebc0a77a2977ec24f013bc0..9caf173e476622d309cc5653a83d224d05787cc7:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index ed49843c8a..29a81f4e37 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. */ @@ -30,7 +30,7 @@ namespace simgrid { if (not process_list.empty()) { std::string msg = std::string("Shutting down host, but it's not empty:"); for (auto const& process : process_list) - msg += "\n\t" + std::string(process.getName()); + msg += "\n\t" + std::string(process.get_name()); SIMIX_display_process_status(); THROWF(arg_error, 0, "%s", msg.c_str()); @@ -50,7 +50,7 @@ namespace simgrid { void Host::turnOn() { for (auto const& arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->getCname()); + XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) @@ -76,21 +76,15 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) if (not host->process_list.empty()) { for (auto& process : host->process_list) { SIMIX_process_kill(&process, issuer); - XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.getCname(), - process.host->getCname(), issuer->getCname()); + XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.get_cname(), + process.host->get_cname(), issuer->get_cname()); } } } else { - XBT_INFO("Host %s is already off", h->getCname()); + XBT_INFO("Host %s is already off", h->get_cname()); } } -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() { @@ -98,7 +92,7 @@ const char* sg_host_self_get_name() if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) return ""; - return host->getCname(); + return host->get_cname(); } /** @@ -112,29 +106,26 @@ 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()); + if (host->isOff() && watched_hosts.find(host->get_cname()) == watched_hosts.end()) { + watched_hosts.insert(host->get_cname()); + XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->get_cname()); } + XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->get_cname()); 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) { - XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->getCname()); + XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->get_cname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) @@ -148,7 +139,6 @@ void SIMIX_host_autorestart(sg_host_t host) boost::intrusive_ptr SIMIX_execution_start(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)); @@ -157,11 +147,11 @@ SIMIX_execution_start(const char* name, double flops_amount, double priority, do 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()); @@ -191,11 +181,11 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li /* set surf's synchro */ 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_ = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); + 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()); @@ -253,7 +243,7 @@ void SIMIX_execution_finish(smx_activity_t synchro) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->getCname()); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->get_cname()); simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; @@ -290,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); } }