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
NS3: don't use the 'using namespace' construct
[simgrid.git]
/
src
/
surf
/
ns3
/
ns3_simulator.h
diff --git
a/src/surf/ns3/ns3_simulator.h
b/src/surf/ns3/ns3_simulator.h
index
a0fa181
..
ddf1ab6
100644
(file)
--- a/
src/surf/ns3/ns3_simulator.h
+++ b/
src/surf/ns3/ns3_simulator.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,6
+9,9
@@
#ifdef __cplusplus
#ifdef __cplusplus
+#include <cstdint>
+
+#include "ns3_interface.h"
#include "ns3/core-module.h"
#include "my-point-to-point-helper.h"
#include "ns3/core-module.h"
#include "my-point-to-point-helper.h"
@@
-22,16
+25,13
@@
#include "ns3/inet-socket-address.h"
#include "ns3/tcp-socket-factory.h"
#include "ns3/inet-socket-address.h"
#include "ns3/tcp-socket-factory.h"
-using namespace ns3;
-using namespace std;
-
struct MySocket{
struct MySocket{
-
uint32_t bufferedBytes
;
-
uint32_t sentBytes
;
- uint32_t remaining;
- uint32_t totalBytes;
-
char finished
;
-
void
* action;
+
std::uint32_t bufferedBytes = 0
;
+
std::uint32_t sentBytes = 0
;
+
std::
uint32_t remaining;
+
std::
uint32_t totalBytes;
+
bool finished = false
;
+
simgrid::surf::NetworkNS3Action
* action;
};
//Simulator s;
};
//Simulator s;
@@
-41,19
+41,14
@@
private:
public:
NS3Sim();
public:
NS3Sim();
- ~NS3Sim();
- void create_flow_NS3(Ptr<Node> src,
- Ptr<Node> dst,
- uint16_t port_number,
+ void create_flow_NS3(ns3::Ptr<ns3::Node> src,
+ ns3::Ptr<ns3::Node> dst,
+ std::uint16_t port_number,
double start,
const char *addr,
double start,
const char *addr,
- uint32_t TotalBytes,
-
void
* action);
+
std::
uint32_t TotalBytes,
+
simgrid::surf::NetworkNS3Action
* action);
void simulator_start(double min);
void simulator_start(double min);
- void* get_action_from_socket(void *socket);
- double get_remains_from_socket(void *socket);
- double get_sent_from_socket(void *socket);
- char get_finished(void *socket);
};
#endif /* __cplusplus */
};
#endif /* __cplusplus */