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 all network models to the kernel::resource namespace
[simgrid.git]
/
src
/
surf
/
ns3
/
ns3_simulator.hpp
diff --git
a/src/surf/ns3/ns3_simulator.hpp
b/src/surf/ns3/ns3_simulator.hpp
index
edb6fc7
..
db1236a
100644
(file)
--- a/
src/surf/ns3/ns3_simulator.hpp
+++ b/
src/surf/ns3/ns3_simulator.hpp
@@
-7,18
+7,13
@@
#define NS3_SIMULATOR_HPP
#include "simgrid/s4u/Host.hpp"
#define NS3_SIMULATOR_HPP
#include "simgrid/s4u/Host.hpp"
+#include "src/surf/network_ns3.hpp"
#include <ns3/node.h>
#include <ns3/tcp-socket-factory.h>
#include <cstdint>
#include <ns3/node.h>
#include <ns3/tcp-socket-factory.h>
#include <cstdint>
-namespace simgrid {
-namespace surf {
-class NetworkNS3Action;
-}
-} // namespace simgrid
-
class NetPointNs3 {
public:
static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
class NetPointNs3 {
public:
static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
@@
-37,7
+32,7
@@
XBT_PUBLIC void ns3_add_cluster(const char* id, double bw, double lat);
class XBT_PRIVATE SgFlow {
public:
class XBT_PRIVATE SgFlow {
public:
- SgFlow(uint32_t totalBytes, simgrid::
surf
::NetworkNS3Action* action);
+ SgFlow(uint32_t totalBytes, simgrid::
kernel::resource
::NetworkNS3Action* action);
// private:
std::uint32_t bufferedBytes_ = 0;
// private:
std::uint32_t bufferedBytes_ = 0;
@@
-45,7
+40,7
@@
public:
std::uint32_t remaining_;
std::uint32_t totalBytes_;
bool finished_ = false;
std::uint32_t remaining_;
std::uint32_t totalBytes_;
bool finished_ = false;
- simgrid::
surf
::NetworkNS3Action* action_;
+ simgrid::
kernel::resource
::NetworkNS3Action* action_;
};
void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);
};
void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);