-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. 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. */
#include "simgrid/host.h"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/VirtualMachine.hpp"
if (pimpl_netpoint_ != nullptr) // not removed yet by a children class
Engine::get_instance()->netpoint_unregister(pimpl_netpoint_);
delete pimpl_cpu;
- delete mounts_;
}
/** @brief Fire the required callbacks and destroy the object
void Host::turn_off()
{
if (is_on()) {
- kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
+ const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self();
kernel::actor::simcall([this, self] {
for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_)
if (vm->get_pm() == this) {
sendto_async(dest, byte_amount)->wait();
}
-ActivityPtr Host::sendto_async(Host* dest, double byte_amount)
+CommPtr Host::sendto_async(Host* dest, double byte_amount)
{
- std::vector<Host*> m_host_list = {this, dest};
- std::vector<double> flops_amount = {0, 0};
- std::vector<double> bytes_amount = {0, byte_amount, 0, 0};
- return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start();
+ return Comm::sendto_async(this, dest, byte_amount);
}
/** Get the properties assigned to a host */
{
kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); });
}
-/**
- * @ingroup simix_storage_management
- * @brief Returns the list of storages attached to a host.
- * @return a vector containing all storages attached to the host
- */
-std::vector<const char*> Host::get_attached_storages() const
-{
- return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); });
-}
-
-std::unordered_map<std::string, Storage*> const& Host::get_mounted_storages()
-{
- kernel::actor::simcall([this] {
- if (mounts_ == nullptr)
- mounts_ = pimpl_->get_mounted_storages();
- });
- return *mounts_;
-}
ExecPtr Host::exec_async(double flops) const
{
host->set_data(nullptr);
}
-// ========= storage related functions ============
+// ========= Disk related functions ============
void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks)
{
std::vector<sg_disk_t> list = host->get_disks();
(*disks)[i] = list[i];
}
-xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
-{
- xbt_assert((host != nullptr), "Invalid parameters");
- xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
- for (auto const& elm : host->get_mounted_storages()) {
- const char* mount_name = elm.first.c_str();
- const simgrid::s4u::Storage* storage = elm.second;
- xbt_dict_set(res, mount_name, (void*)storage->get_cname());
- }
-
- return res;
-}
-
-xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host)
-{
- xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
- std::vector<const char*> storage_vector = host->get_attached_storages();
- for (auto const& name : storage_vector)
- xbt_dynar_push(storage_dynar, &name);
- return storage_dynar;
-}
-
// =========== user-level functions ===============
// ================================================
/** @brief Returns the total speed of a host */