-/* Copyright (c) 2013-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-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 <algorithm>
#include <vector>
-#include "xbt/dict.h"
#include "simgrid/host.h"
-#include <xbt/Extendable.hpp>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
+#include "xbt/Extendable.hpp"
+#include "xbt/dict.h"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/simix/smx_host_private.h"
#include "src/surf/HostImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
// FIXME: The following duplicates the content of s4u::Host
-extern std::unordered_map<std::string, simgrid::s4u::Host*> host_list;
+namespace simgrid {
+namespace s4u {
+extern std::map<std::string, simgrid::s4u::Host*> host_list;
+}
+}
extern "C" {
* the tests.
*/
std::vector<std::string> names = std::vector<std::string>();
- for (auto kv : host_list)
+ for (auto kv : simgrid::s4u::host_list)
names.push_back(kv.second->name());
std::sort(names.begin(), names.end());
for (auto name : names)
- host_list.at(name)->destroy();
+ simgrid::s4u::host_list.at(name)->destroy();
// host_list.clear(); This would be sufficient if the dict would contain smart_ptr. It's now useless
}
size_t sg_host_count()
{
- return host_list.size();
+ return simgrid::s4u::host_list.size();
}
/** @brief Returns the host list
*
{
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
- for (auto kv : host_list) {
+ for (auto kv : simgrid::s4u::host_list) {
simgrid::s4u::Host* host = kv.second;
if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost())
xbt_dynar_push(res, &host);
// ========= Layering madness ==============*
-#include "src/surf/cpu_interface.hpp"
-
// ========== User data Layer ==========
void *sg_host_user(sg_host_t host) {
return host->extension(USER_HOST_LEVEL);
host->extension_set(USER_HOST_LEVEL, nullptr);
}
-// ========== MSG Layer ==============
-msg_host_priv_t sg_host_msg(sg_host_t host) {
- return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
-}
-void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
- host->extension_set(MSG_HOST_LEVEL, smx_host);
-}
-
-// ========== Simix layer =============
-smx_host_priv_t sg_host_simix(sg_host_t host){
- return host->extension<simgrid::simix::Host>();
-}
-
// ========= storage related functions ============
xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
- return host->pimpl_->getMountedStorageList();
+ xbt_assert((host != nullptr), "Invalid parameters");
+ xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
+ for (auto elm : host->mountedStorages()) {
+ const char* mount_name = elm.first.c_str();
+ sg_storage_t storage = elm.second;
+ xbt_dict_set(res, mount_name, (void*)storage->name(), nullptr);
+ }
+
+ return res;
}
xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
- return host->pimpl_->getAttachedStorageList();
+ std::vector<const char*>* storage_vector = new std::vector<const char*>();
+ xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr);
+ host->attachedStorages(storage_vector);
+ for (auto name : *storage_vector)
+ xbt_dynar_push(storage_dynar, &name);
+ delete storage_vector;
+ return storage_dynar;
}
-
// =========== user-level functions ===============
// ================================================
/** @brief Returns the total speed of a host */
/** @brief Returns the number of power states for a host.
*
- * See also @ref SURF_plugin_energy.
+ * See also @ref plugin_energy.
*/
int sg_host_get_nb_pstates(sg_host_t host) {
return host->pstatesCount();
/** @brief Gets the pstate at which that host currently runs.
*
- * See also @ref SURF_plugin_energy.
+ * See also @ref plugin_energy.
*/
int sg_host_get_pstate(sg_host_t host) {
return host->pstate();
}
/** @brief Sets the pstate at which that host should run.
*
- * See also @ref SURF_plugin_energy.
+ * See also @ref plugin_energy.
*/
void sg_host_set_pstate(sg_host_t host,int pstate) {
host->setPstate(pstate);
*/
double sg_host_route_bandwidth(sg_host_t from, sg_host_t to)
{
+ double min_bandwidth = -1.0;
+
std::vector<simgrid::s4u::Link*> vlinks;
from->routeTo(to, &vlinks, nullptr);
- double res = 0;
- for (auto link : vlinks)
- res += link->bandwidth();
- return res;
+ for (auto link : vlinks) {
+ double bandwidth = link->bandwidth();
+ if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
+ min_bandwidth = bandwidth;
+ }
+ return min_bandwidth;
}
/** @brief Displays debugging information about a host */
void sg_host_dump(sg_host_t host)
{
xbt_dict_t props;
- xbt_dict_cursor_t cursor=nullptr;
- char *key,*data;
XBT_INFO("Displaying host %s", host->cname());
XBT_INFO(" - speed: %.0f", host->speed());
XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host));
props = host->properties();
- if (!xbt_dict_is_empty(props)){
+ if (not xbt_dict_is_empty(props)) {
XBT_INFO(" - properties:");
+ xbt_dict_cursor_t cursor = nullptr;
+ char* key;
+ char* data;
xbt_dict_foreach(props,cursor,key,data) {
XBT_INFO(" %s->%s",key,data);
