simgrid::surf::HostModel *surf_host_model = nullptr;
/*************
- * Callbacks *
+ * Callbacks *t
*************/
namespace simgrid {
/*********
* Model *
*********/
-
/* Helper function for executeParallelTask */
-static inline double has_cost(double* array, int pos)
+static inline double has_cost(const double* array, size_t pos)
{
if (array)
return array[pos];
- else
- return -1.0;
+ 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* HostModel::execute_parallel(const std::vector<s4u::Host*>& host_list,
+ const double* flops_amount, const 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)) {
+ if ((host_list.size() == 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)) {
+ } else if ((host_list.size() == 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)) {
+ } else if ((host_list.size() == 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++) {
+ for (size_t i = 0; i < host_list.size() * host_list.size(); i++) {
if (has_cost(bytes_amount, i) > 0.0) {
nb++;
value = has_cost(bytes_amount, i);
HostImpl::~HostImpl()
{
/* All processes should be gone when the host is turned off (by the end of the simulation). */
- if (not process_list_.empty()) {
+ if (not actor_list_.empty()) {
std::string msg = std::string("Shutting down host, but it's not empty:");
- for (auto const& process : process_list_)
+ for (auto const& process : actor_list_)
msg += "\n\t" + std::string(process.get_name());
SIMIX_display_process_status();
- THROWF(arg_error, 0, "%s", msg.c_str());
+ 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.
{
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()
{
- 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(), SIMIX_process_self()->get_cname());
+ SIMIX_process_self()->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.
std::vector<s4u::ActorPtr> HostImpl::get_all_actors()
{
std::vector<s4u::ActorPtr> 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<s4u::Disk*> HostImpl::get_disks()
+{
+ std::vector<s4u::Disk*> disks;
+ for (auto const& d : disks_)
+ disks.push_back(&d->piface_);
+ return disks;
+}
+
+void HostImpl::add_disk(s4u::Disk* disk)
{
- return process_list_.size();
+ 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<const char*> HostImpl::get_attached_storages()
{
std::vector<const char*> storages;
for (auto const& s : storage_)
- if (s.second->getHost() == piface_->get_cname())
+ if (s.second->get_host() == piface_->get_cname())
storages.push_back(s.second->piface_.get_cname());
return storages;
}
-}
-}
+} // namespace surf
+} // namespace simgrid
