#include <xbt/Extendable.hpp>
#include <simgrid/s4u/host.hpp>
+#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/HostImpl.hpp"
-#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
extern std::unordered_map<std::string, simgrid::s4u::Host*>
- host_list; // FIXME: don't dupplicate the content of s4u::Host this way
+ host_list; // FIXME: don't duplicate the content of s4u::Host this way
void sg_host_exit()
{
static int hostcmp_voidp(const void* pa, const void* pb)
{
- return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->name().c_str(),
- (*static_cast<simgrid::s4u::Host* const*>(pb))->name().c_str());
+ return strcmp((*static_cast<simgrid::s4u::Host* const*>(pa))->cname(),
+ (*static_cast<simgrid::s4u::Host* const*>(pb))->cname());
}
xbt_dynar_t sg_hosts_as_dynar()
xbt_dict_cursor_t cursor=nullptr;
char *key,*data;
- XBT_INFO("Displaying host %s", sg_host_get_name(host));
+ 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 = sg_host_get_properties(host);
+ props = host->properties();
if (!xbt_dict_is_empty(props)){
XBT_INFO(" - properties:");