A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move some content from AsNone into As (AsNone should die)
[simgrid.git]
/
src
/
surf
/
surf_routing_none.cpp
diff --git
a/src/surf/surf_routing_none.cpp
b/src/surf/surf_routing_none.cpp
index
a1a97e8
..
989730d
100644
(file)
--- a/
src/surf/surf_routing_none.cpp
+++ b/
src/surf/surf_routing_none.cpp
@@
-1,23
+1,27
@@
-/* Copyright (c) 2009-2011, 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-201
5
. 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. */
* 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_none.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_none.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
AS_t model_none_create(void)
{
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
AS_t model_none_create(void)
{
- return new AsNone();
+ return new
simgrid::surf::
AsNone();
}
}
+namespace simgrid {
+namespace surf {
+
xbt_dynar_t AsNone::getOneLinkRoutes() {
return NULL;
}
xbt_dynar_t AsNone::getOneLinkRoutes() {
return NULL;
}
-void AsNone::getRouteAndLatency(
RoutingEdge */*src*/, RoutingEdge *
/*dst*/,
+void AsNone::getRouteAndLatency(
NetCard * /*src*/, NetCard *
/*dst*/,
sg_platf_route_cbarg_t /*res*/, double *lat)
{
*lat = 0.0;
sg_platf_route_cbarg_t /*res*/, double *lat)
{
*lat = 0.0;
@@
-28,20
+32,20
@@
void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*
XBT_INFO("No routing no graph");
}
XBT_INFO("No routing no graph");
}
-sg_platf_route_cbarg_t AsNone::getBypassRoute(
RoutingEdge */*src*/, RoutingEdge */*dst*/, double *
/*lat*/) {
+sg_platf_route_cbarg_t AsNone::getBypassRoute(
NetCard * /*src*/, NetCard * /*dst*/, double *
/*lat*/) {
return NULL;
}
return NULL;
}
-int AsNone::parsePU(
RoutingEdge
*elm) {
+int AsNone::parsePU(
NetCard
*elm) {
XBT_DEBUG("Load process unit \"%s\"", elm->getName());
XBT_DEBUG("Load process unit \"%s\"", elm->getName());
- xbt_dynar_push_as(p_indexNetworkElm,
RoutingEdge
*, elm);
+ xbt_dynar_push_as(p_indexNetworkElm,
NetCard
*, elm);
/* don't care about PUs */
return -1;
}
/* don't care about PUs */
return -1;
}
-int AsNone::parseAS(
RoutingEdge
*elm) {
+int AsNone::parseAS(
NetCard
*elm) {
XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
- xbt_dynar_push_as(p_indexNetworkElm,
RoutingEdge
*, elm);
+ xbt_dynar_push_as(p_indexNetworkElm,
NetCard
*, elm);
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
return -1;
}
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
return -1;
}
@@
-59,14
+63,10
@@
void AsNone::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
/* Creation routing model functions */
AsNone::AsNone() {
/* Creation routing model functions */
AsNone::AsNone() {
- p_routingSons = xbt_dict_new_homogeneous(NULL);
- p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
- p_linkUpDownList = NULL;
}
AsNone::~AsNone() {
}
AsNone::~AsNone() {
- xbt_dict_free(&p_routingSons);
- xbt_dynar_free(&p_indexNetworkElm);
- xbt_dynar_free(&p_linkUpDownList);
}
}
+}
+}