Keep extending the DTD to handle an computation/communication interference model

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

diff --git a/src/include/surf/surfxml.h b/src/include/surf/surfxml.h
index ace18bb..35fbc21 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.
- * Generated 2005/01/05 17:50:46.
+ * Generated 2005/01/07 10:51: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).
@@ -43,8 +43,6 @@ extern void STag_argument(void);
 extern void ETag_argument(void);
 
 /* XML application data. */
-typedef const char* AT_route_impact_on_computation;
-#define AU_route_impact_on_computation NULL
 typedef const char* AT_network_link_bandwidth;
 #define AU_network_link_bandwidth NULL
 typedef const char* AT_cpu_name;
@@ -56,12 +54,24 @@ typedef const char* AT_cpu_availability_file;
 #define AU_cpu_availability_file NULL
 typedef const char* AT_process_host;
 #define AU_process_host NULL
+typedef const char* AT_route_impact_on_src;
+#define AU_route_impact_on_src NULL
 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
+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;
+#define AU_cpu_interference_send_recv NULL
 typedef const char* AT_cpu_availability;
 #define AU_cpu_availability NULL
+typedef const char* AT_route_impact_on_dst;
+#define AU_route_impact_on_dst NULL
+typedef const char* AT_cpu_interference_recv;
+#define AU_cpu_interference_recv NULL
+typedef const char* AT_route_impact_on_src_with_other_recv;
+#define AU_route_impact_on_src_with_other_recv NULL
 typedef const char* AT_network_link_name;
 #define AU_network_link_name NULL
 typedef const char* AT_route_element_name;
@@ -72,40 +82,48 @@ typedef const char* AT_include_file;
 #define AU_include_file NULL
 typedef const char* AT_process_function;
 #define AU_process_function NULL
-typedef enum { AU_cpu_state, A_cpu_state_ON,A_cpu_state_OFF } AT_cpu_state;
 typedef const char* AT_route_dst;
 #define AU_route_dst NULL
+typedef enum { AU_cpu_state, A_cpu_state_ON,A_cpu_state_OFF } AT_cpu_state;
 typedef const char* AT_network_link_latency;
 #define AU_network_link_latency NULL
-typedef const char* AT_cpu_state_file;
-#define AU_cpu_state_file NULL
 typedef const char* AT_network_link_state_file;
 #define AU_network_link_state_file NULL
+typedef const char* AT_cpu_interference_send;
+#define AU_cpu_interference_send NULL
+typedef const char* AT_cpu_state_file;
+#define AU_cpu_state_file NULL
 typedef const char* AT_network_link_bandwidth_file;
 #define AU_network_link_bandwidth_file NULL
 
 /* FleXML-provided data. */
 extern const char* pcdata;
-extern AT_route_impact_on_computation A_route_impact_on_computation;
 extern AT_network_link_bandwidth A_network_link_bandwidth;
 extern AT_cpu_name A_cpu_name;
 extern AT_network_link_state A_network_link_state;
 extern AT_argument_value A_argument_value;
 extern AT_cpu_availability_file A_cpu_availability_file;
 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_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 A_route_impact_on_dst;
+extern AT_cpu_interference_recv A_cpu_interference_recv;
+extern AT_route_impact_on_src_with_other_recv A_route_impact_on_src_with_other_recv;
 extern AT_network_link_name A_network_link_name;
 extern AT_route_element_name A_route_element_name;
 extern AT_cpu_power A_cpu_power;
 extern AT_include_file A_include_file;
 extern AT_process_function A_process_function;
-extern AT_cpu_state A_cpu_state;
 extern AT_route_dst A_route_dst;
+extern AT_cpu_state A_cpu_state;
 extern AT_network_link_latency A_network_link_latency;
-extern AT_cpu_state_file A_cpu_state_file;
 extern AT_network_link_state_file A_network_link_state_file;
+extern AT_cpu_interference_send A_cpu_interference_send;
+extern AT_cpu_state_file A_cpu_state_file;
 extern AT_network_link_bandwidth_file A_network_link_bandwidth_file;
 
 /* XML application utilities. */

diff --git a/src/surf/surfxml.dtd b/src/surf/surfxml.dtd
index 27c5247..2d05d4f 100644 (file)
--- a/src/surf/surfxml.dtd
+++ b/src/surf/surfxml.dtd
@@ -11,12 +11,15 @@
 <!ATTLIST cpu availability_file CDATA "">
 <!ATTLIST cpu state (ON|OFF) "ON">
 <!ATTLIST cpu state_file CDATA "">
+<!ATTLIST cpu interference_send CDATA "1.0">
+<!ATTLIST cpu interference_recv CDATA "1.0">
+<!ATTLIST cpu interference_send_recv CDATA "1.0">
 
 <!ELEMENT network_link EMPTY>
 <!ATTLIST network_link name CDATA #REQUIRED>
 <!ATTLIST network_link bandwidth CDATA  #REQUIRED>
 <!ATTLIST network_link bandwidth_file CDATA "">
-<!ATTLIST network_link latency CDATA "0.001">
+<!ATTLIST network_link latency CDATA "0.0">
 <!ATTLIST network_link latency_file CDATA "">
 <!ATTLIST network_link state (ON|OFF) "ON">
 <!ATTLIST network_link state_file CDATA "">
@@ -24,7 +27,10 @@
 <!ELEMENT route (route_element*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
-<!ATTLIST route impact_on_computation CDATA>
+<!ATTLIST route impact_on_src CDATA>
+<!ATTLIST route impact_on_dst CDATA>
+<!ATTLIST route impact_on_src_with_other_recv CDATA>
+<!ATTLIST route impact_on_dst_with_other_send CDATA>
 
 <!ELEMENT route_element EMPTY>
 <!ATTLIST route_element name CDATA #REQUIRED>

diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index 520eb0b..6764f49 100644 (file)
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,5 +1,5 @@
 /* Validating XML processor for surfxml.dtd.
- * Generated 2005/01/05 17:50:49.
+ * Generated 2005/01/07 10:51:23.
  *
  * This program was generated with the FleXML XML processor generator,
  * (Id: flexml.pl,v 1.35 2005/01/05 06:29:58 legranda Exp).
@@ -46,26 +46,32 @@ const char rcs_flexml[] =
 
 /* FleXML-provided data. */
 const char* pcdata;
-AT_route_impact_on_computation A_route_impact_on_computation;
 AT_network_link_bandwidth A_network_link_bandwidth;
 AT_cpu_name A_cpu_name;
 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_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_include_file A_include_file;
 AT_process_function A_process_function;
-AT_cpu_state A_cpu_state;
 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. */
@@ -383,6 +389,9 @@ const char* *statenames=NULL;
   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";
   ENTER(AL_cpu);
   }
 
@@ -407,6 +416,15 @@ 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);
+
  ">" {
   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.");
@@ -446,7 +464,7 @@ const char* *statenames=NULL;
   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;
@@ -515,7 +533,10 @@ const char* *statenames=NULL;
 <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_computation = NULL;
+  A_route_impact_on_src = NULL;
+  A_route_impact_on_dst = NULL;
+  A_route_impact_on_src_with_other_recv = NULL;
+  A_route_impact_on_dst_with_other_send = NULL;
   ENTER(AL_route);
   }
 
@@ -526,8 +547,17 @@ const char* *statenames=NULL;
  "dst"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_dst);
  "dst"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_dst);
 
- "impact_on_computation"{Eq}\' ENTER(VALUE1); BUFFERSET(A_route_impact_on_computation);
- "impact_on_computation"{Eq}\" ENTER(VALUE2); BUFFERSET(A_route_impact_on_computation);
+ "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.");