-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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 <map>
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/storage.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/msg/msg_private.h"
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
-
int USER_HOST_LEVEL = -1;
namespace simgrid {
namespace s4u {
+std::map<std::string, simgrid::s4u::Host*> host_list; // FIXME: move it to Engine
+
simgrid::xbt::signal<void(Host&)> Host::onCreation;
simgrid::xbt::signal<void(Host&)> Host::onDestruction;
simgrid::xbt::signal<void(Host&)> Host::onStateChange;
delete pimpl_;
if (pimpl_netpoint != nullptr) // not removed yet by a children class
- simgrid::s4u::Engine::instance()->netpointUnregister(pimpl_netpoint);
+ simgrid::s4u::Engine::getInstance()->netpointUnregister(pimpl_netpoint);
delete pimpl_cpu;
delete mounts;
}
*/
void Host::destroy()
{
- if (!currentlyDestroying_) {
+ if (not currentlyDestroying_) {
currentlyDestroying_ = true;
onDestruction(*this);
host_list.erase(name_);
}
Host* Host::by_name_or_null(std::string name)
{
- if (host_list.find(name) == host_list.end())
- return nullptr;
- return host_list.at(name);
+ auto host = host_list.find(name);
+ return host == host_list.end() ? nullptr : host->second;
}
Host *Host::current(){
return this->pimpl_cpu->isOn();
}
-int Host::pstatesCount() const {
+int Host::getPstatesCount() const
+{
return this->pimpl_cpu->getNbPStates();
}
+/**
+ * \brief Return the list of actors attached to an host.
+ *
+ * \param whereto a vector in which we should push actors living on that host
+ */
+void Host::actorList(std::vector<ActorPtr>* whereto)
+{
+ smx_actor_t actor = NULL;
+ xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list)
+ {
+ whereto->push_back(actor->ciface());
+ }
+}
+
/**
* \brief Find a route toward another host
*
{
std::vector<surf::LinkImpl*> linkImpls;
this->routeTo(dest, &linkImpls, latency);
- for (surf::LinkImpl* l : linkImpls)
+ for (surf::LinkImpl* const& l : linkImpls)
links->push_back(&l->piface_);
}
+
/** @brief Just like Host::routeTo, but filling an array of link implementations */
void Host::routeTo(Host* dest, std::vector<surf::LinkImpl*>* links, double* latency)
{
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(pimpl_netpoint, dest->pimpl_netpoint, links, latency);
if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) {
- XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", cname(), dest->cname(),
+ XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", getCname(), dest->getCname(),
(latency == nullptr ? -1 : *latency));
- for (auto link : *links)
+ for (auto const& link : *links)
XBT_CDEBUG(surf_route, "Link %s", link->cname());
}
}
-boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
- if (mounts == nullptr) {
- mounts = new boost::unordered_map<std::string, Storage*> ();
-
- xbt_dict_t dict = this->mountedStoragesAsDict();
-
- xbt_dict_cursor_t cursor;
- char *mountname;
- char *storagename;
- xbt_dict_foreach(dict, cursor, mountname, storagename) {
- mounts->insert({mountname, &Storage::byName(storagename)});
- }
- xbt_dict_free(&dict);
- }
-
- return *mounts;
-}
-
/** Get the properties assigned to a host */
-xbt_dict_t Host::properties() {
- return simgrid::simix::kernelImmediate([this] {
- return this->pimpl_->getProperties();
- });
+std::map<std::string, std::string>* Host::getProperties()
+{
+ return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); });
}
/** Retrieve the property value (or nullptr if not set) */
-const char*Host::property(const char*key) {
+const char* Host::getProperty(const char* key)
+{
return this->pimpl_->getProperty(key);
}
-void Host::setProperty(const char*key, const char *value){
- simgrid::simix::kernelImmediate([this, key, value] {
- this->pimpl_->setProperty(key, value);
- });
+
+void Host::setProperty(std::string key, std::string value)
+{
+ simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
}
/** Get the processes attached to the host */
-xbt_swag_t Host::processes()
+void Host::getProcesses(std::vector<ActorPtr>* list)
{
- return simgrid::simix::kernelImmediate([this] {
- return this->extension<simgrid::simix::Host>()->process_list;
- });
+ smx_actor_t actor = NULL;
+ xbt_swag_foreach(actor, this->extension<simgrid::simix::Host>()->process_list) {
+ list->push_back(actor->iface());
+ }
}
/** @brief Get the peak processor speed (in flops/s), at the specified pstate */
}
/** @brief Get the peak processor speed (in flops/s), at the current pstate */
-double Host::speed() {
+double Host::getSpeed()
+{
return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
-int Host::coreCount() {
+int Host::getCoreCount()
+{
return pimpl_cpu->coreCount();
}
});
}
/** @brief Retrieve the pstate at which the host is currently running */
-int Host::pstate()
+int Host::getPstate()
{
return this->pimpl_cpu->getPState();
}
/**
* \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \return a dict containing all storages mounted on the host
+ * \brief Returns the list of storages attached to an host.
+ * \return a vector containing all storages attached to the host
*/
-xbt_dict_t Host::mountedStoragesAsDict()
+void Host::getAttachedStorages(std::vector<const char*>* storages)
{
- return simgrid::simix::kernelImmediate([this] {
- return this->pimpl_->getMountedStorageList();
+ simgrid::simix::kernelImmediate([this, storages] {
+ this->pimpl_->getAttachedStorageList(storages);
});
}
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \return a dict containing all storages attached to the host
- */
-void Host::attachedStorages(std::vector<const char*>* storages)
+std::unordered_map<std::string, Storage*> const& Host::getMountedStorages()
{
- simgrid::simix::kernelImmediate([this, storages] {
- this->pimpl_->getAttachedStorageList(storages);
- });
+ if (mounts == nullptr) {
+ mounts = new std::unordered_map<std::string, Storage*>();
+ for (auto const& m : this->pimpl_->storage_) {
+ mounts->insert({m.first, &m.second->piface_});
+ }
+ }
+ return *mounts;
+}
+
+void Host::execute(double flops)
+{
+ Host* host_list[1] = {this};
+ double flops_list[1] = {flops};
+ smx_activity_t s = simcall_execution_parallel_start(nullptr /*name*/, 1, host_list, flops_list,
+ nullptr /*comm_sizes */, -1.0, -1 /*timeout*/);
+ simcall_execution_wait(s);
}
} // namespace simgrid
