add methods allowing routing, bypass the parser... this still crude and improvable

[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 8765b96..9a88c74 100644 (file)
--- a/src/surf/gtnets/gtnets_simulator.h
+++ b/src/surf/gtnets/gtnets_simulator.h
@@ -1,5 +1,5 @@
-/*     $Id$     */
-/* Copyright (c) 2007 Kayo Fujiwara. All rights reserved.                  */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -26,6 +26,7 @@
 #include "tcp-newreno.h"
 #include "event.h"
 #include "routing-manual.h"
+#include "red.h"
 
 using namespace std;
 
@@ -59,18 +60,18 @@ private:
   Simulator *sim_;
   GTNETS_Topology *topo_;
   RoutingManual *rm_;
+  REDQueue *red_queue_;
   int nnode_;
   int is_topology_;
   int nflow_;
   double jitter_;
   int jitter_seed_;
-  Uniform *uniform_jitter_;
+  map< int, Uniform * > uniform_jitter_generator_;
 
     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_;