-/* Copyright (c) 2009-2011, 2013-2015. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
-namespace surf {
+namespace routing {
/* Callbacks */
- simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
+ simgrid::xbt::signal<void(simgrid::routing::NetCard*)> netcardCreatedCallbacks;
simgrid::xbt::signal<void(simgrid::s4u::As*)> asCreatedCallbacks;
-}} // namespace simgrid::surf
+}} // namespace simgrid::routing
/**
* @ingroup SURF_build_api
*/
xbt_dict_t host_list = nullptr;
-int COORD_HOST_LEVEL=0; //Coordinates level
+int COORD_HOST_LEVEL = -1; //Coordinates level
-int MSG_FILE_LEVEL; //Msg file level
+int MSG_FILE_LEVEL = -1; //Msg file level
-int SIMIX_STORAGE_LEVEL; //Simix storage level
-int MSG_STORAGE_LEVEL; //Msg storage level
+int SIMIX_STORAGE_LEVEL = -1; //Simix storage level
+int MSG_STORAGE_LEVEL = -1; //Msg storage level
xbt_lib_t as_router_lib;
-int ROUTING_ASR_LEVEL; //Routing level
-int COORD_ASR_LEVEL; //Coordinates level
-int NS3_ASR_LEVEL; //host node for ns3
-int ROUTING_PROP_ASR_LEVEL; //Where the properties are stored
+int ROUTING_ASR_LEVEL = -1; //Routing level
+int COORD_ASR_LEVEL = -1; //Coordinates level
+int NS3_ASR_LEVEL = -1; //host node for ns3
+int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored
/** @brief Retrieve a netcard from its name
*
* Netcards are the thing that connect host or routers to the network
*/
-simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name)
+simgrid::routing::NetCard *sg_netcard_by_name_or_null(const char *name)
{
sg_host_t h = sg_host_by_name(name);
- simgrid::surf::NetCard *netcard = h==NULL ? NULL: h->pimpl_netcard;
+ simgrid::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard;
if (!netcard)
- netcard = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ netcard = (simgrid::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
return netcard;
}
/* Global vars */
-simgrid::surf::RoutingPlatf *routing_platf = NULL;
+simgrid::routing::RoutingPlatf *routing_platf = nullptr;
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
{
tmgr_trace_t tmgr_trace;
- if (!trace->file || strcmp(trace->file, "") != 0) {
+ if (trace->file && strcmp(trace->file, "") != 0) {
tmgr_trace = tmgr_trace_new_from_file(trace->file);
} else {
xbt_assert(strcmp(trace->pc_data, ""),
"Trace '%s' must have either a content, or point to a file on disk.",trace->id);
tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity);
}
- xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
+ xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr);
}
namespace simgrid {
-namespace surf {
+namespace routing {
/**
* \brief Find a route between hosts
* \param src the network_element_t for src host
* \param dst the network_element_t for dst host
* \param route where to store the list of links.
- * If *route=NULL, create a short lived dynar. Else, fill the provided dynar
- * \param latency where to store the latency experienced on the path (or NULL if not interested)
+ * If *route=nullptr, create a short lived dynar. Else, fill the provided dynar
+ * \param latency where to store the latency experienced on the path (or nullptr if not interested)
* It is the caller responsability to initialize latency to 0 (we add to provided route)
- * \pre route!=NULL
+ * \pre route!=nullptr
*
* walk through the routing components tree and find a route between hosts
* by calling each "get_route" function in each routing component.
AsImpl::getRouteRecursive(src, dst, route, latency);
}
-static xbt_dynar_t _recursiveGetOneLinkRoutes(surf::AsImpl *as)
+static xbt_dynar_t _recursiveGetOneLinkRoutes(AsImpl *as)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
//recursing
char *key;
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
AsImpl *rc_child;
xbt_dict_foreach(as->children(), cursor, key, rc_child) {
xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child);
/** @brief create the root AS */
void routing_model_create(Link *loopback)
{
- routing_platf = new simgrid::surf::RoutingPlatf(loopback);
+ routing_platf = new simgrid::routing::RoutingPlatf(loopback);
}
/* ************************************************************************** */
xbt_lib_cursor_t cursor;
char *key;
void **data;
- simgrid::surf::NetCard *host_elm;
+ simgrid::routing::NetCard *host_elm;
xbt_lib_foreach(storage_lib, cursor, key, data) {
- if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
+ if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
host_elm = sg_netcard_by_name_or_null(storage->p_attach);
if(!host_elm)
delete routing_platf;
}
-simgrid::surf::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback)
+simgrid::routing::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback)
: loopback_(loopback)
{
}
-simgrid::surf::RoutingPlatf::~RoutingPlatf()
+simgrid::routing::RoutingPlatf::~RoutingPlatf()
{
delete root_;
}
