X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9696c1a327d9f7439c42d72097c9eec20afb3c4a..1d6f35064b982906e6931d6e2cfbf22ab51a10b3:/src/surf/surfxml.l

diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index f534db341f..b4cb523e4c 100644
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,12 +1,21 @@
 /* Validating XML processor for surfxml.dtd.
- * Generated 2005/01/04 14:37:23.
+ * Generated 2005/08/16 14:42:02.
  *
- * This program was generated with the FleXML XML processor generator,
- * (Id: flexml.pl,v 1.29 2005/01/04 09:30:15 alegrand Exp).
- * Copyright © 1999 Kristoffer Rose.  All rights reserved.
+ * This program was generated with the FleXML XML processor generator.
+ * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
+ * (Id: flexml.pl,v 1.44 2005/02/23 23:08:16 mquinson Exp).
+ * 
+ * There are two, intertwined parts to this program, part A and part B.
  *
- * You can redistribute and/or modify this program provided the following
- * two conditions hold:
+ * Part A
+ * ------
+ * 
+ * Some parts, here collectively called "Part A", are found in the 
+ * FleXML package.  They are Copyright © 1999-2005 Kristoffer Rose. 
+ * All rights reserved.
+ *
+ * You can redistribute, use, perform, display and/or modify "Part A"
+ * provided the following two conditions hold:
  *
  * 1. The program is distributed WITHOUT ANY WARRANTY from the author of
  *    FleXML; without even the implied warranty of MERCHANTABILITY or
@@ -19,15 +28,29 @@
  * Notice that these are explicit rights granted to you for files
  * generated by the FleXML system.  For your rights in connection with
  * the FleXML system itself please consult the GNU General Public License.
+ * 
+ * Part B
+ * ------
+ * 
+ * The other parts, here collectively called "Part B", and which came 
+ * from the DTD used by FleXML to generate this program, can be 
+ * distributed (or not, as the case may be) under the terms of whoever
+ * wrote them, provided these terms respect and obey the two conditions 
+ * above under the heading "Part A".
+ *
+ * The author of and contributors to FleXML specifically disclaim
+ * any copyright interest in "Part B", unless "Part B" was written 
+ * by the author of or contributors to FleXML.
+ * 
  */
 
 %{
 
 /* Version strings. */
 const char rcs_flexml_skeleton[] =
- "$" "Id: skel,v 1.16 1999/12/09 04:01:51 krisrose Exp $";
+ "$" "Id: skel,v 1.26 2005/02/23 22:22:20 wdowling Exp $";
 const char rcs_flexml[] =
- "$" "Id: flexml.pl,v 1.29 2005/01/04 09:30:15 alegrand Exp $";
+ "$" "Id: flexml.pl,v 1.44 2005/02/23 23:08:16 mquinson Exp $";
 
 /* ANSI headers. */
 #include <unistd.h>
@@ -38,31 +61,42 @@ const char rcs_flexml[] =
 #include <ctype.h>
 
 /* Generated definitions. */
-#define FLEXML_BUFFERSTACKSIZE 10000000
+#define FLEXML_yylineno
+#define FLEXML_BUFFERSTACKSIZE 1000000
 
 /* XML processor api. */
-#include "surf/surfxml.h"
-
 /* FleXML-provided data. */
 const char* pcdata;
 AT_network_link_bandwidth A_network_link_bandwidth;
 AT_cpu_name A_cpu_name;
+AT_process_kill_time A_process_kill_time;
 AT_network_link_state A_network_link_state;
 AT_argument_value A_argument_value;
 AT_cpu_availability_file A_cpu_availability_file;
 AT_process_host A_process_host;
+AT_route_impact_on_src A_route_impact_on_src;
 AT_route_src A_route_src;
 AT_network_link_latency_file A_network_link_latency_file;
+AT_cpu_max_outgoing_rate A_cpu_max_outgoing_rate;
+AT_route_impact_on_dst_with_other_send A_route_impact_on_dst_with_other_send;
+AT_cpu_interference_send_recv A_cpu_interference_send_recv;
 AT_cpu_availability A_cpu_availability;
+AT_route_impact_on_dst A_route_impact_on_dst;
+AT_cpu_interference_recv A_cpu_interference_recv;
+AT_route_impact_on_src_with_other_recv A_route_impact_on_src_with_other_recv;
 AT_network_link_name A_network_link_name;
 AT_route_element_name A_route_element_name;
 AT_cpu_power A_cpu_power;
+AT_process_start_time A_process_start_time;
+AT_include_file A_include_file;
 AT_process_function A_process_function;
-AT_cpu_state A_cpu_state;
+AT_network_link_sharing_policy A_network_link_sharing_policy;
 AT_route_dst A_route_dst;
+AT_cpu_state A_cpu_state;
 AT_network_link_latency A_network_link_latency;
-AT_cpu_state_file A_cpu_state_file;
 AT_network_link_state_file A_network_link_state_file;
+AT_cpu_interference_send A_cpu_interference_send;
+AT_cpu_state_file A_cpu_state_file;
 AT_network_link_bandwidth_file A_network_link_bandwidth_file;
 
 /* XML state. */
@@ -81,16 +115,21 @@ AT_network_link_bandwidth_file A_network_link_bandwidth_file;
 
 /* Generic actions. */
 #define SKIP	/*skip*/
-#define SUCCEED	return 0
+#define SUCCEED        CLEANUP; return 0
 
 #define FAIL	return fail
 static int fail(const char*, ...);
+const char * parse_err_msg(void);
+
+/* Cleanup */
+static void cleanup(void);
+#define CLEANUP  cleanup()
 
 /* Text buffer stack handling. */
 char bufferstack[FLEXML_BUFFERSTACKSIZE];
 char* limit = bufferstack + FLEXML_BUFFERSTACKSIZE;
 typedef struct BufferLast_s {
-  struct BufferLast_s *old; char* saved; char new[1];
+  struct BufferLast_s *old; char* saved; char new1[1];
 } BufferLast;
 BufferLast* last = (BufferLast*)0;
 char* next = bufferstack;
@@ -100,14 +139,14 @@ char* next = bufferstack;
 #define BUFFERDONE    (BUFFERPUTC('\0'))
 
 #define BUFFERLITERAL(C,P) bufferliteral(C,&(P),yytext)
-static void bufferliteral(char c, char** pp, char* text)
+static void bufferliteral(char c, const char** pp, char* text)
 {
   char *s = strchr(text,c), *e = strrchr(text,c);
   assert(s <= e); BUFFERSET(*pp);
   while (++s<e) {
     if (isspace(*s)) { BUFFERPUTC(' '); while (isspace(*s)) ++s; }
     else BUFFERPUTC(*s);
-  } 
+  }
   BUFFERDONE;
 }
 
@@ -118,7 +157,7 @@ static void pushbuffer(char* p)
   assert(next < limit);
   l->old = last;
   l->saved = p;
-  next = l->new;
+  next = l->new1;
   last = l;
 }
 
@@ -147,6 +186,7 @@ static char* popbuffer(void)
 %option noyywrap
 
 /* Flex user-requested options. */
+%option yylineno
 %option nounput
 
 /* XML character classes (currently restricted to ASCII). */
@@ -184,6 +224,7 @@ Literal		\'[^'']*\'|\"[^""]*\"
  */
 %x PROLOG DOCTYPE EPILOG INCOMMENT INPI VALUE1 VALUE2 CDATA
 %x ROOT_platform_description AL_platform_description S_platform_description S_platform_description_1 S_platform_description_2 E_platform_description
+%x ROOT_include AL_include S_include S_include_1 S_include_2 E_include
 %x ROOT_cpu AL_cpu E_cpu
 %x ROOT_network_link AL_network_link E_network_link
 %x ROOT_route AL_route S_route S_route_1 S_route_2 E_route
@@ -202,7 +243,8 @@ const char* *statenames=NULL;
  /* Bypass Flex's default INITIAL state and begin by parsing the XML prolog. */
  SET(PROLOG);
   /* FleXML_init */
-  if(!statenames) statenames=calloc(IMPOSSIBLE,sizeof(char*));
+  next = bufferstack;
+  if(!statenames) {statenames= (const char **)calloc(IMPOSSIBLE,sizeof(char*));
   statenames[PROLOG] = NULL;
   statenames[DOCTYPE] = NULL;
   statenames[EPILOG] = NULL;
@@ -217,6 +259,12 @@ const char* *statenames=NULL;
   statenames[S_platform_description_1] = "platform_description";
   statenames[S_platform_description_2] = "platform_description";
   statenames[E_platform_description] = "platform_description";
+  statenames[ROOT_include] = NULL;
+  statenames[AL_include] = NULL;
+  statenames[S_include] = "include";
+  statenames[S_include_1] = "include";
+  statenames[S_include_2] = "include";
+  statenames[E_include] = "include";
   statenames[ROOT_cpu] = NULL;
   statenames[AL_cpu] = NULL;
   statenames[E_cpu] = "cpu";
@@ -241,10 +289,11 @@ const char* *statenames=NULL;
   statenames[ROOT_argument] = NULL;
   statenames[AL_argument] = NULL;
   statenames[E_argument] = "argument";
+  }
 
  /* COMMENTS and PIs: handled uniformly for efficiency. */
 
-<ROOT_platform_description,AL_platform_description,S_platform_description,S_platform_description_1,S_platform_description_2,E_platform_description,ROOT_cpu,AL_cpu,E_cpu,ROOT_network_link,AL_network_link,E_network_link,ROOT_route,AL_route,S_route,S_route_1,S_route_2,E_route,ROOT_route_element,AL_route_element,E_route_element,ROOT_process,AL_process,S_process,S_process_1,S_process_2,E_process,ROOT_argument,AL_argument,E_argument,PROLOG,DOCTYPE,EPILOG>{
+<ROOT_platform_description,AL_platform_description,S_platform_description,S_platform_description_1,S_platform_description_2,E_platform_description,ROOT_include,AL_include,S_include,S_include_1,S_include_2,E_include,ROOT_cpu,AL_cpu,E_cpu,ROOT_network_link,AL_network_link,E_network_link,ROOT_route,AL_route,S_route,S_route_1,S_route_2,E_route,ROOT_route_element,AL_route_element,E_route_element,ROOT_process,AL_process,S_process,S_process_1,S_process_2,E_process,ROOT_argument,AL_argument,E_argument,PROLOG,DOCTYPE,EPILOG>{
  "<!--" ENTER(INCOMMENT);
  "<?" ENTER(INPI);
 }
@@ -253,37 +302,38 @@ const char* *statenames=NULL;
  "--"		|
  .		|
  \n		SKIP;
- <<EOF>>	fail("EOF in comment.");
+ <<EOF>>	FAIL("EOF in comment.");
 }
 <INPI>{
  "?>"		LEAVE;
  .		|
  \n		SKIP;
- <<EOF>>	fail("EOF in PI (processing instruction).");
+ <<EOF>>	FAIL("EOF in PI (processing instruction).");
 }
 
  /* SPACES: skipped uniformly */
 
-<ROOT_platform_description,AL_platform_description,S_platform_description,S_platform_description_1,S_platform_description_2,E_platform_description,ROOT_cpu,AL_cpu,E_cpu,ROOT_network_link,AL_network_link,E_network_link,ROOT_route,AL_route,S_route,S_route_1,S_route_2,E_route,ROOT_route_element,AL_route_element,E_route_element,ROOT_process,AL_process,S_process,S_process_1,S_process_2,E_process,ROOT_argument,AL_argument,E_argument,PROLOG,DOCTYPE,EPILOG>{S} SKIP;
+<ROOT_platform_description,AL_platform_description,S_platform_description,S_platform_description_1,S_platform_description_2,E_platform_description,ROOT_include,AL_include,S_include,S_include_1,S_include_2,E_include,ROOT_cpu,AL_cpu,E_cpu,ROOT_network_link,AL_network_link,E_network_link,ROOT_route,AL_route,S_route,S_route_1,S_route_2,E_route,ROOT_route_element,AL_route_element,E_route_element,ROOT_process,AL_process,S_process,S_process_1,S_process_2,E_process,ROOT_argument,AL_argument,E_argument,PROLOG,DOCTYPE,EPILOG>{S} SKIP;
 
  /* PROLOG: determine root element and process it. */
 
 <PROLOG>{
- "<?xml"({S}version{Eq}(\'{VersionNum}\'|\"{VersionNum}\"))?"?>" SET(DOCTYPE);
- "<?xml"[^>]*">" fail("Bad declaration %s.",yytext);
+ "<?xml"({S}version{Eq}(\'{VersionNum}\'|\"{VersionNum}\"))?({S}encoding{Eq}(\'[^']*\'|\"[^"]*\"))?"?>" SET(DOCTYPE); 
+ "<?xml"[^>]*">" FAIL("Bad declaration %s.",yytext);
 }
 
 <PROLOG,DOCTYPE>{
  "<!DOCTYPE"{S}"argument"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_argument);
  "<!DOCTYPE"{S}"route_element"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_route_element);
  "<!DOCTYPE"{S}"cpu"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_cpu);
+ "<!DOCTYPE"{S}"include"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_include);
  "<!DOCTYPE"{S}"route"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_route);
  "<!DOCTYPE"{S}"platform_description"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_platform_description);
  "<!DOCTYPE"{S}"network_link"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_network_link);
  "<!DOCTYPE"{S}"process"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_process);
- "<!"[^>-][^>]*">" fail("Bad declaration %s.",yytext);
- . 		fail("Unexpected character `%c' in prolog.", yytext[0]);
- <<EOF>> 	fail("EOF in prolog.");
+ "<!"[^>-][^>]*">" FAIL("Bad declaration %s.",yytext);
+ . 		FAIL("Unexpected character `%c' in prolog.", yytext[0]);
+ <<EOF>> 	FAIL("EOF in prolog.");
 }
 
  /* RULES DERIVED FROM DTD. */
@@ -304,9 +354,9 @@ const char* *statenames=NULL;
    case ROOT_platform_description: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of platform_description element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `platform_description' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `platform_description' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of platform_description element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `platform_description' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `platform_description' element.");
 }
 
 <E_platform_description,S_platform_description_2,S_platform_description>{
@@ -317,18 +367,64 @@ const char* *statenames=NULL;
    case ROOT_platform_description: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</platform_description>' expected.",yytext);
- .       fail("Unexpected character `%c': `</platform_description>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</platform_description>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</platform_description>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</platform_description>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</platform_description>' expected.");
+}
+
+<ROOT_include,S_platform_description_2,S_include,S_include_2,S_platform_description_1,S_include_1,S_platform_description>"<include"{s} {
+  A_include_file = NULL;
+  ENTER(AL_include);
+  }
+
+<AL_include>{
+ "file"{Eq}\' ENTER(VALUE1); BUFFERSET(A_include_file);
+ "file"{Eq}\" ENTER(VALUE2); BUFFERSET(A_include_file);
+
+ ">" {
+  if (!A_include_file) FAIL("Required attribute `file' not set for `include' element.");
+  LEAVE; STag_include();pcdata = NULL; ENTER(S_include);
+ }
+ "/>" {
+  if (!A_include_file) FAIL("Required attribute `file' not set for `include' element.");
+  LEAVE; STag_include(); pcdata = NULL; ETag_include();
+  switch (YY_START) {
+   case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
+   case ROOT_include: SET(EPILOG); break;
+  }
+ }
+ .       FAIL("Unexpected character `%c' in attribute list of include element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `include' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `include' element.");
+}
+
+<E_include,S_include,S_include_2>{
+ "</include"{s}">" {
+  LEAVE;
+  ETag_include();
+  switch (YY_START) {
+   case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
+   case ROOT_include: SET(EPILOG); break;
+  }
+ }
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</include>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</include>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</include>' expected.");
 }
 
-<ROOT_cpu,S_platform_description_2,S_platform_description_1,S_platform_description>"<cpu"{s} {
+<ROOT_cpu,S_platform_description_2,S_include,S_include_2,S_platform_description_1,S_include_1,S_platform_description>"<cpu"{s} {
   A_cpu_name = NULL;
   A_cpu_power = NULL;
   A_cpu_availability = "1.0";
   A_cpu_availability_file = NULL;
   A_cpu_state = A_cpu_state_ON;
   A_cpu_state_file = NULL;
+  A_cpu_interference_send = "1.0";
+  A_cpu_interference_recv = "1.0";
+  A_cpu_interference_send_recv = "1.0";
+  A_cpu_max_outgoing_rate = "-1.0";
   ENTER(AL_cpu);
   }
 
@@ -353,23 +449,36 @@ const char* *statenames=NULL;
  "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_state_file);
  "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_state_file);
 
+ "interference_send"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_interference_send);
+ "interference_send"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_interference_send);
+
+ "interference_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_interference_recv);
+ "interference_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_interference_recv);
+
+ "interference_send_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_interference_send_recv);
+ "interference_send_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_interference_send_recv);
+
+ "max_outgoing_rate"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_max_outgoing_rate);
+ "max_outgoing_rate"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_max_outgoing_rate);
+
  ">" {
-  if (!A_cpu_name) fail("Required attribute `name' not set for `cpu' element.");
-  if (!A_cpu_power) fail("Required attribute `power' not set for `cpu' element.");
+  if (!A_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
+  if (!A_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
   LEAVE; STag_cpu();pcdata = NULL; ENTER(E_cpu);
  }
  "/>" {
-  if (!A_cpu_name) fail("Required attribute `name' not set for `cpu' element.");
-  if (!A_cpu_power) fail("Required attribute `power' not set for `cpu' element.");
+  if (!A_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
+  if (!A_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
   LEAVE; STag_cpu(); pcdata = NULL; ETag_cpu();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_cpu: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of cpu element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `cpu' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `cpu' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of cpu element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `cpu' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `cpu' element.");
 }
 
 <E_cpu>{
@@ -378,22 +487,24 @@ const char* *statenames=NULL;
   ETag_cpu();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_cpu: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</cpu>' expected.",yytext);
- .       fail("Unexpected character `%c': `</cpu>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</cpu>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</cpu>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</cpu>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</cpu>' expected.");
 }
 
-<ROOT_network_link,S_platform_description_2,S_platform_description_1,S_platform_description>"<network_link"{s} {
+<ROOT_network_link,S_platform_description_2,S_include,S_include_2,S_platform_description_1,S_include_1,S_platform_description>"<network_link"{s} {
   A_network_link_name = NULL;
   A_network_link_bandwidth = NULL;
   A_network_link_bandwidth_file = NULL;
-  A_network_link_latency = "0.001";
+  A_network_link_latency = "0.0";
   A_network_link_latency_file = NULL;
   A_network_link_state = A_network_link_state_ON;
   A_network_link_state_file = NULL;
+  A_network_link_sharing_policy = A_network_link_sharing_policy_SHARED;
   ENTER(AL_network_link);
   }
 
@@ -421,23 +532,29 @@ const char* *statenames=NULL;
  "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(A_network_link_state_file);
  "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(A_network_link_state_file);
 
+ "sharing_policy"{Eq}"'SHARED'" |
+ "sharing_policy"{Eq}"\"SHARED\"" A_network_link_sharing_policy = A_network_link_sharing_policy_SHARED;
+ "sharing_policy"{Eq}"'FATPIPE'" |
+ "sharing_policy"{Eq}"\"FATPIPE\"" A_network_link_sharing_policy = A_network_link_sharing_policy_FATPIPE;
+
  ">" {
-  if (!A_network_link_name) fail("Required attribute `name' not set for `network_link' element.");
-  if (!A_network_link_bandwidth) fail("Required attribute `bandwidth' not set for `network_link' element.");
+  if (!A_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
+  if (!A_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
   LEAVE; STag_network_link();pcdata = NULL; ENTER(E_network_link);
  }
  "/>" {
-  if (!A_network_link_name) fail("Required attribute `name' not set for `network_link' element.");
-  if (!A_network_link_bandwidth) fail("Required attribute `bandwidth' not set for `network_link' element.");
+  if (!A_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
+  if (!A_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
   LEAVE; STag_network_link(); pcdata = NULL; ETag_network_link();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_network_link: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of network_link element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `network_link' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `network_link' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of network_link element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `network_link' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `network_link' element.");
 }
 
 <E_network_link>{
@@ -446,17 +563,22 @@ const char* *statenames=NULL;
   ETag_network_link();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_network_link: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</network_link>' expected.",yytext);
- .       fail("Unexpected character `%c': `</network_link>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</network_link>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</network_link>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</network_link>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</network_link>' expected.");
 }
 
-<ROOT_route,S_platform_description_2,S_platform_description_1,S_platform_description>"<route"{s} {
+<ROOT_route,S_platform_description_2,S_include,S_include_2,S_platform_description_1,S_include_1,S_platform_description>"<route"{s} {
   A_route_src = NULL;
   A_route_dst = NULL;
+  A_route_impact_on_src = "0.0";
+  A_route_impact_on_dst = "0.0";
+  A_route_impact_on_src_with_other_recv = "0.0";
+  A_route_impact_on_dst_with_other_send = "0.0";
   ENTER(AL_route);
   }
 
@@ -467,23 +589,36 @@ const char* *statenames=NULL;
  "dst"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_dst);
  "dst"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_dst);
 
+ "impact_on_src"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_impact_on_src);
+ "impact_on_src"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_impact_on_src);
+
+ "impact_on_dst"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_impact_on_dst);
+ "impact_on_dst"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_impact_on_dst);
+
+ "impact_on_src_with_other_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_impact_on_src_with_other_recv);
+ "impact_on_src_with_other_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_impact_on_src_with_other_recv);
+
+ "impact_on_dst_with_other_send"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_impact_on_dst_with_other_send);
+ "impact_on_dst_with_other_send"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_impact_on_dst_with_other_send);
+
  ">" {
-  if (!A_route_src) fail("Required attribute `src' not set for `route' element.");
-  if (!A_route_dst) fail("Required attribute `dst' not set for `route' element.");
+  if (!A_route_src) FAIL("Required attribute `src' not set for `route' element.");
+  if (!A_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
   LEAVE; STag_route();pcdata = NULL; ENTER(S_route);
  }
  "/>" {
-  if (!A_route_src) fail("Required attribute `src' not set for `route' element.");
-  if (!A_route_dst) fail("Required attribute `dst' not set for `route' element.");
+  if (!A_route_src) FAIL("Required attribute `src' not set for `route' element.");
+  if (!A_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
   LEAVE; STag_route(); pcdata = NULL; ETag_route();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_route: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of route element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `route' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `route' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of route element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `route' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `route' element.");
 }
 
 <S_route,S_route_2,E_route>{
@@ -492,12 +627,13 @@ const char* *statenames=NULL;
   ETag_route();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_route: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</route>' expected.",yytext);
- .       fail("Unexpected character `%c': `</route>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</route>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</route>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</route>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</route>' expected.");
 }
 
 <ROOT_route_element,S_route_1,S_route,S_route_2>"<route_element"{s} {
@@ -510,20 +646,20 @@ const char* *statenames=NULL;
  "name"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_element_name);
 
  ">" {
-  if (!A_route_element_name) fail("Required attribute `name' not set for `route_element' element.");
+  if (!A_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
   LEAVE; STag_route_element();pcdata = NULL; ENTER(E_route_element);
  }
  "/>" {
-  if (!A_route_element_name) fail("Required attribute `name' not set for `route_element' element.");
+  if (!A_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
   LEAVE; STag_route_element(); pcdata = NULL; ETag_route_element();
   switch (YY_START) {
    case S_route_1: case S_route: case S_route_2: SET(S_route_2); break;
    case ROOT_route_element: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of route_element element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `route_element' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `route_element' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of route_element element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `route_element' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `route_element' element.");
 }
 
 <E_route_element>{
@@ -535,14 +671,16 @@ const char* *statenames=NULL;
    case ROOT_route_element: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</route_element>' expected.",yytext);
- .       fail("Unexpected character `%c': `</route_element>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</route_element>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</route_element>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</route_element>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</route_element>' expected.");
 }
 
-<ROOT_process,S_platform_description_2,S_platform_description_1,S_platform_description>"<process"{s} {
+<ROOT_process,S_platform_description_2,S_include,S_include_2,S_platform_description_1,S_include_1,S_platform_description>"<process"{s} {
   A_process_host = NULL;
   A_process_function = NULL;
+  A_process_start_time = "-1.0";
+  A_process_kill_time = "-1.0";
   ENTER(AL_process);
   }
 
@@ -553,23 +691,30 @@ const char* *statenames=NULL;
  "function"{Eq}\' ENTER(VALUE1); BUFFERSET(A_process_function);
  "function"{Eq}\" ENTER(VALUE2); BUFFERSET(A_process_function);
 
+ "start_time"{Eq}\' ENTER(VALUE1); BUFFERSET(A_process_start_time);
+ "start_time"{Eq}\" ENTER(VALUE2); BUFFERSET(A_process_start_time);
+
+ "kill_time"{Eq}\' ENTER(VALUE1); BUFFERSET(A_process_kill_time);
+ "kill_time"{Eq}\" ENTER(VALUE2); BUFFERSET(A_process_kill_time);
+
  ">" {
-  if (!A_process_host) fail("Required attribute `host' not set for `process' element.");
-  if (!A_process_function) fail("Required attribute `function' not set for `process' element.");
+  if (!A_process_host) FAIL("Required attribute `host' not set for `process' element.");
+  if (!A_process_function) FAIL("Required attribute `function' not set for `process' element.");
   LEAVE; STag_process();pcdata = NULL; ENTER(S_process);
  }
  "/>" {
-  if (!A_process_host) fail("Required attribute `host' not set for `process' element.");
-  if (!A_process_function) fail("Required attribute `function' not set for `process' element.");
+  if (!A_process_host) FAIL("Required attribute `host' not set for `process' element.");
+  if (!A_process_function) FAIL("Required attribute `function' not set for `process' element.");
   LEAVE; STag_process(); pcdata = NULL; ETag_process();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_process: SET(EPILOG); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of process element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `process' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `process' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of process element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `process' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `process' element.");
 }
 
 <S_process,E_process,S_process_2>{
@@ -578,12 +723,13 @@ const char* *statenames=NULL;
   ETag_process();
   switch (YY_START) {
    case S_platform_description_2: case S_platform_description_1: case S_platform_description: SET(S_platform_description_2); break;
+   case S_include: case S_include_2: case S_include_1: SET(S_include_2); break;
    case ROOT_process: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</process>' expected.",yytext);
- .       fail("Unexpected character `%c': `</process>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</process>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</process>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</process>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</process>' expected.");
 }
 
 <ROOT_argument,S_process_1,S_process,S_process_2>"<argument"{s} {
@@ -596,20 +742,20 @@ const char* *statenames=NULL;
  "value"{Eq}\" ENTER(VALUE2); BUFFERSET(A_argument_value);
 
  ">" {
-  if (!A_argument_value) fail("Required attribute `value' not set for `argument' element.");
+  if (!A_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
   LEAVE; STag_argument();pcdata = NULL; ENTER(E_argument);
  }
  "/>" {
-  if (!A_argument_value) fail("Required attribute `value' not set for `argument' element.");
+  if (!A_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
   LEAVE; STag_argument(); pcdata = NULL; ETag_argument();
   switch (YY_START) {
    case ROOT_argument: SET(EPILOG); break;
    case S_process_1: case S_process: case S_process_2: SET(S_process_2); break;
   }
  }
- .       fail("Unexpected character `%c' in attribute list of argument element.", yytext[0]);
- {Name} fail("Bad attribute `%s' in `argument' element start tag.",yytext);
- <<EOF>> fail("EOF in attribute list of `argument' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of argument element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `argument' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `argument' element.");
 }
 
 <E_argument>{
@@ -621,15 +767,15 @@ const char* *statenames=NULL;
    case S_process_1: case S_process: case S_process_2: SET(S_process_2); break;
   }
  }
- "</"{Name}{s}">" fail("Unexpected end-tag `%s': `</argument>' expected.",yytext);
- .       fail("Unexpected character `%c': `</argument>' expected.",yytext[0]);
- <<EOF>> fail("Premature EOF: `</argument>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</argument>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</argument>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</argument>' expected.");
 }
 
  /* EPILOG: after the root element. */
 
 <EPILOG>{
- . 		fail("Unexpected character `%c' after document.", yytext[0]);
+ . {SET(PROLOG); yyless(0); CLEANUP; return -1;}
  <<EOF>> 	SUCCEED;
 }
 
@@ -657,35 +803,36 @@ const char* *statenames=NULL;
 
 <IMPOSSIBLE>{
  "<![CDATA["	ENTER(CDATA);
- "]""]>"		fail("Unexpected `]""]>' in character data.");
+ "]""]>"		FAIL("Unexpected `]""]>' in character data.");
 }
 
 <VALUE1>{
  \'		BUFFERDONE; LEAVE;
- <<EOF>>	fail("EOF in literal (\"'\" expected).");
+ <<EOF>>	FAIL("EOF in literal (\"'\" expected).");
 }
 
 <VALUE2>{
  \"		BUFFERDONE; LEAVE;
- <<EOF>>	fail("EOF in literal (`\"' expected).");
+ <<EOF>>	FAIL("EOF in literal (`\"' expected).");
 }
 
 <IMPOSSIBLE,VALUE1,VALUE2>{
  [^<&]		BUFFERPUTC(yytext[0]);
- [<&]		fail("Spurious `%c' in character data.",yytext[0]);
+ [<&]		FAIL("Spurious `%c' in character data.",yytext[0]);
 }
 
 <CDATA>{
  "]""]>"		LEAVE;
- "]""]"		BUFFERPUTC(yytext[0]); BUFFERPUTC(yytext[1]);
+ /* "]""]"		BUFFERPUTC(yytext[0]); BUFFERPUTC(yytext[1]); */
  .		BUFFERPUTC(yytext[0]);
- <<EOF>>	fail("EOF in CDATA section.");
+ <<EOF>>	FAIL("EOF in CDATA section.");
 }
 
  /* Impossible rules to avoid warnings from flex(1). */
-
-<INITIAL,IMPOSSIBLE>{
- .|[\n] fail("The Impossible Happened: INITIAL or IMPOSSIBLE state entered?");
+ /* Ideally, this should be replaced by code in flexml.pl that
+    generates just the states not covered by other rules. */
+<*>{
+ .|[\n] FAIL("Syntax error on character `%c'.", yytext[0]);
 }
 
 %%
@@ -725,17 +872,53 @@ static void debug_set(int state, const char* statename) {
 }
 #endif
 
+enum {flexml_max_err_msg_size = 512};
+
+static char flexml_err_msg[flexml_max_err_msg_size];
+const char * parse_err_msg()
+{
+    return flexml_err_msg;
+}
+
+static void reset_parse_err_msg()
+{
+    flexml_err_msg[0] = '\0';
+}
+
+
+static void cleanup(void)
+{
+    if (statenames) {
+        free(statenames);
+	statenames = NULL;
+    }
+}
+
 
 static int fail(const char* fmt, ...)
 {
-  va_list ap; va_start(ap, fmt);
+    int chars_left, used;
+    va_list ap; va_start(ap, fmt);
 #ifdef FLEXML_yylineno
-  fprintf(stderr, "Invalid XML (XML input line %d, state %d): ", yylineno, YY_START);
+    used = sprintf(flexml_err_msg,
+		   "Invalid XML (XML input line %d, state %d): ",
+		   yylineno, YY_START);
 #else
-  fprintf(stderr, "Invalid XML (state %d): ",YY_START);
+    used = sprintf(flexml_err_msg,
+		   "Invalid XML (state %d): ",
+		   YY_START);
 #endif
-  vfprintf(stderr, fmt, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-  return 1;
+    chars_left = flexml_max_err_msg_size - used - 1;
+    vsnprintf(flexml_err_msg + used, chars_left, fmt, ap);
+    va_end(ap);
+
+#ifndef FLEXML_quiet_parser
+    /* print directly to sdterr */
+    fprintf(stderr, "%s\n", flexml_err_msg);
+    flexml_err_msg[0] = '\0';
+#endif
+
+    cleanup();
+
+    return 1;
 }