merge redundant surf_cpu_state_t and surf_link_state_t into surf_resource_state_t...

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index af323a9..8c70cd3 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -20,11 +20,6 @@ extern double sg_tcp_gamma;
 
 extern const char *surf_action_state_names[6];
 
-typedef enum {
-  SURF_LINK_ON = 1,             /* Ready        */
-  SURF_LINK_OFF = 0             /* Running      */
-} e_surf_link_state_t;
-
 typedef enum {
   SURF_LINK_SHARED = 1,
   SURF_LINK_FATPIPE = 0
@@ -54,19 +49,19 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       void (*solve) (lmm_system_t));
 
 /* Generic functions common to all models */
-e_surf_action_state_t surf_action_get_state(surf_action_t action);
+e_surf_action_state_t surf_action_state_get(surf_action_t action);
 double surf_action_get_start_time(surf_action_t action);
 double surf_action_get_finish_time(surf_action_t action);
 void surf_action_free(surf_action_t * action);
-void surf_action_change_state(surf_action_t action,
+void surf_action_state_set(surf_action_t action,
                               e_surf_action_state_t state);
-void surf_action_set_data(surf_action_t action, void *data);
+void surf_action_data_set(surf_action_t action, void *data);
 FILE *surf_fopen(const char *name, const char *mode);
 
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-void surf_config_init(int *argc,char **argv);
+void surf_config_init(int *argc, char **argv);
 void surf_config_finalize(void);
 void surf_config(const char *name, va_list pa);
 
@@ -85,4 +80,23 @@ const char *__surf_get_initial_path(void);
  */
 int __surf_is_absolute_file_path(const char *file_path);
 
+/*
+ * Routing logic
+ */
+struct s_routing {
+  const char *name;
+  xbt_dict_t host_id; /* char* -> int* */
+
+  xbt_dynar_t (*get_route)(int src, int dst);
+  void (*finalize)(void);
+  int host_count;
+};
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
+
+
+/*
+ * Resource protected methods
+ */
+XBT_PUBLIC(xbt_dict_t) surf_resource_properties(const void *resource);
+
 #endif /* _SURF_SURF_PRIVATE_H */