X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/281f8c29e177852dcb1591fc31e363e1176857c8..7cad4f0d54aafeabb7ee95007fc370514c4923a9:/src/surf/surf_routing_private.hpp diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp index e3d718b1a8..4dbfad44c2 100644 --- a/src/surf/surf_routing_private.hpp +++ b/src/surf/surf_routing_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,7 +10,7 @@ #include #include "internal_config.h" -#include "surf.hpp" +#include "surf_interface.hpp" #include "xbt/dynar.h" #include "xbt/str.h" #include "xbt/config.h" @@ -65,16 +65,10 @@ void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route); /* ************************************************** */ /* ************** Cluster ROUTING **************** */ -class AsCluster : public As { -public: - void *backbone; - void *loopback; - RoutingEdgePtr p_router; -}; -typedef AsCluster *AsClusterPtr; -//FIXME:remove} s_as_cluster_t, *as_cluster_t; AsPtr model_cluster_create(void); /* create structures for cluster routing model */ +AsPtr model_torus_cluster_create(void); +AsPtr model_fat_tree_cluster_create(void); /* ************************************************** */ /* ************** Vivaldi ROUTING **************** */