-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-201. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/dict.h"
#include "simgrid/host.h"
-#include "simgrid/Host.hpp"
+#include <xbt/Extendable.hpp>
+#include <simgrid/s4u/host.hpp>
#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
+#include "src/simix/smx_private.hpp"
+#include "src/surf/host_interface.hpp"
+
size_t sg_host_count()
{
return xbt_dict_length(host_list);
const char *sg_host_get_name(sg_host_t host)
{
- return host->id().c_str();
+ return host->name().c_str();
}
void* sg_host_extension_get(sg_host_t host, size_t ext)
size_t sg_host_extension_create(void(*deleter)(void*))
{
- return simgrid::Host::extension_create(deleter);
+ return simgrid::s4u::Host::extension_create(deleter);
}
sg_host_t sg_host_by_name(const char *name)
{
- return simgrid::Host::by_name_or_null(name);
+ return simgrid::s4u::Host::by_name_or_null(name);
}
sg_host_t sg_host_by_name_or_create(const char *name)
{
- return simgrid::Host::by_name_or_create(name);
+ return simgrid::s4u::Host::by_name_or_create(name);
}
xbt_dynar_t sg_hosts_as_dynar(void)
xbt_dict_cursor_t cursor = nullptr;
const char* name = nullptr;
- simgrid::Host* host = nullptr;
+ simgrid::s4u::Host* host = nullptr;
xbt_dict_foreach(host_list, cursor, name, host)
if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST)
xbt_dynar_push(res, &host);
return res;
}
-// ========= Layering madness ==============
-
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int USER_HOST_LEVEL;
+// ========= Layering madness ==============*
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
+#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used
+#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_routing.hpp"
-static XBT_INLINE void surf_cpu_free(void *r) {
- delete static_cast<simgrid::surf::Cpu*>(r);
-}
-static XBT_INLINE void routing_asr_host_free(void *p) {
- delete static_cast<simgrid::surf::RoutingEdge*>(p);
-}
-
void sg_host_init()
{
- MSG_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
+ MSG_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
__MSG_host_priv_free((msg_host_priv_t) p);
});
- SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
- SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy);
- simgrid::surf::Cpu::init();
- ROUTING_HOST_LEVEL = simgrid::Host::extension_create(routing_asr_host_free);
- USER_HOST_LEVEL = simgrid::Host::extension_create(NULL);
+
+ ROUTING_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
+ delete static_cast<simgrid::surf::NetCard*>(p);
+ });
+
+ SD_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
+ SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
+ USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
}
// ========== User data Layer ==========
void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
host->extension_set(MSG_HOST_LEVEL, smx_host);
}
-void sg_host_msg_destroy(sg_host_t host) {
- host->extension_set(MSG_HOST_LEVEL, nullptr);
-}
// ========== SimDag Layer ==============
SD_workstation_priv_t sg_host_sd(sg_host_t host) {
return (SD_workstation_priv_t) host->extension(SD_HOST_LEVEL);
host->extension_set(SIMIX_HOST_LEVEL, nullptr);
}
-// ========== SURF CPU ============
-surf_cpu_t sg_host_surfcpu(sg_host_t host) {
- return host->extension<simgrid::surf::Cpu>();
-}
-void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) {
- host->extension_set(simgrid::surf::Cpu::EXTENSION_ID, cpu); // FIXME: use the typesafe version
-}
-void sg_host_surfcpu_destroy(sg_host_t host) {
- host->extension_set<simgrid::surf::Cpu>(nullptr);
-}
-// ========== RoutingEdge ============
-surf_RoutingEdge *sg_host_edge(sg_host_t host) {
- return (surf_RoutingEdge*) host->extension(ROUTING_HOST_LEVEL);
-}
-void sg_host_edge_set(sg_host_t host, surf_RoutingEdge *edge) {
- host->extension_set(ROUTING_HOST_LEVEL, edge);
-}
-void sg_host_edge_destroy(sg_host_t host, int do_callback) {
- host->extension_set(ROUTING_HOST_LEVEL, nullptr, do_callback);
-}
-
// =========== user-level functions ===============
// ================================================
-double sg_host_get_speed(sg_host_t host){
- return surf_host_get_speed(host, 1.0);
-}
double sg_host_get_available_speed(sg_host_t host){
return surf_host_get_available_speed(host);
}
-/** @brief Returns the number of core of the processor. */
-int sg_host_get_core(sg_host_t host) {
- return surf_host_get_core(host);
-}
/** @brief Returns the state of a host.
* @return 1 if the host is active or 0 if it has crashed.
*/
-int sg_host_get_state(sg_host_t host) {
- return surf_host_get_state(surf_host_resource_priv(host));
-}
-
-/** @brief Returns the total energy consumed by the host (in Joules).
- *
- * See also @ref SURF_plugin_energy.
- */
-double sg_host_get_consumed_energy(sg_host_t host) {
- return surf_host_get_consumed_energy(host);
+int sg_host_is_on(sg_host_t host) {
+ return host->is_on();
}
/** @brief Returns the number of power states for a host.
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_nb_pstates(sg_host_t host) {
- return surf_host_get_nb_pstates(host);
+ return host->pstates_count();
}
/** @brief Gets the pstate at which that host currently runs.
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_pstate(sg_host_t host) {
- return surf_host_get_pstate(host);
-}
-
-namespace simgrid {
-
-Host::Host(std::string const& id)
- : id_(id)
-{
-}
-
-Host::~Host()
-{
+ return host->pstate();
}
-
-Host* Host::by_name_or_null(const char* name)
-{
- return (Host*) xbt_dict_get_or_null(host_list, name);
+/** @brief Sets the pstate at which that host should run.
+ *
+ * See also @ref SURF_plugin_energy.
+ */
+void sg_host_set_pstate(sg_host_t host,int pstate) {
+ host->set_pstate(pstate);
}
-Host* Host::by_name_or_create(const char* name)
-{
- Host* host = by_name_or_null(name);
- if (host == nullptr) {
- host = new Host(name);
- xbt_dict_set(host_list, name, host, NULL);
- }
- return host;
+/** @brief Get the properties of an host */
+xbt_dict_t sg_host_get_properties(sg_host_t host) {
+ return host->properties();
}
-}
