X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c46aba70aa4ccf22cc19fac31d451c7158e922dd..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index e427e58483..0e594097fe 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2016. 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. */ @@ -41,26 +40,13 @@ XBT_PRIVATE FILE *surf_fopen(const char *name, const char *mode); */ XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path); -/** - * Routing logic - */ - -/* This enum used in the routing structure helps knowing in which situation we are. */ -typedef enum { - SURF_ROUTING_NULL = 0, /**< Undefined type */ - SURF_ROUTING_BASE, /**< Base case: use simple link lists for routing */ - 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_exit(void); -XBT_PUBLIC(void) storage_register_callbacks(void); - -XBT_PUBLIC(void) routing_register_callbacks(void); +XBT_PUBLIC(void) storage_register_callbacks(); -XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc); -XBT_PRIVATE void parse_after_config(void); +XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t rc); +XBT_PRIVATE void parse_after_config(); /********** Tracing **********/ /* from surf_instr.c */