#include "xbt/module.h"
#include "mc/mc.h"
#include "surf/surf_resource.h"
-//#include "surf/surf_resource_lmm.h"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
const char *desc;
routing_component_t (*create) ();
void (*end) ();
-} s_model_type_t, *model_type_t;
+} s_routing_model_description_t, *routing_model_description_t;
typedef struct s_route {
xbt_dynar_t link_list;
typedef struct s_routing_component {
xbt_dict_t to_index; /* char* -> network_element_t */
xbt_dict_t bypassRoutes; /* store bypass routes */
- model_type_t routing;
+ routing_model_description_t routing;
e_surf_routing_hierarchy_t hierarchy;
char *name;
struct s_routing_component *routing_father;
/* Global vars */
routing_global_t global_routing = NULL;
routing_component_t current_routing = NULL;
-model_type_t current_routing_model = NULL;
+routing_model_description_t current_routing_model = NULL;
/* global parse functions */
xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
{
routing_component_t new_routing;
- model_type_t model = NULL;
+ routing_model_description_t model = NULL;
int cpt;
/* search the routing model */
/* Global vars */
extern routing_global_t global_routing;
extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
/* Global vars */
extern routing_global_t global_routing;
extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
/* Global vars */
extern routing_global_t global_routing;
extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
/* Global vars */
extern routing_global_t global_routing;
extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
/* Global vars */
extern routing_global_t global_routing;
extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
extern xbt_dynar_t link_list;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of surf");