-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "surf_routing.hpp"
-
-#include "simgrid/sg_config.h"
-#include "storage_interface.hpp"
-
-#include "src/surf/AsImpl.hpp"
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-
#include <vector>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
+#include <xbt/signal.hpp>
-namespace simgrid {
-namespace surf {
+#include <simgrid/s4u/host.hpp>
- /* Callbacks */
- simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
- simgrid::xbt::signal<void(simgrid::s4u::As*)> asCreatedCallbacks;
+#include "src/surf/surf_routing.hpp"
+#include "simgrid/sg_config.h"
+#include "src/surf/storage_interface.hpp"
-}} // namespace simgrid::surf
+#include "src/kernel/routing/AsImpl.hpp"
+#include "src/surf/network_interface.hpp"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
/**
* @ingroup SURF_build_api
* @brief A library containing all known hosts
*/
-xbt_dict_t host_list = nullptr;
-
-int COORD_HOST_LEVEL=0; //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
-
-/** @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)
-{
- sg_host_t h = sg_host_by_name(name);
- simgrid::surf::NetCard *netcard = h==NULL ? NULL: h->pimpl_netcard;
- if (!netcard)
- netcard = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
- return netcard;
-}
-
-/* Global vars */
-simgrid::surf::RoutingPlatf *routing_platf = NULL;
-
+int ROUTING_ASR_LEVEL = -1; //Routing level
+int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored
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);
-}
-
-namespace simgrid {
-namespace surf {
-
-/**
- * \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)
- * It is the caller responsability to initialize latency to 0 (we add to provided route)
- * \pre route!=NULL
- *
- * walk through the routing components tree and find a route between hosts
- * by calling each "get_route" function in each routing component.
- */
-void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * route, double *latency)
-{
- XBT_DEBUG("getRouteAndLatency from %s to %s", src->name(), dst->name());
-
- AsImpl::getRouteRecursive(src, dst, route, latency);
-}
-
-static xbt_dynar_t _recursiveGetOneLinkRoutes(surf::AsImpl *as)
-{
- xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
-
- //adding my one link routes
- xbt_dynar_t onelink_mine = as->getOneLinkRoutes();
- if (onelink_mine)
- xbt_dynar_merge(&ret,&onelink_mine);
-
- //recursing
- char *key;
- xbt_dict_cursor_t cursor = NULL;
- AsImpl *rc_child;
- xbt_dict_foreach(as->children(), cursor, key, rc_child) {
- xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child);
- if (onelink_child)
- xbt_dynar_merge(&ret,&onelink_child);
- }
- return ret;
-}
-
-xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
- return _recursiveGetOneLinkRoutes(root_);
-}
-
-}
-}
-
-/** @brief create the root AS */
-void routing_model_create(Link *loopback)
-{
- routing_platf = new simgrid::surf::RoutingPlatf(loopback);
+ xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr);
}
/* ************************************************************************** */
xbt_lib_cursor_t cursor;
char *key;
void **data;
- simgrid::surf::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) {
- 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)
- surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach);
+ 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_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
+ simgrid::kernel::routing::NetCard* host_elm = sg_netcard_by_name_or_null(storage->attach_);
+ if (!host_elm)
+ surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_);
}
}
}
instr_routing_define_callbacks();
}
-/** \brief Frees all memory allocated by the routing module */
-void routing_exit(void) {
- delete routing_platf;
-}
-
-simgrid::surf::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback)
-: loopback_(loopback)
-{
-}
-simgrid::surf::RoutingPlatf::~RoutingPlatf()
-{
- delete root_;
-}
