X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07890d9a4285a1d6e4151210ed7b6df8e6b32a67..3671bfe99e3f5f4dc48d8229eb57f965a1cf6913:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 730bcc7250..df6151d23c 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -11,10 +11,9 @@
 
 #include "surf/surf.h"
 #include "surf/maxmin.h"
-#include "surf/trace_mgr.h"
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
-#include "surf/random_mgr.h"
+#include "src/surf/trace_mgr.hpp"
 #include "src/instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 
@@ -42,8 +41,6 @@ typedef enum {
 
 XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode);
 
-extern XBT_PRIVATE tmgr_fes_t history;
-
 /* The __surf_is_absolute_file_path() returns 1 if
  * file_path is a absolute file path, in the other
  * case the function returns 0.
@@ -58,7 +55,6 @@ typedef struct s_model_type {
   const char *name;
   const char *desc;
   AS_t (*create) ();
-  void (*end) (AS_t as);
 } s_routing_model_description_t, *routing_model_description_t;
 
 /* This enum used in the routing structure helps knowing in which situation we are. */
@@ -68,30 +64,28 @@ typedef enum {
   SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
 } e_surf_routing_hierarchy_t;
 
+extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;
+
+
 XBT_PUBLIC(void) routing_model_create(void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) storage_register_callbacks(void);
 
-XBT_PRIVATE void routing_new_cluster(sg_platf_cluster_cbarg_t cluster);
-
 XBT_PUBLIC(void) routing_register_callbacks(void);
-XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free
- // FIXME: make previous function private to routing again?
-
-
-XBT_PUBLIC(void) routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
-                              xbt_dynar_t * route, double *latency);
+XBT_PUBLIC(void) routing_route_free(sg_platf_route_cbarg_t route); // FIXME: make previous function private to routing again?
 
 XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc);
 /**
  * Resource protected methods
  */
-XBT_PUBLIC(void) surfxml_bufferstack_push(int _new);
-XBT_PUBLIC(void) surfxml_bufferstack_pop(int _new);
-XBT_PUBLIC(void) parse_after_config(void);
+XBT_PRIVATE void surfxml_bufferstack_push(int _new);
+XBT_PRIVATE void surfxml_bufferstack_pop(int _new);
+XBT_PRIVATE void parse_after_config(void);
 
 XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 
+XBT_PRIVATE void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect);
+
 /********** Tracing **********/
 /* from surf_instr.c */
 void TRACE_surf_host_set_speed(double date, const char *resource, double power);