X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90c7ba381698bf25fc1d118549b2b08875e7e47a..29cedcb0af274d0dd82224451767e8d01162d734:/src/surf/ns3/ns3_simulator.cc diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index 99e93d15a7..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" @@ -15,26 +15,36 @@ using namespace std; xbt_dict_t dict_socket = NULL; NS3Sim SimulatorNS3; +static char socket_key[24]; 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 StartFlow(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 void transformSocketPtr (Ptr 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 @@ -51,63 +61,50 @@ 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(); + if(!dict_socket) + dict_socket = xbt_dict_new_homogeneous(delete_mysocket); PacketSinkHelper sink ("ns3::TcpSocketFactory", InetSocketAddress (Ipv4Address::GetAny(), port_number)); sink.Install (dst); - Ptr sock = Socket::CreateSocket (src, - TcpSocketFactory::GetTypeId()); + + 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(0.0),&StartFlow, sock, addr, port_number); -} - -void* NS3Sim::get_action_from_socket(void *socket){ - return ((MySocket *)socket)->action; -} -char NS3Sim::get_finished(void *socket){ - return ((MySocket *)socket)->finished; -} + transformSocketPtr(sock); + xbt_dict_set(dict_socket,socket_key, mysocket,NULL); -double NS3Sim::get_remains_from_socket(void *socket){ - return ((MySocket *)socket)->remaining; -} + sock->Bind(InetSocketAddress(port_number)); + XBT_DEBUG("Create flow starting to %fs + %fs = %fs",start-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), start); -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_stop(double min){ - if(min > 0.0) - Simulator::Stop(Seconds(min)); - else - Simulator::Stop(); +void NS3Sim::simulator_start(double min){ + if(min > 0.0) + Simulator::Stop(Seconds(min)); + XBT_DEBUG("Start simulator '%f'",min); + Simulator::Run (); } -void NS3Sim::simulator_start(void){ - XBT_DEBUG("Start simulator"); - Simulator::Run (); +static MySocket* get_my_socket(Ptr localSocket) { + transformSocketPtr(localSocket); + return (MySocket*)xbt_dict_get_or_null(dict_socket,socket_key); } static void receive_callback(Ptr 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; -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "recv_cb of F[" << mysocket->totalBytes << "] " << endl; + 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)); Simulator::Run(); @@ -115,63 +112,66 @@ static void receive_callback(Ptr localSocket){ } static void send_callback(Ptr 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 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); - 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; + 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 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; -// 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 localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "normalClose_cb of F[" << mysocket->totalBytes << "]" << endl; + 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 localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "errorClose_cb of F[" << mysocket->totalBytes << "]" << endl; + 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 localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "succeededConnect_cb of F[" << mysocket->totalBytes << "]" << endl; + 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 localSocket){ - MySocket* mysocket = (MySocket*)xbt_dict_get_or_null(dict_socket,(char*)&localSocket); -// cout << "[" << Simulator::Now ().GetSeconds() << "] " << "failedConnect_cb of F[" << mysocket->totalBytes << "]" << endl; + 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"); } -static void StartFlow(Ptr sock, - const char *to, - uint16_t port_number) +static void StartFlow(Ptr sock, const char *to, uint16_t port_number) { InetSocketAddress serverAddr (to, port_number); @@ -182,6 +182,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; + 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); }