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
clang-format these files, no change
[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
8048638
..
2847a60
100644
(file)
--- a/
src/surf/ns3/ns3_simulator.h
+++ b/
src/surf/ns3/ns3_simulator.h
@@
-11,35
+11,35
@@
#include "ns3_interface.h"
#include "ns3_interface.h"
-#include <ns3/global-route-manager.h>
#include <ns3/csma-helper.h>
#include <ns3/csma-helper.h>
+#include <ns3/global-route-manager.h>
#include <ns3/internet-stack-helper.h>
#include <ns3/ipv4-address-helper.h>
#include <ns3/internet-stack-helper.h>
#include <ns3/ipv4-address-helper.h>
-#include <ns3/point-to-point-helper.h>
#include <ns3/packet-sink-helper.h>
#include <ns3/packet-sink-helper.h>
+#include <ns3/point-to-point-helper.h>
#include <ns3/tcp-socket-factory.h>
class SgFlow {
public:
#include <ns3/tcp-socket-factory.h>
class SgFlow {
public:
- SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action
* action);
+ SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
-
//
private:
+
//
private:
std::uint32_t bufferedBytes_ = 0;
std::uint32_t bufferedBytes_ = 0;
- std::uint32_t sentBytes_ = 0;
+ std::uint32_t sentBytes_
= 0;
std::uint32_t remaining_;
std::uint32_t totalBytes_;
bool finished_ = false;
simgrid::surf::NetworkNS3Action* action_;
};
std::uint32_t remaining_;
std::uint32_t totalBytes_;
bool finished_ = false;
simgrid::surf::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);
-static inline const char
*transformSocketPtr
(ns3::Ptr<ns3::Socket> localSocket)
+static inline const char
* transformSocketPtr
(ns3::Ptr<ns3::Socket> localSocket)
{
static char key[24];
std::stringstream sstream;
{
static char key[24];
std::stringstream sstream;
- sstream << localSocket
;
- snprintf(key,
24,"%s",
sstream.str().c_str());
+ sstream << localSocket;
+ snprintf(key,
24, "%s",
sstream.str().c_str());
return key;
}
return key;
}