Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Make sure that we start at the right NS3 time even when NS3 and SG desynchronize.
[simgrid.git] / src / surf / ns3 / ns3_simulator.cc
index a1dd0ed..188bea1 100644 (file)
@@ -7,18 +7,18 @@
 #include "surf/ns3/ns3_simulator.h"
 #include "xbt/dict.h"
 #include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 using namespace ns3;
 using namespace std;
 
-static const uint32_t writeSize  = 1024; // limit the amout of data to write
-uint8_t data[writeSize];
 xbt_dict_t dict_socket = NULL;
 
 NS3Sim SimulatorNS3;
 
 static void receive_callback(Ptr<Socket> localSocket);
 static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace);
+static void datasent_callback(Ptr<Socket> localSocket, uint32_t dataSent);
 static void StartFlow(Ptr<Socket> sock,
     const char *to,
     uint16_t port_number);
@@ -42,7 +42,7 @@ NS3Sim::~NS3Sim(){
  *             port_number: The port number to use
  *             start: the time the communication start
  *             addr:  ip address
- *             TotalBytes: number of bytes to transmit
+ *             totalBytes: number of bytes to transmit
  */
 void NS3Sim::create_flow_NS3(
                Ptr<Node> src,
@@ -50,22 +50,31 @@ void NS3Sim::create_flow_NS3(
                uint16_t port_number,
                double start,
                const char *addr,
-               uint32_t TotalBytes,
+               uint32_t totalBytes,
                void * action)
 {
        if(!dict_socket) dict_socket = xbt_dict_new();
-       PacketSinkHelper sink ("ns3::TcpSocketFactory", InetSocketAddress (Ipv4Address::GetAny(), port_number));
+
+       PacketSinkHelper sink ("ns3::TcpSocketFactory",
+                                                       InetSocketAddress (Ipv4Address::GetAny(),
+                                                       port_number));
        sink.Install (dst);
-       Ptr<Socket> sock = Socket::CreateSocket (src, TypeId::LookupByName ("ns3::TcpSocketFactory"));
+       Ptr<Socket> sock = Socket::CreateSocket (src,
+                                                       TcpSocketFactory::GetTypeId());
+
        MySocket *mysocket = new MySocket();
-       mysocket->TotalBytes = TotalBytes;
-       mysocket->remaining = TotalBytes;
+       mysocket->totalBytes = totalBytes;
+       mysocket->remaining = totalBytes;
+       mysocket->bufferedBytes = 0;
        mysocket->sentBytes = 0;
        mysocket->finished = 0;
        mysocket->action = action;
        xbt_dict_set(dict_socket,(const char*)&sock, mysocket,NULL);
        sock->Bind(InetSocketAddress(port_number));
-       Simulator::Schedule (Seconds(start),&StartFlow, sock, addr, port_number);
+       XBT_INFO("Create flow starting to %fs + %fs = %fs",start-ns3_time(), ns3_time(), start);
+       Simulator::Schedule (Seconds(start-ns3_time()),&StartFlow, sock, addr, port_number);
+//     Simulator::Schedule (Seconds(0.0),&StartFlow, sock, addr, port_number);
+
 }
 
 void* NS3Sim::get_action_from_socket(void *socket){
@@ -80,45 +89,40 @@ double NS3Sim::get_remains_from_socket(void *socket){
        return ((MySocket *)socket)->remaining;
 }
 
-void NS3Sim::simulator_stop(double min){
-       if(min > 0.0)
-               Simulator::Stop(Seconds(min));
-       else
-               Simulator::Stop();
+double NS3Sim::get_sent_from_socket(void *socket){
+  return ((MySocket *)socket)->sentBytes;
 }
 
-void NS3Sim::simulator_start(void){
-       XBT_DEBUG("Start simulator");
-       Simulator::Run ();
+void NS3Sim::simulator_start(double min){
+  if(min > 0.0)
+    Simulator::Stop(Seconds(min));
+  XBT_DEBUG("Start simulator");
+  Simulator::Run ();
 }
 
 static void receive_callback(Ptr<Socket> localSocket){
-  Address addr;
-  localSocket->GetSockName (addr);
-  InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);
   MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
-  mysocket->finished = 1;
 
-  //cout << "[" << Simulator::Now ().GetSeconds() << "] " << "Received [" << mysocket->TotalBytes << "bytes],  from: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort () << endl;
-       std::stringstream sstream;
-               sstream << Simulator::Now ().GetSeconds();
-               std::string s = sstream.str();
-               size_t size = s.size() + 1;
-               char * time_sec = new char[ size ];
-               strncpy( time_sec, s.c_str(), size );
-  XBT_DEBUG("Stop simulator at %s seconds",time_sec);
-  Simulator::Stop();
+  if (mysocket->finished == 0){
+    mysocket->finished = 1;
+    XBT_DEBUG("recv_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+    XBT_DEBUG("Stop simulator at %f seconds", Simulator::Now().GetSeconds());
+    Simulator::Stop(Seconds(0.0));
+    Simulator::Run();
+  }
 }
 
 static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
-
-       Address addr;
-       localSocket->GetSockName (addr);
-       InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr);
+       uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*txSpace);
        MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
-       uint32_t totalBytes = mysocket->TotalBytes;
-       while ((mysocket->sentBytes) < totalBytes && localSocket->GetTxAvailable () > 0){
-      uint32_t toWrite = min ((mysocket->remaining), writeSize);
+       if (mysocket->remaining == 0){
+                 //all data was already buffered (and socket was already closed), just return
+                 return;
+       }
+       while (mysocket->sentBytes < mysocket->totalBytes
+                       && localSocket->GetTxAvailable () > 0)
+       {
+      uint32_t toWrite = min ((mysocket->remaining), txSpace);
       toWrite = min (toWrite, localSocket->GetTxAvailable ());
       int amountSent = localSocket->Send (&data[0], toWrite, 0);
 
@@ -126,12 +130,41 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
          return;
          (mysocket->sentBytes) += amountSent;
          (mysocket->remaining) -= amountSent;
-         //cout << "[" << Simulator::Now ().GetSeconds() << "] " << "Send one packet, remaining "<<  mysocket->remaining << " bytes!" << endl;
+      XBT_DEBUG("send_cb of F[%p, %p, %d] (%d/%d) %d buffered", mysocket, mysocket->action, mysocket->totalBytes, mysocket->remaining, mysocket->totalBytes, amountSent);
+
     }
-       if ((mysocket->sentBytes) >= totalBytes){
+       if ((mysocket->sentBytes) >= mysocket->totalBytes){
                localSocket->Close();
        }
+}
+
+static void datasent_callback(Ptr<Socket> localSocket, uint32_t dataSent){
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  mysocket->sentBytes += dataSent;
+  XBT_DEBUG("datasent_cb of F[%p, %p, %d] %d sent", mysocket, mysocket->action, mysocket->totalBytes, dataSent);
+}
+
+static void normalClose_callback(Ptr<Socket> localSocket){
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  XBT_DEBUG("normalClose_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+  receive_callback (localSocket);
+}
+
+static void errorClose_callback(Ptr<Socket> localSocket){
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  XBT_DEBUG("errorClose_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+  xbt_die("NS3: a socket was closed anormally");
+}
 
+static void succeededConnect_callback(Ptr<Socket> localSocket){
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  XBT_DEBUG("succeededConnect_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+}
+
+static void failedConnect_callback(Ptr<Socket> localSocket){
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  XBT_DEBUG("failedConnect_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+  xbt_die("NS3: a socket failed to connect");
 }
 
 static void StartFlow(Ptr<Socket> sock,
@@ -140,9 +173,13 @@ static void StartFlow(Ptr<Socket> sock,
 {
   InetSocketAddress serverAddr (to, port_number);
 
-  //cout << "[" <<  Simulator::Now().GetSeconds() << "] Starting flow to " << to << " using port " << port_number << endl;
-
   sock->Connect(serverAddr);
   sock->SetSendCallback (MakeCallback (&send_callback));
   sock->SetRecvCallback (MakeCallback (&receive_callback));
+  sock->SetDataSentCallback (MakeCallback (&datasent_callback));
+  sock->SetConnectCallback (MakeCallback (&succeededConnect_callback), MakeCallback (&failedConnect_callback));
+  sock->SetCloseCallbacks (MakeCallback (&normalClose_callback), MakeCallback (&errorClose_callback));
+
+  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&sock);
+  XBT_DEBUG("startFlow_cb of F[%p, %p, %d] dest=%s port=%d", mysocket, mysocket->action, mysocket->totalBytes, to, port_number);
 }