Extending the parser to handle bound on outgoing communications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@766 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/surfxml.h b/src/include/surf/surfxml.h
index 2990a4f..6cb0edf 100644 (file)
--- a/src/include/surf/surfxml.h
+++ b/src/include/surf/surfxml.h
@@ -1,5 +1,5 @@
 /* XML processor/application API for ../../src/surf/surfxml.dtd.
 /* XML processor/application API for ../../src/surf/surfxml.dtd.

- * Generated 2005/01/09 15:25:15.
+ * Generated 2005/01/24 16:35:22.

  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).
  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).


@@ -60,6 +60,8 @@ typedef const char* AT_route_src;
 #define AU_route_src NULL
 typedef const char* AT_network_link_latency_file;
 #define AU_network_link_latency_file NULL
 #define AU_route_src NULL
 typedef const char* AT_network_link_latency_file;
 #define AU_network_link_latency_file NULL

+typedef const char* AT_cpu_max_outgoing_rate;
+#define AU_cpu_max_outgoing_rate NULL

 typedef const char* AT_route_impact_on_dst_with_other_send;
 #define AU_route_impact_on_dst_with_other_send NULL
 typedef const char* AT_cpu_interference_send_recv;
 typedef const char* AT_route_impact_on_dst_with_other_send;
 #define AU_route_impact_on_dst_with_other_send NULL
 typedef const char* AT_cpu_interference_send_recv;


@@ -107,6 +109,7 @@ extern AT_process_host A_process_host;
 extern AT_route_impact_on_src A_route_impact_on_src;
 extern AT_route_src A_route_src;
 extern AT_network_link_latency_file A_network_link_latency_file;
 extern AT_route_impact_on_src A_route_impact_on_src;
 extern AT_route_src A_route_src;
 extern AT_network_link_latency_file A_network_link_latency_file;

+extern AT_cpu_max_outgoing_rate A_cpu_max_outgoing_rate;

 extern AT_route_impact_on_dst_with_other_send A_route_impact_on_dst_with_other_send;
 extern AT_cpu_interference_send_recv A_cpu_interference_send_recv;
 extern AT_cpu_availability A_cpu_availability;
 extern AT_route_impact_on_dst_with_other_send A_route_impact_on_dst_with_other_send;
 extern AT_cpu_interference_send_recv A_cpu_interference_send_recv;
 extern AT_cpu_availability A_cpu_availability;

diff --git a/src/surf/surfxml.dtd b/src/surf/surfxml.dtd
index 92452ba..98d5643 100644 (file)
--- a/src/surf/surfxml.dtd
+++ b/src/surf/surfxml.dtd
@@ -14,6 +14,7 @@
 <!ATTLIST cpu interference_send CDATA "1.0">
 <!ATTLIST cpu interference_recv CDATA "1.0">
 <!ATTLIST cpu interference_send_recv CDATA "1.0">
 <!ATTLIST cpu interference_send CDATA "1.0">
 <!ATTLIST cpu interference_recv CDATA "1.0">
 <!ATTLIST cpu interference_send_recv CDATA "1.0">

+<!ATTLIST cpu max_outgoing_rate CDATA "-1.0">

 
 <!ELEMENT network_link EMPTY>
 <!ATTLIST network_link name CDATA #REQUIRED>
 
 <!ELEMENT network_link EMPTY>
 <!ATTLIST network_link name CDATA #REQUIRED>

diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index c414b99..fd6d424 100644 (file)
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,5 +1,5 @@
 /* Validating XML processor for surfxml.dtd.
 /* Validating XML processor for surfxml.dtd.

- * Generated 2005/01/09 15:25:17.
+ * Generated 2005/01/24 16:35:24.

  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).
  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).


@@ -55,6 +55,7 @@ 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_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_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;


@@ -392,6 +393,7 @@ const char* *statenames=NULL;
   A_cpu_interference_send = "1.0";
   A_cpu_interference_recv = "1.0";
   A_cpu_interference_send_recv = "1.0";
   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);
   }
 
   ENTER(AL_cpu);
   }
 


@@ -425,6 +427,9 @@ const char* *statenames=NULL;
  "interference_send_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(A_cpu_interference_send_recv);
  "interference_send_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(A_cpu_interference_send_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.");