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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
ns3
/
ns3_simulator.cpp
diff --git
a/src/surf/ns3/ns3_simulator.cpp
b/src/surf/ns3/ns3_simulator.cpp
index
8b43e80
..
64230a0
100644
(file)
--- a/
src/surf/ns3/ns3_simulator.cpp
+++ b/
src/surf/ns3/ns3_simulator.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-7,6
+7,9
@@
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/point-to-point-helper.h>
+
#include <algorithm>
std::map<std::string, SgFlow*> flowFromSock; // ns3::sock -> SgFlow
#include <algorithm>
std::map<std::string, SgFlow*> flowFromSock; // ns3::sock -> SgFlow
@@
-16,7
+19,7
@@
static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
-SgFlow::SgFlow(uint32_t totalBytes, simgrid::
surf
::NetworkNS3Action* action)
+SgFlow::SgFlow(uint32_t totalBytes, simgrid::
kernel::resource
::NetworkNS3Action* action)
{
totalBytes_ = totalBytes;
remaining_ = totalBytes;
{
totalBytes_ = totalBytes;
remaining_ = totalBytes;
@@
-54,7
+57,8
@@
static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
/* While not all is buffered and there remain space in the buffers */
while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) {
/* While not all is buffered and there remain space in the buffers */
while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) {
- uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable()});
+ // Send at most 1040 bytes (data size in a TCP packet), as NS3 seems to not split correctly by itself
+ uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable(), std::uint32_t(1040)});
if (toWrite == 0) { // buffer full
XBT_DEBUG("%f: buffer full on flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), flow,
flow->remaining_);
if (toWrite == 0) { // buffer full
XBT_DEBUG("%f: buffer full on flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), flow,
flow->remaining_);