X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/007694fe3d4ebd6577e1fb0a1017330b1a575a67..dbfaf2c37c080ab6f6c41fb4d3d0d481db6b7780:/src/surf/ns3/ns3_simulator.cc diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 199d6c68d6..b4b76d4898 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -1,40 +1,47 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2016. 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" -using namespace ns3; -using namespace std; - -xbt_dict_t dict_socket = NULL; - -NS3Sim SimulatorNS3; +static void delete_mysocket(void *p) +{ + delete (SgFlow *)p; +} +xbt_dict_t flowFromSock = xbt_dict_new_homogeneous(delete_mysocket);; // ns3::sock -> SgFlow -static void receive_callback(Ptr localSocket); -static void send_callback(Ptr localSocket, uint32_t txSpace); -static void datasent_callback(Ptr localSocket, uint32_t dataSent); -static void StartFlow(Ptr sock, - const char *to, - uint16_t port_number); +static void receive_callback(ns3::Ptr socket); +static void send_callback(ns3::Ptr sock, uint32_t txSpace); +static void datasent_callback(ns3::Ptr socket, uint32_t dataSent); +static void StartFlow(ns3::Ptr 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 inline const char *transformSocketPtr (ns3::Ptr localSocket) +{ + static char key[24]; + std::stringstream sstream; + sstream << localSocket ; + sprintf(key,"%s",sstream.str().c_str()); + + return key; } +SgFlow::SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action * action) { + totalBytes_ = totalBytes; + remaining_ = totalBytes; + action_ = action; +} /* - * This function create a flow from src to dst + * This function creates a flow from src to dst * * Parameters * src: node source @@ -44,134 +51,107 @@ NS3Sim::~NS3Sim(){ * addr: ip address * totalBytes: number of bytes to transmit */ -void NS3Sim::create_flow_NS3( - Ptr src, - Ptr dst, - uint16_t port_number, - double start, - const char *addr, - uint32_t totalBytes, - void * action) +void NS3Sim::create_flow_NS3(ns3::Ptr src, ns3::Ptr dst, uint16_t port_number, + double startTime, const char *ipAddr, uint32_t totalBytes, + simgrid::surf::NetworkNS3Action * action) { - if(!dict_socket) dict_socket = xbt_dict_new(); - - PacketSinkHelper sink ("ns3::TcpSocketFactory", - InetSocketAddress (Ipv4Address::GetAny(), - port_number)); + ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number)); sink.Install (dst); - Ptr 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; - xbt_dict_set(dict_socket,(const char*)&sock, mysocket,NULL); - sock->Bind(InetSocketAddress(port_number)); - Simulator::Schedule (Seconds(start),&StartFlow, sock, addr, port_number); -} -void* NS3Sim::get_action_from_socket(void *socket){ - return ((MySocket *)socket)->action; -} + ns3::Ptr sock = ns3::Socket::CreateSocket (src, ns3::TcpSocketFactory::GetTypeId()); -char NS3Sim::get_finished(void *socket){ - return ((MySocket *)socket)->finished; -} + xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(totalBytes, action), NULL); -double NS3Sim::get_remains_from_socket(void *socket){ - return ((MySocket *)socket)->remaining; -} + sock->Bind(ns3::InetSocketAddress(port_number)); + XBT_DEBUG("Create flow starting to %fs + %fs = %fs", + startTime-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), startTime); -double NS3Sim::get_sent_from_socket(void *socket){ - return ((MySocket *)socket)->sentBytes; + ns3::Simulator::Schedule (ns3::Seconds(startTime-ns3::Simulator::Now().GetSeconds()), + &StartFlow, sock, ipAddr, port_number); } -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) + ns3::Simulator::Stop(ns3::Seconds(min)); + XBT_DEBUG("Start simulator '%f'",min); + ns3::Simulator::Run (); } -void NS3Sim::simulator_start(void){ - XBT_DEBUG("Start simulator"); - Simulator::Run (); +static SgFlow* getFlowFromSocket(ns3::Ptr socket) { + return (SgFlow*)xbt_dict_get_or_null(flowFromSock, transformSocketPtr(socket)); } -static void receive_callback(Ptr localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); +static void receive_callback(ns3::Ptr socket){ + SgFlow* flow = getFlowFromSocket(socket); - if (mysocket->finished == 0){ - mysocket->finished = 1; -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "recv_cb of F[" << mysocket->totalBytes << "] " << endl; - XBT_DEBUG("Stop simulator at %f seconds", Simulator::Now().GetSeconds()); - Simulator::Stop(); + if (flow->finished_ == false){ + flow->finished_ = true; + XBT_DEBUG("recv_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("Stop simulator at %f seconds", ns3::Simulator::Now().GetSeconds()); + ns3::Simulator::Stop(ns3::Seconds(0.0)); + ns3::Simulator::Run(); } } -static void send_callback(Ptr localSocket, uint32_t txSpace){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); +static void send_callback(ns3::Ptr sock, uint32_t txSpace){ + SgFlow* flow = getFlowFromSocket(sock); - if (mysocket->remaining == 0){ - //all data was already buffered (and socket was already closed), just return + if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed) 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; - - if (mysocket->remaining == 0){ - //everything was buffered to send, tell NS3 to close the socket - localSocket->Close(); - } - return; + + uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*txSpace); + + while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable () > 0) { + + uint32_t toWrite = std::min ({flow->remaining_, txSpace, sock->GetTxAvailable ()}); + int amountSent = sock->Send (data, toWrite, 0); + + if(amountSent < 0) + return; + flow->bufferedBytes_ += amountSent; + flow->remaining_ -= amountSent; + + XBT_DEBUG("send_cb of F[%p, %p, %d] (%d/%d) %d buffered", flow, flow->action_, flow->totalBytes_, + flow->remaining_, flow->totalBytes_, amountSent); + } + free(data); + + if ((flow->bufferedBytes_) >= flow->totalBytes_) + sock->Close(); } -static void datasent_callback(Ptr 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; +static void datasent_callback(ns3::Ptr socket, uint32_t dataSent){ + SgFlow* flow = getFlowFromSocket(socket); + flow->sentBytes_ += dataSent; + XBT_DEBUG("datasent_cb of F[%p, %p, %d] %d sent", flow, flow->action_, flow->totalBytes_, dataSent); } -static void normalClose_callback(Ptr localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "normalClose_cb of F[" << mysocket->totalBytes << "]" << endl; - receive_callback (localSocket); +static void normalClose_callback(ns3::Ptr socket){ + SgFlow* flow = getFlowFromSocket(socket); + XBT_DEBUG("normalClose_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); + receive_callback (socket); } -static void errorClose_callback(Ptr localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "errorClose_cb of F[" << mysocket->totalBytes << "]" << endl; +static void errorClose_callback(ns3::Ptr socket){ + SgFlow* flow = getFlowFromSocket(socket); + XBT_DEBUG("errorClose_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); xbt_die("NS3: a socket was closed anormally"); } -static void succeededConnect_callback(Ptr localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "succeededConnect_cb of F[" << mysocket->totalBytes << "]" << endl; +static void succeededConnect_callback(ns3::Ptr socket){ + SgFlow* flow = getFlowFromSocket(socket); + XBT_DEBUG("succeededConnect_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); } -static void failedConnect_callback(Ptr localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "failedConnect_cb of F[" << mysocket->totalBytes << "]" << endl; +static void failedConnect_callback(ns3::Ptr socket){ + SgFlow* mysocket = getFlowFromSocket(socket); + 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 sock, - const char *to, - uint16_t port_number) +static void StartFlow(ns3::Ptr sock, const char *to, uint16_t port_number) { - InetSocketAddress serverAddr (to, port_number); + ns3::InetSocketAddress serverAddr (to, port_number); sock->Connect(serverAddr); sock->SetSendCallback (MakeCallback (&send_callback)); @@ -180,6 +160,6 @@ static void StartFlow(Ptr 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); -// cout << "[" << Simulator::Now().GetSeconds() << "] Starting flow to " << to << " using port " << port_number << endl; + SgFlow* flow = getFlowFromSocket(sock); + XBT_DEBUG("startFlow_cb of F[%p, %p, %d] dest=%s port=%d", flow, flow->action_, flow->totalBytes_, to, port_number); }