Depricated gtnets header, compability with old gtnets versions still granted.

[simgrid.git] / src / surf / gtnets / gtnets_simulator.h

diff --git a/src/surf/gtnets/gtnets_simulator.h b/src/surf/gtnets/gtnets_simulator.h
index 4194383..ac70308 100644 (file)
--- a/src/surf/gtnets/gtnets_simulator.h
+++ b/src/surf/gtnets/gtnets_simulator.h
@@ -24,7 +24,6 @@
 #include "tcp-tahoe.h"      // Definitions for TCP Tahoe
 #include "tcp-reno.h"
 #include "tcp-newreno.h"
-#include "validation.h"
 #include "event.h"
 #include "routing-manual.h"
 
@@ -45,7 +44,8 @@ public:
   double get_time_to_next_flow_completion();
   int run_until_next_flow_completion(void*** metadata, int* number_of_flows);
   int run(double deltat);
-
+  // returns the total received by the TCPServer peer of the given action
+  double gtnets_get_flow_rx(void *metadata);
   void create_gtnets_topology();
 private:
   void add_nodes();
@@ -60,10 +60,12 @@ private:
   int is_topology_;
   int nflow_;
 
-  map<int, Linkp2p*>   gtnets_links_;
-  map<int, Node*>      gtnets_nodes_;
   map<int, TCPServer*> gtnets_servers_;
   map<int, TCPSend*>   gtnets_clients_;
+  map<int, Linkp2p*>   gtnets_links_;
+  map<int, Node*>      gtnets_nodes_;
+  //added by pedro in order to get statistics
+  map<void*, int>      gtnets_action_to_flow_;
 
   map<int, void*>      gtnets_metadata_;
 };