X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93c8beeb914dc3624c3818b21f17567345b4d36c..3671bfe99e3f5f4dc48d8229eb57f965a1cf6913:/src/surf/surf_routing_dijkstra.cpp

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index b535cf2e4d..ccdeaadbcd 100644
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -1,14 +1,12 @@
-/* Copyright (c) 2009-2013. The SimGrid Team.
+/* Copyright (c) 2009-2015. 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_dijkstra.hpp"
-#include "network_interface.hpp"
-
-/* Global vars */
-extern routing_platf_t routing_platf;
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_dijkstra.hpp"
+#include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 
@@ -39,44 +37,43 @@ static void graph_edge_data_free(void *e) // FIXME: useless code duplication
 }
 
 AS_t model_dijkstra_create(void){
-  return new AsDijkstra(0);
+  return new simgrid::surf::AsDijkstra(0);
 }
 
 AS_t model_dijkstracache_create(void){
-  return new AsDijkstra(1);
+  return new simgrid::surf::AsDijkstra(1);
 }
 
-void model_dijkstra_both_end(AS_t as)
-{
-  AsDijkstraPtr THIS_AS = static_cast<AsDijkstraPtr>(as);
-  xbt_node_t node = NULL;
-  unsigned int cursor2;
-  xbt_dynar_t nodes = NULL;
+/* Utility functions */
 
+namespace simgrid {
+namespace surf {
+void AsDijkstra::Seal()
+{
   /* Create the topology graph */
-  if(!THIS_AS->p_routeGraph)
-    THIS_AS->p_routeGraph = xbt_graph_new_graph(1, NULL);
-  if(!THIS_AS->p_graphNodeMap)
-    THIS_AS->p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
+  if(!p_routeGraph)
+    p_routeGraph = xbt_graph_new_graph(1, NULL);
+  if(!p_graphNodeMap)
+    p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
 
-  if (THIS_AS->m_cached && !THIS_AS->p_routeCache)
-    THIS_AS->p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
+  if (m_cached && !p_routeCache)
+    p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
 
   /* Add the loopback if needed */
-  if (routing_platf->p_loopback && as->p_hierarchy == SURF_ROUTING_BASE)
-    THIS_AS->addLoopback();
+  if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE)
+    addLoopback();
 
   /* initialize graph indexes in nodes after graph has been built */
-  nodes = xbt_graph_get_nodes(THIS_AS->p_routeGraph);
+  xbt_dynar_t nodes = xbt_graph_get_nodes(p_routeGraph);
 
+  xbt_node_t node = NULL;
+  unsigned int cursor2;
   xbt_dynar_foreach(nodes, cursor2, node) {
     graph_node_data_t data = (graph_node_data_t) xbt_graph_node_get_data(node);
     data->graph_id = cursor2;
   }
 }
 
-/* Utility functions */
-
 xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
 {
   xbt_node_t node = NULL;
@@ -91,7 +88,7 @@ xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id)
   elm = xbt_new0(struct graph_node_map_element, 1);
   elm->node = node;
   xbt_dict_set_ext(p_graphNodeMap, (char *) (&id), sizeof(int),
-      (xbt_set_elm_t) elm, NULL);
+      (xbt_dictelm_t) elm, NULL);
 
   return node;
 }
@@ -174,25 +171,25 @@ void AsDijkstra::addLoopback() {
   }
 }
 
-xbt_dynar_t AsDijkstra::getOnelinkRoutes()
+xbt_dynar_t AsDijkstra::getOneLinkRoutes()
 {
-  xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free);
+  xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
   sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
   route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
 
   int src,dst;
-  RoutingEdgePtr src_elm, dst_elm;
+  NetCard *src_elm, *dst_elm;
   int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
   for(src=0; src < table_size; src++) {
     for(dst=0; dst< table_size; dst++) {
       xbt_dynar_reset(route->link_list);
-      src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, RoutingEdgePtr);
-      dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdgePtr);
+      src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*);
+      dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, NetCard*);
       this->getRouteAndLatency(src_elm, dst_elm,route, NULL);
 
       if (xbt_dynar_length(route->link_list) == 1) {
         void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
-        OnelinkPtr onelink;
+        Onelink *onelink;
         if (p_hierarchy == SURF_ROUTING_BASE)
           onelink = new Onelink(link, src_elm, dst_elm);
         else if (p_hierarchy == SURF_ROUTING_RECURSIVE)
@@ -206,17 +203,17 @@ xbt_dynar_t AsDijkstra::getOnelinkRoutes()
   return ret;
 }
 
-void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat)
+void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
 {
 
   /* set utils vars */
 
   srcDstCheck(src, dst);
-  int *src_id = &(src->m_id);
-  int *dst_id = &(dst->m_id);
+  int *src_id = src->getIdPtr();
+  int *dst_id = dst->getIdPtr();
 
   if (!src_id || !dst_id)
-    THROWF(arg_error,0,"No route from '%s' to '%s'",src->p_name,dst->p_name);
+    THROWF(arg_error,0,"No route from '%s' to '%s'",src->getName(),dst->getName());
 
   int *pred_arr = NULL;
   int src_node_id = 0;
@@ -248,7 +245,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
     xbt_edge_t edge = xbt_graph_get_edge(p_routeGraph, node_s_v, node_e_v);
 
     if (edge == NULL)
-      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->p_name, dst->p_name);
+      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName());
 
     e_route = (sg_platf_route_cbarg_t) xbt_graph_edge_get_data(edge);
 
@@ -256,7 +253,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
     xbt_dynar_foreach(links, cpt, link) {
       xbt_dynar_unshift(route->link_list, &link);
       if (lat)
-        *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+        *lat += static_cast<Link*>(link)->getLatency();
     }
 
   }
@@ -278,7 +275,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
     int nr_nodes = xbt_dynar_length(nodes);
     cost_arr = xbt_new0(double, nr_nodes);      /* link cost from src to other hosts */
     pred_arr = xbt_new0(int, nr_nodes); /* predecessors in path from src */
-    pqueue = xbt_heap_new(nr_nodes, xbt_free);
+    pqueue = xbt_heap_new(nr_nodes, xbt_free_f);
 
     /* initialize */
     cost_arr[src_node_id] = 0.0;
@@ -330,8 +327,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
   }
 
   /* compose route path with links */
-  RoutingEdgePtr gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL;
-  RoutingEdgePtr gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL;
+  NetCard *gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL;
+  NetCard *gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL;
 
   for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
     xbt_node_t node_pred_v =
@@ -341,7 +338,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
         xbt_graph_get_edge(p_routeGraph, node_pred_v, node_v);
 
     if (edge == NULL)
-      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->p_name, dst->p_name);
+      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName());
 
     prev_gw_src = gw_src;
 
@@ -353,18 +350,18 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
       first_gw = gw_dst;
 
     if (p_hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id
-        && strcmp(gw_dst->p_name, prev_gw_src->p_name)) {
+        && strcmp(gw_dst->getName(), prev_gw_src->getName())) {
       xbt_dynar_t e_route_as_to_as=NULL;
 
       routing_platf->getRouteAndLatency(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, NULL);
       if (edge == NULL)
-        THROWF(arg_error,0,"No route from '%s' to '%s'", src->p_name, dst->p_name);
+        THROWF(arg_error,0,"No route from '%s' to '%s'", src->getName(), dst->getName());
       links = e_route_as_to_as;
       int pos = 0;
       xbt_dynar_foreach(links, cpt, link) {
         xbt_dynar_insert_at(route->link_list, pos, &link);
         if (lat)
-          *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+          *lat += static_cast<Link*>(link)->getLatency();
         pos++;
       }
     }
@@ -373,7 +370,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
     xbt_dynar_foreach(links, cpt, link) {
       xbt_dynar_unshift(route->link_list, &link);
       if (lat)
-        *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+        *lat += static_cast<Link*>(link)->getLatency();
     }
     size++;
   }
@@ -389,7 +386,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
     elm->pred_arr = pred_arr;
     elm->size = size;
     xbt_dict_set_ext(p_routeCache, (char *) (&src_id), sizeof(int),
-        (xbt_set_elm_t) elm, NULL);
+        (xbt_dictelm_t) elm, NULL);
   }
 
   if (!m_cached)
@@ -398,8 +395,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
 
 AsDijkstra::~AsDijkstra()
 {
-  xbt_graph_free_graph(p_routeGraph, &xbt_free,
-      &graph_edge_data_free, &xbt_free);
+  xbt_graph_free_graph(p_routeGraph, &xbt_free_f,
+      &graph_edge_data_free, &xbt_free_f);
   xbt_dict_free(&p_graphNodeMap);
   if (m_cached)
     xbt_dict_free(&p_routeCache);
@@ -407,13 +404,10 @@ AsDijkstra::~AsDijkstra()
 
 /* Creation routing model functions */
 
-AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) {
-  p_routeGraph = NULL;
-  p_graphNodeMap = NULL;
-  p_routeCache = NULL;
+AsDijkstra::AsDijkstra() : AsGeneric() {
 }
 
-AsDijkstra::AsDijkstra(int cached) : AsGeneric(), m_cached(cached)
+AsDijkstra::AsDijkstra(bool cached) : AsGeneric(), m_cached(cached)
 {
   p_routeGraph = NULL;
   p_graphNodeMap = NULL;
@@ -436,7 +430,7 @@ void AsDijkstra::end()
 
   /* Create the topology graph */
   if(!p_routeGraph)
-	p_routeGraph = xbt_graph_new_graph(1, NULL);
+  p_routeGraph = xbt_graph_new_graph(1, NULL);
   if(!p_graphNodeMap)
     p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free);
 
@@ -472,18 +466,18 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
   else{
     XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-        route->gw_src->p_name, dst, route->gw_dst->p_name);
+        route->gw_src->getName(), dst, route->gw_dst->getName());
     as_route = 1;
-    if(route->gw_dst->p_rcType == SURF_NETWORK_ELEMENT_NULL)
-      xbt_die("The gw_dst '%s' does not exist!",route->gw_dst->p_name);
-    if(route->gw_src->p_rcType == SURF_NETWORK_ELEMENT_NULL)
-      xbt_die("The gw_src '%s' does not exist!",route->gw_src->p_name);
+    if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
+      surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->getName());
+    if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
+      surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName());
   }
 
-  RoutingEdgePtr src_net_elm, dst_net_elm;
+  NetCard *src_net_elm, *dst_net_elm;
 
-  src_net_elm = sg_routing_edge_by_name_or_null(src);
-  dst_net_elm = sg_routing_edge_by_name_or_null(dst);
+  src_net_elm = sg_netcard_by_name_or_null(src);
+  dst_net_elm = sg_netcard_by_name_or_null(dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@ -498,7 +492,7 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
     p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free);
 
   sg_platf_route_cbarg_t e_route = newExtendedRoute(p_hierarchy, route, 1);
-  newRoute(src_net_elm->m_id, dst_net_elm->m_id, e_route);
+  newRoute(src_net_elm->getId(), dst_net_elm->getId(), e_route);
 
   // Symmetrical YES
   if ( (route->symmetrical == TRUE && as_route == 0)
@@ -509,11 +503,11 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
       XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
     else
       XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
-          route->gw_dst->p_name, src, route->gw_src->p_name);
+          route->gw_dst->getName(), src, route->gw_src->getName());
 
     xbt_dynar_t nodes = xbt_graph_get_nodes(p_routeGraph);
-    xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->m_id, xbt_node_t);
-    xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->m_id, xbt_node_t);
+    xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->getId(), xbt_node_t);
+    xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->getId(), xbt_node_t);
     xbt_edge_t edge =
         xbt_graph_get_edge(p_routeGraph, node_e_v, node_s_v);
 
@@ -521,13 +515,16 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
       THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst);
 
     if (route->gw_dst && route->gw_src) {
-      RoutingEdgePtr gw_tmp;
+      NetCard *gw_tmp;
       gw_tmp = route->gw_src;
       route->gw_src = route->gw_dst;
       route->gw_dst = gw_tmp;
     }
     sg_platf_route_cbarg_t link_route_back = newExtendedRoute(p_hierarchy, route, 0);
-    newRoute(dst_net_elm->m_id, src_net_elm->m_id, link_route_back);
+    newRoute(dst_net_elm->getId(), src_net_elm->getId(), link_route_back);
   }
   xbt_dynar_free(&route->link_list);
 }
+
+}
+}