Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Use homogeneous dictionaries whenever possible.
[simgrid.git] / src / surf / ns3 / ns3_simulator.cc
index 54d45c8..5e2c108 100644 (file)
@@ -7,6 +7,7 @@
 #include "surf/ns3/ns3_simulator.h"
 #include "xbt/dict.h"
 #include "xbt/log.h"
+#include "xbt/sysdep.h"
 
 using namespace ns3;
 using namespace std;
@@ -14,6 +15,7 @@ using namespace std;
 xbt_dict_t dict_socket = NULL;
 
 NS3Sim SimulatorNS3;
+static char socket_key[24];
 
 static void receive_callback(Ptr<Socket> localSocket);
 static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace);
@@ -32,6 +34,13 @@ NS3Sim::NS3Sim(){
 NS3Sim::~NS3Sim(){
 }
 
+static XBT_INLINE void transformSocketPtr (Ptr<Socket> localSocket){
+  std::stringstream sstream;
+  sstream << localSocket ;
+  std::string s = sstream.str();
+  sprintf(socket_key,"%s",s.c_str());
+}
+
 /*
  * This function create a flow from src to dst
  *
@@ -52,12 +61,13 @@ void NS3Sim::create_flow_NS3(
                uint32_t totalBytes,
                void * action)
 {
-       if(!dict_socket) dict_socket = xbt_dict_new();
+       if(!dict_socket) dict_socket = xbt_dict_new_homogeneous(free);
 
        PacketSinkHelper sink ("ns3::TcpSocketFactory",
                                                        InetSocketAddress (Ipv4Address::GetAny(),
                                                        port_number));
        sink.Install (dst);
+
        Ptr<Socket> sock = Socket::CreateSocket (src,
                                                        TcpSocketFactory::GetTypeId());
 
@@ -68,9 +78,16 @@ void NS3Sim::create_flow_NS3(
        mysocket->sentBytes = 0;
        mysocket->finished = 0;
        mysocket->action = action;
-       xbt_dict_set(dict_socket,(const char*)&sock, mysocket,NULL);
+
+       transformSocketPtr(sock);
+       xbt_dict_set(dict_socket,socket_key, mysocket,NULL);
+
        sock->Bind(InetSocketAddress(port_number));
-       Simulator::Schedule (Seconds(start),&StartFlow, sock, addr, port_number);
+       XBT_DEBUG("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){
@@ -89,60 +106,90 @@ double NS3Sim::get_sent_from_socket(void *socket){
   return ((MySocket *)socket)->sentBytes;
 }
 
-void NS3Sim::simulator_stop(double min){
-       if(min > 0.0)
-               Simulator::Stop(Seconds(min));
-       else
-               Simulator::Stop();
+void NS3Sim::simulator_start(double min){
+  if(min > 0.0)
+    Simulator::Stop(Seconds(min));
+  XBT_DEBUG("Start simulator");
+  Simulator::Run ();
 }
 
-void NS3Sim::simulator_start(void){
-       XBT_DEBUG("Start simulator");
-       Simulator::Run ();
+static MySocket* get_my_socket(Ptr<Socket> localSocket) {
+       transformSocketPtr(localSocket);
+       return (MySocket*)xbt_dict_get_or_null(dict_socket,socket_key);
 }
 
 static void receive_callback(Ptr<Socket> localSocket){
-  MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+  MySocket* mysocket = get_my_socket(localSocket);
 
   if (mysocket->finished == 0){
     mysocket->finished = 1;
-//    cout << "[" << Simulator::Now ().GetSeconds() << "] " << "recv_cb of F[" << mysocket->totalBytes << "] " << endl;
+    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();
+    Simulator::Stop(Seconds(0.0));
+    Simulator::Run();
   }
 }
 
 static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
-       MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
+       MySocket* mysocket = get_my_socket(localSocket);
 
        if (mysocket->remaining == 0){
-         //all data was already buffered (and socket was already closed), just return
-         return;
+                 //all data was already buffered (and socket was already closed), just return
+                 return;
        }
 
-       uint32_t toWrite = min (mysocket->remaining, txSpace);
-       uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*toWrite);
-       int amountSent = localSocket->Send (&data[0], toWrite, 0);
-       free (data);
-       if (amountSent > 0){
-         mysocket->bufferedBytes += amountSent;
-         mysocket->remaining -= amountSent;
-       }
-//     cout << "[" << Simulator::Now ().GetSeconds() << "] " << "send_cb of F[" << mysocket->totalBytes << "] ("<<  mysocket->remaining << " / " << mysocket->totalBytes << ") " << amountSent << " buffered." << endl;
+       uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*txSpace);
 
-  if (mysocket->remaining == 0){
-    //everything was buffered to send, tell NS3 to close the socket
-    localSocket->Close();
-  }
-       return;
+       while (mysocket->bufferedBytes < mysocket->totalBytes
+                       && localSocket->GetTxAvailable () > 0)
+       {
+      uint32_t toWrite = min ((mysocket->remaining), txSpace);
+      toWrite = min (toWrite, localSocket->GetTxAvailable ());
+      int amountSent = localSocket->Send (data, toWrite, 0);
+
+      if(amountSent < 0)
+         return;
+      (mysocket->bufferedBytes) += amountSent;
+      (mysocket->remaining) -= amountSent;
+      XBT_DEBUG("send_cb of F[%p, %p, %d] (%d/%d) %d buffered", mysocket, mysocket->action, mysocket->totalBytes, mysocket->remaining, mysocket->totalBytes, amountSent);
+
+    }
+
+       free(data);
+
+       if ((mysocket->bufferedBytes) >= 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* mysocket = get_my_socket(localSocket);
   mysocket->sentBytes += dataSent;
-//  cout << "[" << Simulator::Now ().GetSeconds() << "] " << "datasent_cb of F[" << mysocket->totalBytes << "] " << dataSent << " sent." << endl;
+  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 = get_my_socket(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 = get_my_socket(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 = get_my_socket(localSocket);
+  XBT_DEBUG("succeededConnect_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
+}
+
+static void failedConnect_callback(Ptr<Socket> localSocket){
+  MySocket* mysocket = get_my_socket(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,
     const char *to,
@@ -150,10 +197,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 = get_my_socket(sock);
+  XBT_DEBUG("startFlow_cb of F[%p, %p, %d] dest=%s port=%d", mysocket, mysocket->action, mysocket->totalBytes, to, port_number);
 }