}
NetworkNS3Model::~NetworkNS3Model() {
- ns3_finalize();
+ delete ns3_sim;
xbt_dynar_free_container(&IPV4addr);
xbt_dict_free(&dict_socket);
}
return 0;
}
-// clean up
-void ns3_finalize(){
- if (!ns3_sim)
- return;
- delete ns3_sim;
- ns3_sim = 0;
-}
-
// initialize the NS3 interface and environment
int ns3_initialize(const char* TcpProtocol){
xbt_assert(!ns3_sim, "ns3 already initialized");
SG_BEGIN_DECL()
-XBT_PUBLIC(void) ns3_finalize();
XBT_PUBLIC(int) ns3_initialize(const char* TcpProtocol);
XBT_PUBLIC(int) ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action);
XBT_PUBLIC(void) ns3_simulator(double min);
NS3Sim::NS3Sim(){
}
-NS3Sim::~NS3Sim(){
-}
static inline void transformSocketPtr (Ptr<Socket> localSocket)
{
* addr: ip address
* totalBytes: number of bytes to transmit
*/
-void NS3Sim::create_flow_NS3(
- Ptr<Node> src,
- Ptr<Node> dst,
- uint16_t port_number,
- double start,
- const char *addr,
- uint32_t totalBytes,
+void NS3Sim::create_flow_NS3(Ptr<Node> src, Ptr<Node> 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_homogeneous(delete_mysocket);
- PacketSinkHelper sink ("ns3::TcpSocketFactory",
- InetSocketAddress (Ipv4Address::GetAny(),
- port_number));
+ PacketSinkHelper sink("ns3::TcpSocketFactory", InetSocketAddress (Ipv4Address::GetAny(), port_number));
sink.Install (dst);
Ptr<Socket> sock = Socket::CreateSocket (src, TcpSocketFactory::GetTypeId());
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::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), start);
+ XBT_DEBUG("Create flow starting to %fs + %fs = %fs",
+ startTime-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), startTime);
- Simulator::Schedule (Seconds(start-ns3::Simulator::Now().GetSeconds()),&StartFlow, sock, addr, port_number);
+ Simulator::Schedule (Seconds(startTime-ns3::Simulator::Now().GetSeconds()),
+ &StartFlow, sock, ipAddr, port_number);
}
void NS3Sim::simulator_start(double min){