sanitize the way parsing callbacks of the routing submodule are registered

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f67846a..2534167 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -30,7 +30,6 @@ extern double sg_gtnets_jitter;
 extern int sg_gtnets_jitter_seed;
 #endif
 
-extern xbt_dict_t cluster_host_link;
 
 extern const char *surf_action_state_names[6];
 
@@ -102,11 +101,12 @@ typedef struct s_onelink {
 /**
  * Routing logic
  */
+typedef struct s_routing_component *routing_component_t;
 
 typedef struct s_model_type {
   const char *name;
   const char *desc;
-  void *(*create) ();
+  routing_component_t (*create) ();
   void (*load) ();
   void (*unload) ();
   void (*end) ();
@@ -197,13 +197,14 @@ struct s_routing_global {
 };
 
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
+XBT_PUBLIC(void) routing_register_callbacks(void);
 
 XBT_PUBLIC(void) routing_parse_Scluster(void);       /* cluster bypass */
 
 /**
  * Resource protected methods
  */
-xbt_dict_t surf_resource_properties(const void *resource);
+static XBT_INLINE xbt_dict_t surf_resource_properties(const void *resource);
 
 XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
 XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);