I comment all the calls to used_routing, in order to use global routing.

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index cfa4f8a..7b9c3ea 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -53,8 +53,7 @@ e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot dec
 double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
 double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
 void surf_action_free(surf_action_t * action);
-void surf_action_state_set(surf_action_t action,
-                              e_surf_action_state_t state);
+void surf_action_state_set(surf_action_t action, e_surf_action_state_t state);
 void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */
 FILE *surf_fopen(const char *name, const char *mode);
 
@@ -66,6 +65,11 @@ void surf_config_finalize(void);
 void surf_config(const char *name, va_list pa);
 
 
+void net_action_recycle(surf_action_t action);
+double net_action_get_remains(surf_action_t action);
+int net_get_link_latency(surf_action_t action);
+void net_action_set_max_duration(surf_action_t action, double duration);
+
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
@@ -93,25 +97,95 @@ typedef struct {
 /*
  * Routing logic
  */
-struct s_routing {
+
+// FIXME: the next lines cant be comented without fix the code in network.c file.
+// struct s_routing {
+//   const char *name;
+//   xbt_dict_t host_id; /* char* -> int* */
+//   xbt_dynar_t (*get_route)(int src, int dst);
+//   xbt_dict_t (*get_onelink_routes)(void);
+//   int (*is_router)(int id);
+//   void (*finalize)(void);
+//   int host_count;
+//   int router_count;
+// };
+
+////////////////////////////////////////////////////////////////////////////////
+// HERE START THE NEW STRUCTURES
+////////////////////////////////////////////////////////////////////////////////
+
+typedef enum {
+  SURF_NETWORK_ELEMENT_NULL = 0,   /* NULL */
+  SURF_NETWORK_ELEMENT_HOST,       /* host type */
+  SURF_NETWORK_ELEMENT_ROUTER,     /* router type */
+  SURF_NETWORK_ELEMENT_GATEWAY,    /* gateway type of the AS */
+  SURF_NETWORK_ELEMENT_AS,         /* AS type */
+  SURF_NETWORK_ELEMENT_AS_GATEWAY, /* gateway type for internals AS */
+  SURF_NETWORK_ELEMENT_LINK        /* link type */
+} e_surf_network_element_type_t;
+
+typedef struct s_model_type s_model_type_t, *model_type_t;
+typedef struct s_network_element s_network_element_t, *network_element_t;
+typedef struct s_route s_route_t, *route_t;
+typedef struct s_route_limits s_route_limits_t, *route_limits_t;
+typedef struct s_route_extended s_route_extended_t, *route_extended_t;
+typedef struct s_routing_component s_routing_component_t, *routing_component_t;
+//typedef struct s_routing_global s_routing_global_t, *routing_global_t;
+
+struct s_model_type {
   const char *name;
-  xbt_dict_t host_id; /* char* -> int* */
-  xbt_dynar_t (*get_route)(int src, int dst);
-  xbt_dict_t (*get_onelink_routes)(void);
-  int (*is_router)(int id);
+  const char *desc;
+  void* (*create)();
+  void (*load)();
+  void (*unload)();
+  void (*end)();
+};
+
+struct s_network_element {
+  int id;
+  e_surf_network_element_type_t type;
+};
+
+struct s_route {
+  xbt_dynar_t link_list;
+};
+
+struct s_route_limits {
+  char* src_gateway;
+  char* dst_gateway;
+};
+
+struct s_route_extended {
+  s_route_t generic_route;
+  char* src_gateway;
+  char* dst_gateway;
+};
+
+struct s_routing_component {
+  model_type_t routing;
+  char *name;
+  struct s_routing_component* routing_father;
+  xbt_dict_t routing_sons;
+  route_extended_t (*get_route)(routing_component_t rc, const char* src, const char* dst);
+  xbt_dict_t (*get_network_elements)(routing_component_t rc, e_surf_network_element_type_t type);
+  void (*finalize)(routing_component_t rc);
+};
+
+struct s_routing_global {
+  routing_component_t root;
+  xbt_dict_t where_network_elements; /* char* -> s_routing_component* */
+  void *loopback;
+  size_t size_of_link;
+  xbt_dynar_t (*get_route)(const char* src, const char* dst);
   void (*finalize)(void);
-  int host_count;
-  int router_count;
+  xbt_dynar_t last_route;
 };
+
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
 
-/*
- * generic methods to create resources bypassing the parser
- * FIXME : better if added to the routing model instead
- */
-XBT_PUBLIC(void) routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action);
-XBT_PUBLIC(void) routing_add_host(char* host_id);
-XBT_PUBLIC(void) routing_set_routes(void);
+////////////////////////////////////////////////////////////////////////////////
+// HERE END THE NEW STRUCTURES
+////////////////////////////////////////////////////////////////////////////////
 
 /*
  * Resource protected methods