X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9db1c6bd915c76435648987526e3135cb91285f..06bae8eb4bc956a5ee70ec1d3cdbc5e7e782536f:/src/surf/ns3/ns3_simulator.cc

diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index 07abf0cfda..5e2c1084ba 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -15,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);
@@ -33,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
  *
@@ -53,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());
 
@@ -69,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(0.0),&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){
@@ -97,8 +113,13 @@ void NS3Sim::simulator_start(double min){
   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;
@@ -110,55 +131,62 @@ static void receive_callback(Ptr<Socket> localSocket){
 }
 
 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;
-	}
-  XBT_DEBUG("send_cb of F[%p, %p, %d] (%d/%d) %d buffered", mysocket, mysocket->action, mysocket->totalBytes, mysocket->remaining, mysocket->totalBytes, amountSent);
+	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;
   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);
+  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 = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&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 = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&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 = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&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");
 }
@@ -176,6 +204,6 @@ static void StartFlow(Ptr<Socket> sock,
   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);
+  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);
 }