X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c259b6fb45cece5af1c16f45893a13a4087fd49..f4d1afaaa1e4fee55a98707443c05bdbc9abb42c:/src/surf/surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index c8d2f0cfba..54a02957b6 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -9,13 +9,14 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf ,"Logging specific to the SURF  module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf,
+				"Logging specific to the SURF  module");
 
 #undef CLEANUP
 #include "surfxml.c"
 
-static xbt_dynar_t surf_input_buffer_stack=NULL;
-static xbt_dynar_t surf_file_to_parse_stack=NULL;
+static xbt_dynar_t surf_input_buffer_stack = NULL;
+static xbt_dynar_t surf_file_to_parse_stack = NULL;
 
 void nil_function(void);
 void nil_function(void)
@@ -27,6 +28,8 @@ void_f_void_t *STag_surfxml_platform_description_fun = nil_function;
 void_f_void_t *ETag_surfxml_platform_description_fun = nil_function;
 void_f_void_t *STag_surfxml_cpu_fun = nil_function;
 void_f_void_t *ETag_surfxml_cpu_fun = nil_function;
+void_f_void_t *STag_surfxml_router_fun = nil_function;
+void_f_void_t *ETag_surfxml_router_fun = nil_function;
 void_f_void_t *STag_surfxml_network_link_fun = nil_function;
 void_f_void_t *ETag_surfxml_network_link_fun = nil_function;
 void_f_void_t *STag_surfxml_route_fun = nil_function;
@@ -47,6 +50,8 @@ void surf_parse_reset_parser(void)
   ETag_surfxml_platform_description_fun = nil_function;
   STag_surfxml_cpu_fun = nil_function;
   ETag_surfxml_cpu_fun = nil_function;
+  STag_surfxml_router_fun = nil_function;
+  ETag_surfxml_router_fun = nil_function;
   STag_surfxml_network_link_fun = nil_function;
   ETag_surfxml_network_link_fun = nil_function;
   STag_surfxml_route_fun = nil_function;
@@ -61,33 +66,35 @@ void surf_parse_reset_parser(void)
 
 void STag_surfxml_include(void)
 {
-  xbt_dynar_push(surf_input_buffer_stack,&surf_input_buffer);
-  xbt_dynar_push(surf_file_to_parse_stack,&surf_file_to_parse);
-  
-  surf_file_to_parse = surf_fopen(A_surfxml_include_file,"r");
+  xbt_dynar_push(surf_input_buffer_stack, &surf_input_buffer);
+  xbt_dynar_push(surf_file_to_parse_stack, &surf_file_to_parse);
+
+  surf_file_to_parse = surf_fopen(A_surfxml_include_file, "r");
   xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n",
 	      A_surfxml_include_file);
-  surf_input_buffer = surf_parse__create_buffer( surf_file_to_parse, 10);
+  surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, 10);
   surf_parse__switch_to_buffer(surf_input_buffer);
-  printf("STAG\n"); fflush(NULL);
+  printf("STAG\n");
+  fflush(NULL);
 }
 
 void ETag_surfxml_include(void)
 {
-  printf("ETAG\n"); fflush(NULL);
+  printf("ETAG\n");
+  fflush(NULL);
   surf_parse__delete_buffer(surf_input_buffer);
   fclose(surf_file_to_parse);
-  xbt_dynar_pop(surf_file_to_parse_stack,&surf_file_to_parse);
-  xbt_dynar_pop(surf_input_buffer_stack,&surf_input_buffer);
+  xbt_dynar_pop(surf_file_to_parse_stack, &surf_file_to_parse);
+  xbt_dynar_pop(surf_input_buffer_stack, &surf_input_buffer);
 }
 
 void STag_surfxml_platform_description(void)
 {
-  double version=0.0;
+  double version = 0.0;
 
-  sscanf(A_surfxml_platform_description_version,"%lg",&version);
+  sscanf(A_surfxml_platform_description_version, "%lg", &version);
 
-  xbt_assert0((version>=1.0),"******* BIG FAT WARNING *********\n "
+  xbt_assert0((version >= 1.0), "******* BIG FAT WARNING *********\n "
 	      "You're using an old XML file. "
 	      "Since SimGrid 3.1, units are Bytes, Flops, and seconds "
 	      "instead of MBytes, MFlops and seconds. "
@@ -117,6 +124,16 @@ void ETag_surfxml_cpu(void)
   ETag_surfxml_cpu_fun();
 }
 
+void STag_surfxml_router(void)
+{
+  STag_surfxml_router_fun();
+}
+
+void ETag_surfxml_router(void)
+{
+  ETag_surfxml_router_fun();
+}
+
 void STag_surfxml_network_link(void)
 {
   STag_surfxml_network_link_fun();
@@ -167,34 +184,37 @@ void ETag_surfxml_argument(void)
   ETag_surfxml_argument_fun();
 }
 
-void  surf_parse_open(const char *file) {
-  static int warned = 0; /* warn only once */
-  if(!file) {
+void surf_parse_open(const char *file)
+{
+  static int warned = 0;	/* warn only once */
+  if (!file) {
     if (!warned) {
-      WARN0("Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.");
+      WARN0
+	  ("Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.");
       warned = 1;
     }
     return;
   }
-  if(!surf_input_buffer_stack) 
-    surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE),NULL);
-  if(!surf_file_to_parse_stack) 
-    surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE*),NULL);
-
-  surf_file_to_parse = surf_fopen(file,"r");
-  xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n",file);
-  surf_input_buffer = surf_parse__create_buffer( surf_file_to_parse, 10);
+  if (!surf_input_buffer_stack)
+    surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL);
+  if (!surf_file_to_parse_stack)
+    surf_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
+
+  surf_file_to_parse = surf_fopen(file, "r");
+  xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n", file);
+  surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, 10);
   surf_parse__switch_to_buffer(surf_input_buffer);
   surf_parse_lineno = 1;
 }
 
-void  surf_parse_close(void) {
-  if(surf_input_buffer_stack) 
+void surf_parse_close(void)
+{
+  if (surf_input_buffer_stack)
     xbt_dynar_free(&surf_input_buffer_stack);
-  if(surf_file_to_parse_stack) 
+  if (surf_file_to_parse_stack)
     xbt_dynar_free(&surf_file_to_parse_stack);
 
-  if(surf_file_to_parse) {
+  if (surf_file_to_parse) {
     surf_parse__delete_buffer(surf_input_buffer);
     fclose(surf_file_to_parse);
   }
@@ -208,20 +228,19 @@ static int _surf_parse(void)
 
 int_f_void_t *surf_parse = _surf_parse;
 
-void surf_parse_get_double(double *value,const char *string)
-{ 
+void surf_parse_get_double(double *value, const char *string)
+{
   int ret = 0;
 
   ret = sscanf(string, "%lg", value);
-  xbt_assert2((ret==1), "Parse error line %d : %s not a number", surf_parse_lineno,
-	      string);
+  xbt_assert2((ret == 1), "Parse error line %d : %s not a number",
+	      surf_parse_lineno, string);
 }
 
-void surf_parse_get_trace(tmgr_trace_t *trace, const char *string)
+void surf_parse_get_trace(tmgr_trace_t * trace, const char *string)
 {
   if ((!string) || (strcmp(string, "") == 0))
     *trace = NULL;
   else
     *trace = tmgr_trace_new(string);
 }
-