X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d0421bd87d5d3ceb1345ce3ecf1e21cc4753060..224d044bb5d5126e97d67254e13f7b584583a225:/src/surf/ns3/ns3_simulator.cc?ds=sidebyside

diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index 8e25eba209..af1359b88f 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -71,7 +71,7 @@ void NS3Sim::create_flow_NS3(
 	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);
+	Simulator::Schedule (Seconds(0.0),&StartFlow, sock, addr, port_number);
 }
 
 void* NS3Sim::get_action_from_socket(void *socket){
@@ -90,16 +90,11 @@ 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(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){
@@ -107,7 +102,7 @@ static void receive_callback(Ptr<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(Seconds(0.0));
     Simulator::Run();
@@ -122,7 +117,8 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
 	  return;
 	}
 
-	uint32_t toWrite = min (mysocket->remaining, txSpace);
+	uint32_t packetSize = 1024;
+	uint32_t toWrite = min (mysocket->remaining, packetSize);
 	uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*toWrite);
 	int amountSent = localSocket->Send (&data[0], toWrite, 0);
 	free (data);
@@ -130,7 +126,7 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
 	  mysocket->bufferedBytes += amountSent;
 	  mysocket->remaining -= amountSent;
 	}
-//	cout << "[" << Simulator::Now ().GetSeconds() << "] " << "send_cb of F[" << mysocket->totalBytes << "] ("<<  mysocket->remaining << " / " << mysocket->totalBytes << ") " << amountSent << " buffered." << 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->remaining == 0){
     //everything was buffered to send, tell NS3 to close the socket
@@ -142,29 +138,29 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
 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;
-//  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 = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket);
-//  cout << "[" << Simulator::Now ().GetSeconds() << "] " << "normalClose_cb of F[" << mysocket->totalBytes << "]" << endl;
+  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);
-//  cout << "[" << Simulator::Now ().GetSeconds() << "] " << "errorClose_cb of F[" << mysocket->totalBytes << "]" << endl;
+  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);
-//  cout << "[" << Simulator::Now ().GetSeconds() << "] " << "succeededConnect_cb of F[" << mysocket->totalBytes << "]" << endl;
+  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);
-//  cout << "[" << Simulator::Now ().GetSeconds() << "] " << "failedConnect_cb of F[" << mysocket->totalBytes << "]" << endl;
+  XBT_DEBUG("failedConnect_cb of F[%p, %p, %d]", mysocket, mysocket->action, mysocket->totalBytes);
   xbt_die("NS3: a socket failed to connect");
 }
 
@@ -182,5 +178,5 @@ static void StartFlow(Ptr<Socket> sock,
   sock->SetCloseCallbacks (MakeCallback (&normalClose_callback), MakeCallback (&errorClose_callback));
 
   MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&sock);
-//  cout << "[" <<  Simulator::Now().GetSeconds() << "] Starting flow to " << to << " using port " << port_number << endl;
+  XBT_DEBUG("startFlow_cb of F[%p, %p, %d] dest=%s port=%d", mysocket, mysocket->action, mysocket->totalBytes, to, port_number);
 }