X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbfaf2c37c080ab6f6c41fb4d3d0d481db6b7780..3d7871258a01dc77c95cd4618034b8fd89bbd8d9:/src/surf/ns3/ns3_simulator.cc diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index b4b76d4898..06bd569643 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -9,82 +9,36 @@ #include "xbt/log.h" #include "xbt/sysdep.h" -static void delete_mysocket(void *p) +static void delete_mysocket(void* p) { - delete (SgFlow *)p; + delete (SgFlow*)p; } -xbt_dict_t flowFromSock = xbt_dict_new_homogeneous(delete_mysocket);; // ns3::sock -> SgFlow +xbt_dict_t flowFromSock = xbt_dict_new_homogeneous(delete_mysocket); +; // ns3::sock -> SgFlow 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_EXTERNAL_DEFAULT_CATEGORY(ns3); -NS3Sim::NS3Sim(){ -} - -static inline const char *transformSocketPtr (ns3::Ptr localSocket) +SgFlow::SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action) { - 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 creates 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(ns3::Ptr src, ns3::Ptr dst, uint16_t port_number, - double startTime, const char *ipAddr, uint32_t totalBytes, - simgrid::surf::NetworkNS3Action * action) -{ - ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number)); - sink.Install (dst); - - ns3::Ptr sock = ns3::Socket::CreateSocket (src, ns3::TcpSocketFactory::GetTypeId()); - - xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(totalBytes, action), NULL); - - 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); - - ns3::Simulator::Schedule (ns3::Seconds(startTime-ns3::Simulator::Now().GetSeconds()), - &StartFlow, sock, ipAddr, port_number); + remaining_ = totalBytes; + action_ = action; } -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 (); -} - -static SgFlow* getFlowFromSocket(ns3::Ptr socket) { - return (SgFlow*)xbt_dict_get_or_null(flowFromSock, transformSocketPtr(socket)); +static SgFlow* getFlowFromSocket(ns3::Ptr socket) +{ + return (SgFlow*)xbt_dict_get_or_null(flowFromSock, transformSocketPtr(socket)); } -static void receive_callback(ns3::Ptr socket){ +static void receive_callback(ns3::Ptr socket) +{ SgFlow* flow = getFlowFromSocket(socket); - if (flow->finished_ == false){ + 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()); @@ -93,72 +47,78 @@ static void receive_callback(ns3::Ptr socket){ } } -static void send_callback(ns3::Ptr sock, uint32_t txSpace){ - SgFlow* flow = getFlowFromSocket(sock); +static void send_callback(ns3::Ptr sock, uint32_t txSpace) +{ + SgFlow* flow = getFlowFromSocket(sock); - if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed) - return; + if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed) + return; - uint8_t *data = (uint8_t*)malloc(sizeof(uint8_t)*txSpace); + uint8_t* data = (uint8_t*)malloc(sizeof(uint8_t) * txSpace); - while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable () > 0) { + 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); + 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; + 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); + 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(); + if ((flow->bufferedBytes_) >= flow->totalBytes_) + sock->Close(); } -static void datasent_callback(ns3::Ptr socket, uint32_t dataSent){ +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(ns3::Ptr socket){ +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); + receive_callback(socket); } -static void errorClose_callback(ns3::Ptr socket){ +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(ns3::Ptr socket){ +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){ +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(ns3::Ptr sock, const char *to, uint16_t port_number) +void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number) { - ns3::InetSocketAddress serverAddr (to, port_number); + 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)); + 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);