You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by ja...@apache.org on 2003/07/13 00:34:25 UTC

cvs commit: httpd-test/flood/examples flood.dtd round-robin-dynamic.xml round-robin-example.xml round-robin-keepalive.xml round-robin-relative-reports.xml round-robin-ssl.xml round-robin-timed.xml round-robin.xml

jacekp      2003/07/12 15:34:25

  Modified:    flood/examples round-robin-dynamic.xml
                        round-robin-example.xml round-robin-keepalive.xml
                        round-robin-relative-reports.xml
                        round-robin-ssl.xml round-robin-timed.xml
                        round-robin.xml
  Added:       flood/examples flood.dtd
  Log:
  Here comes the DTD (along with some minor fixes)
  
  Revision  Changes    Path
  1.4       +2 -0      httpd-test/flood/examples/round-robin-dynamic.xml
  
  Index: round-robin-dynamic.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-dynamic.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- round-robin-dynamic.xml	10 Sep 2002 09:25:41 -0000	1.3
  +++ round-robin-dynamic.xml	12 Jul 2003 22:34:25 -0000	1.4
  @@ -1,3 +1,5 @@
  +<?xml version="1.0" standalone="no"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  -->
   <flood>
     <!-- A urllist describes which hosts and which methods we want to hit. -->
  
  
  
  1.8       +2 -0      httpd-test/flood/examples/round-robin-example.xml
  
  Index: round-robin-example.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-example.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- round-robin-example.xml	3 Aug 2001 00:08:25 -0000	1.7
  +++ round-robin-example.xml	12 Jul 2003 22:34:25 -0000	1.8
  @@ -1,3 +1,5 @@
  +<?xml version="1.0" standalone="no"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  -->
   <flood>
     <!-- A urllist describes which hosts and which methods we want to hit. -->
  
  
  
  1.5       +2 -0      httpd-test/flood/examples/round-robin-keepalive.xml
  
  Index: round-robin-keepalive.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-keepalive.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- round-robin-keepalive.xml	3 Aug 2001 00:08:25 -0000	1.4
  +++ round-robin-keepalive.xml	12 Jul 2003 22:34:25 -0000	1.5
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  
        This is a keepalive-enabled profile.  -->
   <flood>
  
  
  
  1.2       +4 -2      httpd-test/flood/examples/round-robin-relative-reports.xml
  
  Index: round-robin-relative-reports.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-relative-reports.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- round-robin-relative-reports.xml	4 Aug 2001 01:23:45 -0000	1.1
  +++ round-robin-relative-reports.xml	12 Jul 2003 22:34:25 -0000	1.2
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  -->
   <flood>
     <!-- A urllist describes which hosts and which methods we want to hit. -->
  @@ -22,10 +24,10 @@
       <profiletype>round_robin</profiletype>
       <!-- Specifies that we will use generic socket logic -->
       <socket>generic</socket>
  -    <!-- Specifies that we will use the "easy" report generation -->
  -    <report>relative_times</report>
       <!-- Specifies that we will use verify_200 for response verification -->
       <verify_resp>verify_200</verify_resp>
  +    <!-- Specifies that we will use the "easy" report generation -->
  +    <report>relative_times</report>
   
     </profile>
   
  
  
  
  1.7       +2 -0      httpd-test/flood/examples/round-robin-ssl.xml
  
  Index: round-robin-ssl.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-ssl.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- round-robin-ssl.xml	31 May 2002 16:08:39 -0000	1.6
  +++ round-robin-ssl.xml	12 Jul 2003 22:34:25 -0000	1.7
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <flood>
     <urllist>
       <name>Test Hosts</name>
  
  
  
  1.2       +4 -2      httpd-test/flood/examples/round-robin-timed.xml
  
  Index: round-robin-timed.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin-timed.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- round-robin-timed.xml	3 Aug 2001 00:25:26 -0000	1.1
  +++ round-robin-timed.xml	12 Jul 2003 22:34:25 -0000	1.2
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  -->
   <flood>
     <!-- A urllist describes which hosts and which methods we want to hit. -->
  @@ -22,10 +24,10 @@
       <profiletype>round_robin</profiletype>
       <!-- Specifies that we will use generic socket logic -->
       <socket>generic</socket>
  -    <!-- Specifies that we will use the "easy" report generation -->
  -    <report>easy</report>
       <!-- Specifies that we will use verify_200 for response verification -->
       <verify_resp>verify_200</verify_resp>
  +    <!-- Specifies that we will use the "easy" report generation -->
  +    <report>easy</report>
   
     </profile>
   
  
  
  
  1.6       +6 -4      httpd-test/flood/examples/round-robin.xml
  
  Index: round-robin.xml
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/examples/round-robin.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- round-robin.xml	28 Aug 2001 00:08:25 -0000	1.5
  +++ round-robin.xml	12 Jul 2003 22:34:25 -0000	1.6
  @@ -1,3 +1,5 @@
  +<?xml version="1.0"?>
  +<!DOCTYPE flood SYSTEM "flood.dtd">
   <!-- Hi, I'm a flood config file.  They call me "round-robin.xml"
        I am an example of a "round-robin" configuration.  All of the URLs in
        the urllist "Test Hosts" will be hit in sequential order.  
  @@ -63,15 +65,15 @@
            We also have "keepalive" as an option - this option indicates that
            we should attempt to use HTTP Keepalive when available.  -->
       <socket>generic</socket>
  +    <!-- Specifies that we will use verify_200 for response verification 
  +         This verification step ensures that we received a 2xx or 3xx
  +         status code from the server.  -->
  +    <verify_resp>verify_200</verify_resp>
       <!-- Specifies that we will use the "relative_times" report generation 
            We also have "easy" - this option is similar to "relative_times",
            but the times posted are absolute instead of relative to the start
            of the request.  -->
       <report>relative_times</report>
  -    <!-- Specifies that we will use verify_200 for response verification 
  -         This verification step ensures that we received a 2xx or 3xx
  -         status code from the server.  -->
  -    <verify_resp>verify_200</verify_resp>
   
     </profile>
   
  
  
  
  1.1                  httpd-test/flood/examples/flood.dtd
  
  Index: flood.dtd
  ===================================================================
  <?xml version="1.0" ?>
  
  <!--
  
       This is a DTD for flood configuration files.
       With this file, validating XML software and
       heading line:
  
       <!DOCTYPE flood SYSTEM "flood.dtd">
  
       ...you can make sure your flood configuration
       is valid (in contrast to just "well-formed").
  
  -->
  
  <!ELEMENT flood (urllist+,profile+,farmer+,farm+,seed?)>
  
  <!-- urllist -->
  <!ELEMENT urllist (name,description?,baseurl?,(url|sequence)+)>
  
  <!ELEMENT name (#PCDATA)>
  <!ELEMENT description (#PCDATA)>
  <!ELEMENT baseurl (#PCDATA)>
  
  <!ELEMENT url (#PCDATA)>
  
  <!ATTLIST url method (GET | POST | HEAD) #IMPLIED>
  <!ATTLIST url payload CDATA #IMPLIED>
  <!ATTLIST url payloadparam CDATA #IMPLIED>
  <!ATTLIST url payloadparamcount CDATA #IMPLIED>
  <!ATTLIST url payloadtemplate CDATA #IMPLIED>
  <!ATTLIST url responsename CDATA #IMPLIED>
  <!ATTLIST url responsetemplate CDATA #IMPLIED>
  <!ATTLIST url requesttemplate CDATA #IMPLIED>
  <!ATTLIST url requestparamcount CDATA #IMPLIED>
  <!ATTLIST url predelay CDATA #IMPLIED>
  <!ATTLIST url predelayprecision CDATA #IMPLIED>
  <!ATTLIST url postdelay CDATA #IMPLIED>
  <!ATTLIST url postdelayprecision CDATA #IMPLIED>
  <!ATTLIST url user CDATA #IMPLIED>
  <!ATTLIST url password CDATA #IMPLIED>
  
  <!ELEMENT sequence (url+)>
  
  <!ATTLIST sequence sequencename CDATA #REQUIRED>
  <!ATTLIST sequence sequencelist CDATA #REQUIRED>
  
  <!-- profile -->
  
  <!ENTITY % profile.events "(profile_init?,get_next_url?,create_req?,postprocess?,loop_condition?,profile_destroy?)+">
  <!ENTITY % socket.events "(socket_init?,begin_conn?,send_req?,recv_resp?,end_conn?,request_destroy?,response_destroy?,socket_destroy?)+">
  <!ENTITY % report.events "(report_init?,process_stats?,report_stats?,destroy_report?)+">
  
  <!-- FIXME: this declaration doesn't exactly cover the flexibility of profile -->
  
  <!ELEMENT profile (name,(description)?,useurllist,
                     (profiletype|%profile.events;),
  		   (socket|%socket.events;),
  		   verify_resp,
  		   (report|%report.events;))>
  
  <!ELEMENT useurllist (#PCDATA)>
  <!ELEMENT profiletype (#PCDATA)>
  <!ELEMENT socket (#PCDATA)>
  <!ELEMENT verify_resp (#PCDATA)>
  <!ELEMENT report (#PCDATA)>
  
  <!ELEMENT profile_init (#PCDATA)>
  <!ELEMENT get_next_url (#PCDATA)>
  <!ELEMENT create_req (#PCDATA)>
  <!ELEMENT postprocess (#PCDATA)>
  <!ELEMENT loop_condition (#PCDATA)>
  <!ELEMENT profile_destroy (#PCDATA)>
  
  <!ELEMENT report_init (#PCDATA)>
  <!ELEMENT process_stats (#PCDATA)>
  <!ELEMENT report_stats (#PCDATA)>
  <!ELEMENT destroy_report (#PCDATA)>
  
  <!ELEMENT socket_init (#PCDATA)>
  <!ELEMENT begin_conn (#PCDATA)>
  <!ELEMENT send_req (#PCDATA)>
  <!ELEMENT recv_resp (#PCDATA)>
  <!ELEMENT end_conn (#PCDATA)>
  <!ELEMENT request_destroy (#PCDATA)>
  <!ELEMENT response_destroy (#PCDATA)>
  <!ELEMENT socket_destroy (#PCDATA)>
  
  <!-- farmer -->
  
  <!ELEMENT farmer (name,description?,(count|time),useprofile)>
  
  <!ELEMENT count (#PCDATA)>
  <!ELEMENT time (#PCDATA)>
  <!ELEMENT useprofile (#PCDATA)>
  
  <!-- farm -->
  
  <!ELEMENT farm (name,description?,usefarmer)>
  
  <!ELEMENT usefarmer (#PCDATA)>
  
  <!ATTLIST usefarmer count CDATA #IMPLIED>
  <!ATTLIST usefarmer startcount CDATA #IMPLIED>
  <!ATTLIST usefarmer startdelay CDATA #IMPLIED>
  
  <!-- seed -->
  
  <!ELEMENT seed (#PCDATA)>