static void receive_callback(Ptr<Socket> localSocket);
static void send_callback(Ptr<Socket> localSocket, uint32_t txSpace);
static void datasent_callback(Ptr<Socket> localSocket, uint32_t dataSent);
-static void StartFlow(Ptr<Socket> sock,
- const char *to,
- uint16_t port_number);
+static void StartFlow(Ptr<Socket> sock, const char *to, uint16_t port_number);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
-// Constructor.
NS3Sim::NS3Sim(){
}
-//Destructor.
NS3Sim::~NS3Sim(){
}
-static XBT_INLINE void transformSocketPtr (Ptr<Socket> localSocket){
+static inline void transformSocketPtr (Ptr<Socket> localSocket)
+{
std::stringstream sstream;
sstream << localSocket ;
std::string s = sstream.str();
}
/*
- * This function create a flow from src to dst
+ * This function creates a flow from src to dst
*
* Parameters
* src: node source
double start,
const char *addr,
uint32_t totalBytes,
- void * action)
+ simgrid::surf::NetworkNS3Action * action)
{
- if(!dict_socket) dict_socket = xbt_dict_new_homogeneous(delete_mysocket);
+ if(!dict_socket)
+ dict_socket = xbt_dict_new_homogeneous(delete_mysocket);
PacketSinkHelper sink ("ns3::TcpSocketFactory",
InetSocketAddress (Ipv4Address::GetAny(),
port_number));
sink.Install (dst);
- Ptr<Socket> sock = Socket::CreateSocket (src,
- TcpSocketFactory::GetTypeId());
+ Ptr<Socket> 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;
transformSocketPtr(sock);
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_time(), ns3_time(), start);
-
- Simulator::Schedule (Seconds(start-ns3_time()),&StartFlow, sock, addr, port_number);
-// Simulator::Schedule (Seconds(0.0),&StartFlow, sock, addr, port_number);
-
-}
-
-void* NS3Sim::get_action_from_socket(void *socket){
- return ((MySocket *)socket)->action;
-}
+ XBT_DEBUG("Create flow starting to %fs + %fs = %fs",start-ns3::Simulator::Now().GetSeconds(), ns3::Simulator::Now().GetSeconds(), start);
-char NS3Sim::get_finished(void *socket){
- return ((MySocket *)socket)->finished;
-}
-
-double NS3Sim::get_remains_from_socket(void *socket){
- return ((MySocket *)socket)->remaining;
-}
-
-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_start(double min){
static void receive_callback(Ptr<Socket> localSocket){
MySocket* mysocket = get_my_socket(localSocket);
- if (mysocket->finished == 0){
- mysocket->finished = 1;
+ 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));
MySocket* mysocket = get_my_socket(localSocket);
if (mysocket->remaining == 0){
- //all data was already buffered (and socket was already closed), just return
+ // all data was already buffered (and socket was already closed), just return
return;
}
free(data);
- if ((mysocket->bufferedBytes) >= mysocket->totalBytes){
+ if ((mysocket->bufferedBytes) >= mysocket->totalBytes)
localSocket->Close();
- }
}
static void datasent_callback(Ptr<Socket> localSocket, uint32_t dataSent){
xbt_die("NS3: a socket failed to connect");
}
-static void StartFlow(Ptr<Socket> sock,
- const char *to,
- uint16_t port_number)
+static void StartFlow(Ptr<Socket> sock, const char *to, uint16_t port_number)
{
InetSocketAddress serverAddr (to, port_number);