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
rename the datacontainers allowing the trace:connect tag
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
28d43b1
..
fd34a63
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-8,6
+8,7
@@
#include "src/surf/surf_private.h"
#include "src/surf/host_interface.hpp"
#include "simgrid/sg_config.h"
#include "src/surf/surf_private.h"
#include "src/surf/host_interface.hpp"
#include "simgrid/sg_config.h"
+#include "src/surf/platform.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
@@
-39,9
+40,9
@@
static void replace_lat_ns3(char ** lat)
xbt_free(temp);
}
xbt_free(temp);
}
-static void simgrid_ns3_add_host(simgrid::Host& host)
+static void simgrid_ns3_add_host(simgrid::
s4u::
Host& host)
{
{
- const char* id = host.
getN
ame().c_str();
+ const char* id = host.
n
ame().c_str();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
}
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
}
@@
-230,13
+231,13
@@
static void parse_ns3_end_platform(void)
static void define_callbacks_ns3(void)
{
static void define_callbacks_ns3(void)
{
- simgrid::Host::onCreation.connect(simgrid_ns3_add_host);
- simgrid::surf::
routingEdge
CreatedCallbacks.connect(simgrid_ns3_add_router);
- s
g_platf_link_add_cb
(&parse_ns3_add_link);
- s
g_platf_cluster_add_cb
(&parse_ns3_add_cluster);
+ simgrid::
s4u::
Host::onCreation.connect(simgrid_ns3_add_host);
+ simgrid::surf::
netcard
CreatedCallbacks.connect(simgrid_ns3_add_router);
+ s
imgrid::surf::on_link.connect
(&parse_ns3_add_link);
+ s
imgrid::surf::on_cluster.connect
(&parse_ns3_add_cluster);
simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
- s
g_platf_postparse_add_cb
(&create_ns3_topology); //get_one_link_routes
- s
g_platf_postparse_add_cb
(&parse_ns3_end_platform); //InitializeRoutes
+ s
imgrid::surf::on_postparse.connect
(&create_ns3_topology); //get_one_link_routes
+ s
imgrid::surf::on_postparse.connect
(&parse_ns3_end_platform); //InitializeRoutes
}
/*********
}
/*********
@@
-306,8
+307,7
@@
Link* NetworkNS3Model::createLink(const char *name,
xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL);
- //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
+ routing_platf->getRouteAndLatency(src, dst, &route, NULL);
return route;
}
return route;
}
@@
-378,7
+378,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
xbt_dynar_t route = NULL;
xbt_dynar_t route = NULL;
- routing_
get_route_and_l
atency (action->p_srcElm, action->p_dstElm, &route, NULL);
+ routing_
platf->getRouteAndL
atency (action->p_srcElm, action->p_dstElm, &route, NULL);
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
@@
-427,7
+427,7
@@
NetworkNS3Link::~NetworkNS3Link()
{
}
{
}
-void NetworkNS3Link::updateState(tmgr_trace_
event
_t event_type, double value, double date)
+void NetworkNS3Link::updateState(tmgr_trace_
iterator
_t event_type, double value, double date)
{
}
{
}