From b42f5b4e396832c48dca8043d683288fc7475c42 Mon Sep 17 00:00:00 2001 From: Lucas Schnorr Date: Fri, 2 Sep 2011 17:46:46 +0200 Subject: [PATCH] [NS3] cosmetics, removing unused functions/methods --- src/surf/ns3/ns3_interface.cc | 8 -------- src/surf/ns3/ns3_interface.h | 2 -- src/surf/ns3/ns3_simulator.cc | 8 -------- src/surf/ns3/ns3_simulator.h | 2 -- 4 files changed, 20 deletions(-) diff --git a/src/surf/ns3/ns3_interface.cc b/src/surf/ns3/ns3_interface.cc index b0f57d2750..57f118bc3c 100644 --- a/src/surf/ns3/ns3_interface.cc +++ b/src/surf/ns3/ns3_interface.cc @@ -59,14 +59,6 @@ double ns3_get_socket_sent(void *socket){ return ns3_sim->get_sent_from_socket(socket); } -double ns3_get_socket_last_amount_sent(void *socket){ - return ns3_sim->get_last_amount_sent_from_socket(socket); -} - -void ns3_reset_socket_last_amount_sent(void *socket){ - ns3_sim->reset_last_amount_sent_from_socket(socket); -} - char ns3_get_socket_is_finished(void *socket){ return ns3_sim->get_finished(socket); } diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h index 95426c6081..0efbdfa90e 100644 --- a/src/surf/ns3/ns3_interface.h +++ b/src/surf/ns3/ns3_interface.h @@ -37,8 +37,6 @@ XBT_PUBLIC(double) ns3_time(void); XBT_PUBLIC(void*) ns3_get_socket_action(void *socket); XBT_PUBLIC(double) ns3_get_socket_remains(void *socket); XBT_PUBLIC(double) ns3_get_socket_sent(void *socket); -XBT_PUBLIC(double) ns3_get_socket_last_amount_sent(void *socket); -XBT_PUBLIC(void) ns3_reset_socket_last_amount_sent(void *socket); XBT_PUBLIC(char) ns3_get_socket_is_finished(void *socket); XBT_PUBLIC(void *) ns3_add_host(char * id); XBT_PUBLIC(void *) ns3_add_host_cluster(char * id); diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index bd52efcdc9..07e313698c 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -87,14 +87,6 @@ double NS3Sim::get_sent_from_socket(void *socket){ return ((MySocket *)socket)->sentBytes; } -double NS3Sim::get_last_amount_sent_from_socket(void *socket){ - return ((MySocket *)socket)->last_amount_sent; -} - -void NS3Sim::reset_last_amount_sent_from_socket(void *socket){ - ((MySocket *)socket)->last_amount_sent = 0; -} - void NS3Sim::simulator_stop(double min){ if(min > 0.0) Simulator::Stop(Seconds(min)); diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h index 5e6792aad0..04acbef97b 100644 --- a/src/surf/ns3/ns3_simulator.h +++ b/src/surf/ns3/ns3_simulator.h @@ -50,8 +50,6 @@ public: void* get_action_from_socket(void *socket); double get_remains_from_socket(void *socket); double get_sent_from_socket(void *socket); - double get_last_amount_sent_from_socket(void *socket); - void reset_last_amount_sent_from_socket(void *socket); char get_finished(void *socket); }; -- 2.20.1