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: much more debug info, and restore the SetCloseCallbacks that is actually needed
[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
3296808
..
8b43e80
100644
(file)
--- a/
src/surf/ns3/ns3_simulator.cpp
+++ b/
src/surf/ns3/ns3_simulator.cpp
@@
-4,16
+4,15
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/surf/ns3/ns3_simulator.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/surf/ns3/ns3_simulator.hpp"
-#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include <algorithm>
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include <algorithm>
-
xbt_dict_t flowFromSock = nullptr
; // ns3::sock -> SgFlow
+
std::map<std::string, SgFlow*> flowFromSock
; // ns3::sock -> SgFlow
static void receive_callback(ns3::Ptr<ns3::Socket> socket);
static void receive_callback(ns3::Ptr<ns3::Socket> socket);
-static void datasent_c
allback
(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
+static void datasent_c
b
(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
@@
-26,12
+25,14
@@
SgFlow::SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action)
static SgFlow* getFlowFromSocket(ns3::Ptr<ns3::Socket> socket)
{
static SgFlow* getFlowFromSocket(ns3::Ptr<ns3::Socket> socket)
{
- return (SgFlow*)xbt_dict_get_or_null(flowFromSock, transformSocketPtr(socket));
+ auto it = flowFromSock.find(transformSocketPtr(socket));
+ return (it == flowFromSock.end()) ? nullptr : it->second;
}
static void receive_callback(ns3::Ptr<ns3::Socket> socket)
{
SgFlow* flow = getFlowFromSocket(socket);
}
static void receive_callback(ns3::Ptr<ns3::Socket> socket)
{
SgFlow* flow = getFlowFromSocket(socket);
+ XBT_DEBUG("received on F[%p, total: %u, remain: %u]", flow, flow->totalBytes_, flow->remaining_);
if (flow->finished_ == false) {
flow->finished_ = true;
if (flow->finished_ == false) {
flow->finished_ = true;
@@
-42,9
+43,10
@@
static void receive_callback(ns3::Ptr<ns3::Socket> socket)
}
}
}
}
-static void
WriteUntilBufferFull
(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
+static void
send_cb
(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
{
SgFlow* flow = getFlowFromSocket(sock);
{
SgFlow* flow = getFlowFromSocket(sock);
+ XBT_DEBUG("Asked to write on F[%p, total: %u, remain: %u]", flow, flow->totalBytes_, flow->remaining_);
if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed)
return;
if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed)
return;
@@
-53,8
+55,11
@@
static void WriteUntilBufferFull(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) {
uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable()});
while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) {
uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable()});
- if (toWrite == 0) // buffer full
+ if (toWrite == 0) { // buffer full
+ XBT_DEBUG("%f: buffer full on flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), flow,
+ flow->remaining_);
return;
return;
+ }
int amountSent = sock->Send(0, toWrite, 0);
xbt_assert(amountSent > 0, "Since TxAvailable>0, amountSent should also >0");
int amountSent = sock->Send(0, toWrite, 0);
xbt_assert(amountSent > 0, "Since TxAvailable>0, amountSent should also >0");
@@
-69,7
+74,7
@@
static void WriteUntilBufferFull(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
sock->Close();
}
sock->Close();
}
-static void datasent_c
allback
(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent)
+static void datasent_c
b
(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent)
{
/* The tracing wants to know */
SgFlow* flow = getFlowFromSocket(socket);
{
/* The tracing wants to know */
SgFlow* flow = getFlowFromSocket(socket);
@@
-111,20
+116,16
@@
void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number)
ns3::InetSocketAddress serverAddr(to, port_number);
sock->Connect(serverAddr);
ns3::InetSocketAddress serverAddr(to, port_number);
sock->Connect(serverAddr);
- // tell the tcp implementation to call
WriteUntilBufferFull
again
+ // tell the tcp implementation to call
send_cb
again
// if we blocked and new tx buffer space becomes available
// if we blocked and new tx buffer space becomes available
- sock->SetSendCallback(MakeCallback(&
WriteUntilBufferFull
));
- // Note when the send is over
+ sock->SetSendCallback(MakeCallback(&
send_cb
));
+ // Not
ic
e when the send is over
sock->SetRecvCallback(MakeCallback(&receive_callback));
sock->SetRecvCallback(MakeCallback(&receive_callback));
- // Keep track of what was used (for the TRACING module)
- sock->SetDataSentCallback(MakeCallback(&datasent_callback));
+ // Notice when we actually sent some data (mostly for the TRACING module)
+ sock->SetDataSentCallback(MakeCallback(&datasent_cb));
+
XBT_DEBUG("startFlow of F[%p, %p, %u] dest=%s port=%d", flow, flow->action_, flow->totalBytes_, to, port_number);
XBT_DEBUG("startFlow of F[%p, %p, %u] dest=%s port=%d", flow, flow->action_, flow->totalBytes_, to, port_number);
- // WriteUntilBufferFull (sock, sock->GetTxAvailable ());
- /*
- sock->SetSendCallback(MakeCallback(&send_callback));
sock->SetConnectCallback(MakeCallback(&succeededConnect_callback), MakeCallback(&failedConnect_callback));
sock->SetCloseCallbacks(MakeCallback(&normalClose_callback), MakeCallback(&errorClose_callback));
sock->SetConnectCallback(MakeCallback(&succeededConnect_callback), MakeCallback(&failedConnect_callback));
sock->SetCloseCallbacks(MakeCallback(&normalClose_callback), MakeCallback(&errorClose_callback));
- send_callback(sock, sock->GetTxAvailable ());
- */
}
}