X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e33beb98eb2dd42717306a77a328c9d5e9a91f05..f863142ca1ffcf37908e0beb8dd4b71eb2a74c86:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index ff6f1931b5..d8d97be06c 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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. */ @@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF h simgrid::surf::HostModel *surf_host_model = nullptr; /************* - * Callbacks * + * Callbacks *t *************/ namespace simgrid { @@ -22,53 +22,6 @@ namespace surf { /********* * Model * *********/ - -/* Helper function for executeParallelTask */ -static inline double has_cost(double* array, int pos) -{ - if (array) - return array[pos]; - else - return -1.0; -} - -kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** host_list, double* flops_amount, - double* bytes_amount, double rate) -{ - kernel::resource::Action* action = nullptr; - if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) { - action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); - } else if ((host_nb == 1) && (has_cost(flops_amount, 0) <= 0)) { - action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); - } else if ((host_nb == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) { - int nb = 0; - double value = 0.0; - - for (int i = 0; i < host_nb * host_nb; i++) { - if (has_cost(bytes_amount, i) > 0.0) { - nb++; - value = has_cost(bytes_amount, i); - } - } - if (nb == 1) { - action = surf_network_model->communicate(host_list[0], host_list[1], value, rate); - } else if (nb == 0) { - xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the " - "ptask model"); - } else { - xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider " - "using the ptask model"); - } - } else { - xbt_die( - "This model only accepts one of the following. You should consider using the ptask model for the other cases.\n" - " - execution with one host only and no communication\n" - " - Self-comms with one host only\n" - " - Communications with two hosts and no computation"); - } - return action; -} - /************ * Resource * ************/ @@ -81,48 +34,51 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host) HostImpl::~HostImpl() { - /* All processes should be gone when the host is turned off (by the end of the simulation). */ - if (not process_list_.empty()) { + /* All actors should be gone when the host is turned off (by the end of the simulation). */ + if (not actor_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.get_name()); + for (auto const& actor : actor_list_) + msg += "\n\t" + std::string(actor.get_name()); - SIMIX_display_process_status(); - THROWF(arg_error, 0, "%s", msg.c_str()); + simix_global->display_all_actor_status(); + xbt_die("%s", msg.c_str()); } for (auto const& arg : actors_at_boot_) delete arg; actors_at_boot_.clear(); + + for (auto const& d : disks_) + d->destroy(); } /** Re-starts all the actors that are marked as restartable. * - * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this. + * Weird things will happen if you turn on a host that is already on. S4U is fool-proof, not this. */ void HostImpl::turn_on() { for (auto const& arg : actors_at_boot_) { XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); - smx_actor_t actor = - SIMIX_process_create(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); + simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( + arg->name, arg->code, nullptr, arg->host, arg->properties.get(), nullptr); + if (arg->on_exit) + *actor->on_exit = *arg->on_exit; if (arg->kill_time >= 0) - simcall_process_set_kill_time(actor, arg->kill_time); + actor->set_kill_time(arg->kill_time); if (arg->auto_restart) - actor->auto_restart_ = arg->auto_restart; + actor->set_auto_restart(arg->auto_restart); if (arg->daemon_) actor->daemonize(); } } /** Kill all actors hosted here */ -void HostImpl::turn_off() +void HostImpl::turn_off(kernel::actor::ActorImpl* issuer) { - if (not process_list_.empty()) { - for (auto& actor : process_list_) { - XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(), - actor.host_->get_cname(), SIMIX_process_self()->get_cname()); - SIMIX_process_kill(&actor, SIMIX_process_self()); - } + for (auto& actor : actor_list_) { + XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(), + actor.get_host()->get_cname(), issuer->get_cname()); + issuer->kill(&actor); } // When a host is turned off, we want to keep only the actors that should restart for when it will boot again. // Then get rid of the others. @@ -138,22 +94,48 @@ void HostImpl::turn_off() std::vector HostImpl::get_all_actors() { std::vector res; - for (auto& actor : process_list_) + for (auto& actor : actor_list_) res.push_back(actor.ciface()); return res; } -int HostImpl::get_actor_count() +size_t HostImpl::get_actor_count() +{ + return actor_list_.size(); +} + +std::vector HostImpl::get_disks() { - return process_list_.size(); + std::vector disks; + for (auto const& d : disks_) + disks.push_back(d->get_iface()); + return disks; } + +void HostImpl::add_disk(s4u::Disk* disk) +{ + disks_.push_back(disk->get_impl()); +} + +void HostImpl::remove_disk(const std::string& disk_name) +{ + auto position = disks_.begin(); + for (auto const& d : disks_) { + if (d->get_name() == disk_name) { + disks_.erase(position); + break; + } + position++; + } +} + std::vector HostImpl::get_attached_storages() { std::vector storages; for (auto const& s : storage_) - if (s.second->getHost() == piface_->get_cname()) - storages.push_back(s.second->piface_.get_cname()); + if (s.second->get_host() == piface_->get_cname()) + storages.push_back(s.second->get_iface()->get_cname()); return storages; } -} -} +} // namespace surf +} // namespace simgrid