X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..18801754584f9ffc3e7c2407008ac24c0eb57926:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index da772b5103..954a1931d9 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -15,7 +15,7 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
 #include "surf/random_mgr.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0
@@ -69,17 +69,14 @@ XBT_PUBLIC(void) routing_model_create(void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) storage_register_callbacks(void);
 
-/* ***************************************** */
-/* TUTORIAL: New TAG                         */
-XBT_PUBLIC(void) gpu_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_routing_edge_t src, sg_routing_edge_t dst,
+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) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc);
@@ -94,9 +91,16 @@ XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 
 /********** Tracing **********/
 /* from surf_instr.c */
-void TRACE_surf_host_set_power(double date, const char *resource, double power);
+void TRACE_surf_host_set_speed(double date, const char *resource, double power);
 void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
 
+/********** Instr. **********/
+
+XBT_PRIVATE void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS);
+XBT_PRIVATE void sg_instr_new_router(sg_platf_router_cbarg_t router);
+XBT_PRIVATE void sg_instr_new_host(sg_platf_host_cbarg_t host);
+XBT_PRIVATE void sg_instr_AS_end(void);
+
 SG_END_DECL()
 
 #endif                          /* _SURF_SURF_PRIVATE_H */