X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fe73f754d3f13f61b20f57b94830e4d6e8c3946..2652a7d2c9ebb969683d8fd94b11c96489327912:/src/surf/ns3/ns3_simulator.cc diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 258c43d6bd..e7b3382097 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -1,159 +1,115 @@ -/* 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; - -static const uint32_t writeSize = 1024; // limit the amout of data to write -uint8_t data[writeSize]; -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 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); -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(){ +SgFlow::SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action * action) { + totalBytes_ = totalBytes; + remaining_ = totalBytes; + action_ = action; } -/* - * This function create a flow from src to dst - * - * Parameters - * src: node source - * dst: node destination - * port_number: The port number to use - * start: the time the communication start - * 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) -{ - if(!dict_socket) dict_socket = xbt_dict_new(); - PacketSinkHelper sink ("ns3::TcpSocketFactory", InetSocketAddress (Ipv4Address::GetAny(), port_number)); - sink.Install (dst); - Ptr sock = Socket::CreateSocket (src, TypeId::LookupByName ("ns3::TcpSocketFactory")); - MySocket *mysocket = new MySocket(); - mysocket->TotalBytes = TotalBytes; - mysocket->remaining = TotalBytes; - mysocket->last_amount_sent = 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); +static SgFlow* getFlowFromSocket(ns3::Ptr socket) { + return (SgFlow*)xbt_dict_get_or_null(flowFromSock, transformSocketPtr(socket)); } -void* NS3Sim::get_action_from_socket(void *socket){ - return ((MySocket *)socket)->action; -} +static void receive_callback(ns3::Ptr socket){ + SgFlow* flow = getFlowFromSocket(socket); -char NS3Sim::get_finished(void *socket){ - return ((MySocket *)socket)->finished; + 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(); + } } -double NS3Sim::get_remains_from_socket(void *socket){ - return ((MySocket *)socket)->remaining; -} +static void send_callback(ns3::Ptr sock, uint32_t txSpace){ + SgFlow* flow = getFlowFromSocket(sock); -double NS3Sim::get_last_amount_sent_from_socket(void *socket){ - return ((MySocket *)socket)->last_amount_sent; -} + if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed) + return; -void NS3Sim::reset_last_amount_sent_from_socket(void *socket){ - ((MySocket *)socket)->last_amount_sent = 0; + 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(); } -void NS3Sim::simulator_stop(double min){ - if(min > 0.0) - Simulator::Stop(Seconds(min)); - else - Simulator::Stop(); +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); } -void NS3Sim::simulator_start(void){ - XBT_DEBUG("Start simulator"); - Simulator::Run (); +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 receive_callback(Ptr localSocket){ - Address addr; - localSocket->GetSockName (addr); - InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); - mysocket->finished = 1; - - //cout << "[" << Simulator::Now ().GetSeconds() << "] " << "Received [" << mysocket->TotalBytes << "bytes], from: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort () << endl; - std::stringstream sstream; - sstream << Simulator::Now ().GetSeconds(); - std::string s = sstream.str(); - size_t size = s.size() + 1; - char * time_sec = new char[ size ]; - strncpy( time_sec, s.c_str(), size ); - XBT_DEBUG("Stop simulator at %s seconds",time_sec); - Simulator::Stop(); +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 send_callback(Ptr localSocket, uint32_t txSpace){ - - Address addr; - localSocket->GetSockName (addr); - InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); - uint32_t totalBytes = mysocket->TotalBytes; - while ((mysocket->sentBytes) < totalBytes && localSocket->GetTxAvailable () > 0){ - uint32_t toWrite = min ((mysocket->remaining), writeSize); - toWrite = min (toWrite, localSocket->GetTxAvailable ()); - int amountSent = localSocket->Send (&data[0], toWrite, 0); - - if(amountSent < 0) - return; - - (mysocket->last_amount_sent) += amountSent; - (mysocket->sentBytes) += amountSent; - (mysocket->remaining) -= amountSent; - //cout << "[" << Simulator::Now ().GetSeconds() << "] " << "Send one packet, remaining "<< mysocket->remaining << " bytes!" << endl; - } - if ((mysocket->sentBytes) >= totalBytes){ - localSocket->Close(); - } +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(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) +void StartFlow(ns3::Ptr sock, const char *to, uint16_t port_number) { - InetSocketAddress serverAddr (to, port_number); - - //cout << "[" << Simulator::Now().GetSeconds() << "] Starting flow to " << to << " using port " << port_number << endl; + ns3::InetSocketAddress serverAddr (to, port_number); 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)); + + 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); }