X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/287c23aa88117d5da87e4c716d54e8b7d1ae8a5e..29cedcb0af274d0dd82224451767e8d01162d734:/src/surf/ns3/ns3_simulator.cc

diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc
index d0f68f24e9..de44c3858a 100644
--- a/src/surf/ns3/ns3_simulator.cc
+++ b/src/surf/ns3/ns3_simulator.cc
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "surf/ns3/ns3_simulator.h"
+#include "src/surf/ns3/ns3_simulator.h"
 #include "xbt/dict.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
@@ -20,29 +20,31 @@ static char socket_key[24];
 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);
+static void StartFlow(Ptr<Socket> sock, const char *to, uint16_t port_number);
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simulator_ns3, surf,
-                                "Logging specific to the SURF network NS3 module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
 
-// Constructor.
 NS3Sim::NS3Sim(){
 }
-//Destructor.
 NS3Sim::~NS3Sim(){
 }
 
-static XBT_INLINE void transformSocketPtr (Ptr<Socket> localSocket){
+static inline void transformSocketPtr (Ptr<Socket> localSocket)
+{
   std::stringstream sstream;
   sstream << localSocket ;
   std::string s = sstream.str();
   sprintf(socket_key,"%s",s.c_str());
 }
 
+static void delete_mysocket(void *p)
+{
+  MySocket *sock = (MySocket *)p;
+  delete(sock);
+}
+
 /*
- * This function create a flow from src to dst
+ * This function creates a flow from src to dst
  *
  * Parameters
  * 		src: node source
@@ -59,51 +61,30 @@ void NS3Sim::create_flow_NS3(
 		double start,
 		const char *addr,
 		uint32_t totalBytes,
-		void * action)
+		simgrid::surf::NetworkNS3Action * action)
 {
-	if(!dict_socket) dict_socket = xbt_dict_new_homogeneous(free);
+	if(!dict_socket)
+	  dict_socket = xbt_dict_new_homogeneous(delete_mysocket);
 
 	PacketSinkHelper sink ("ns3::TcpSocketFactory",
 							InetSocketAddress (Ipv4Address::GetAny(),
 							port_number));
 	sink.Install (dst);
 
-	Ptr<Socket> sock = Socket::CreateSocket (src,
-							TcpSocketFactory::GetTypeId());
+	Ptr<Socket> sock = Socket::CreateSocket (src, TcpSocketFactory::GetTypeId());
 
 	MySocket *mysocket = new MySocket();
 	mysocket->totalBytes = totalBytes;
 	mysocket->remaining = totalBytes;
-	mysocket->bufferedBytes = 0;
-	mysocket->sentBytes = 0;
-	mysocket->finished = 0;
 	mysocket->action = action;
 
 	transformSocketPtr(sock);
 	xbt_dict_set(dict_socket,socket_key, mysocket,NULL);
 
 	sock->Bind(InetSocketAddress(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);
-
-}
+	XBT_DEBUG("Create flow starting to %fs + %fs = %fs",start-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), start);
 
-void* NS3Sim::get_action_from_socket(void *socket){
-	return ((MySocket *)socket)->action;
-}
-
-char NS3Sim::get_finished(void *socket){
-	return ((MySocket *)socket)->finished;
-}
-
-double NS3Sim::get_remains_from_socket(void *socket){
-	return ((MySocket *)socket)->remaining;
-}
-
-double NS3Sim::get_sent_from_socket(void *socket){
-  return ((MySocket *)socket)->sentBytes;
+	Simulator::Schedule (Seconds(start-ns3::Simulator::Now().GetSeconds()),&StartFlow, sock, addr, port_number);
 }
 
 void NS3Sim::simulator_start(double min){
@@ -121,8 +102,8 @@ static MySocket* get_my_socket(Ptr<Socket> localSocket) {
 static void receive_callback(Ptr<Socket> localSocket){
   MySocket* mysocket = get_my_socket(localSocket);
 
-  if (mysocket->finished == 0){
-    mysocket->finished = 1;
+  if (mysocket->finished == false){
+    mysocket->finished = true;
     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));
@@ -134,7 +115,7 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
 	MySocket* mysocket = get_my_socket(localSocket);
 
 	if (mysocket->remaining == 0){
-		  //all data was already buffered (and socket was already closed), just return
+		  // all data was already buffered (and socket was already closed), just return
 		  return;
 	}
 
@@ -157,9 +138,8 @@ static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace){
 
 	free(data);
 
-	if ((mysocket->bufferedBytes) >= mysocket->totalBytes){
+	if ((mysocket->bufferedBytes) >= mysocket->totalBytes)
 		localSocket->Close();
-	}
 }
 
 static void datasent_callback(Ptr<Socket> localSocket, uint32_t dataSent){
@@ -191,9 +171,7 @@ static void failedConnect_callback(Ptr<Socket> localSocket){
   xbt_die("NS3: a socket failed to connect");
 }
 
-static void StartFlow(Ptr<Socket> sock,
-    const char *to,
-    uint16_t port_number)
+static void StartFlow(Ptr<Socket> sock, const char *to, uint16_t port_number)
 {
   InetSocketAddress serverAddr (to, port_number);