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 implementation bits of s4u::As into surf::AsImpl
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
c20f3c9
..
f86ef2c
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-11,6
+11,8
@@
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "simgrid/s4u/As.hpp"
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
int NS3_EXTENSION_ID;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
int NS3_EXTENSION_ID;
@@
-55,9
+57,9
@@
static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
);
}
);
}
-static void parse_ns3_add_AS(simgrid::s
urf
::As* as)
+static void parse_ns3_add_AS(simgrid::s
4u
::As* as)
{
{
- const char* as_id = as->name
_
;
+ const char* as_id = as->name
()
;
XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
}
XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
}
@@
-397,13
+399,7
@@
NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
: NetworkAction(model, cost, failed)
{}
: NetworkAction(model, cost, failed)
{}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- int NetworkNS3Action::getLatencyLimited() {
- return m_latencyLimited;
- }
-#endif
-
- void NetworkNS3Action::suspend()
+void NetworkNS3Action::suspend()
{
THROW_UNIMPLEMENTED;
}
{
THROW_UNIMPLEMENTED;
}