summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify')
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/README31
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.cpp14
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/README11
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/Lanes/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_Filter/README4
-rw-r--r--TAO/orbsvcs/tests/Notify/Persistent_POA/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/Reconnecting/README42
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/README10
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/README11
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/README15
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/README17
-rw-r--r--TAO/orbsvcs/tests/Notify/ThreadPool/README10
-rw-r--r--TAO/orbsvcs/tests/Notify/Validate_Client/README10
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml3
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README5
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/scripts/README1
33 files changed, 188 insertions, 85 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 6891dcd7cd1..bb111e54370 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -328,6 +328,18 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
- return client.check_results ();
+ int status = 0;
+
+ try
+ {
+ status = client.check_results ();
+ }
+ catch (const CORBA::Exception& se)
+ {
+ se._tao_print_exception ("Error: ");
+ status = 1;
+ }
+
+ return status;
}
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 5ec7883937c..779bde188e6 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -313,5 +313,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
- return events.check_results ();
+ int status = 0;
+
+ try
+ {
+ status = events.check_results ();
+ }
+ catch (const CORBA::Exception& se)
+ {
+ se._tao_print_exception ("Error: ");
+ status = 1;
+ }
+
+ return status;
}
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 382a27887f1..1db133780ce 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -354,5 +354,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
- return client.check_results ();
+ int status = 0;
+
+ try
+ {
+ status = client.check_results ();
+ }
+ catch (const CORBA::Exception& se)
+ {
+ se._tao_print_exception ("Error: ");
+ status = 1;
+ }
+
+ return status;
}
diff --git a/TAO/orbsvcs/tests/Notify/Basic/README b/TAO/orbsvcs/tests/Notify/Basic/README
index ed9a0128716..d79ebc2ecfb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/README
+++ b/TAO/orbsvcs/tests/Notify/Basic/README
@@ -1,6 +1,7 @@
+$Id$
- Basic Tests
- ===========
+Basic Tests
+===========
Updates:
-------
@@ -16,7 +17,7 @@ Connects/Disconnects consumers and suppliers in a loop to test connect
and disconnect to admin objects.
Command line parameters:
-
+
"-count <testcount>",
"-consumers <number_of_consumers>",
"-suppliers <number_of_suppliers>",
@@ -28,18 +29,18 @@ Creates and destroys EC and Admin objects.
Command line parameters:
"-count testcount"
-where <testcount> is how many times we want to create/destroy.
+where <testcount> is how many times we want to create/destroy.
IdAssignment:
------------
This test exercies Id generation by creating ec and admin objects and
using the assigned ids to lookup these objects and destroy them.
-Command line parameters:
-"-iter <count>", count is how many times to repeat this test.
-"-ec_count <count>", count is number of ec objects to create
-"-ca_count <count>", count is number of consumer admin (ca) objects to create
-"-sa_count <count>\n", count is number of supplier admin (sa) objects to create
+Command line parameters:
+"-iter <count>", count is how many times to repeat this test.
+"-ec_count <count>", count is number of ec objects to create
+"-ca_count <count>", count is number of consumer admin (ca) objects to create
+"-sa_count <count>\n", count is number of supplier admin (sa) objects to create
AdminProperties
@@ -55,17 +56,17 @@ command line parameters:
-consumers [consumers]
-suppliers [suppliers]
-event_count [event_count]
--ConsumerDelay [delay in secs]
+-ConsumerDelay [delay in secs]
// sleep period per push for the consumer created to test MaxQueueLength
-InitialDelay [delay in secs]
Events:
----------
-This test creates 1 structured supplier and 2 structured consumers.
+This test creates 1 structured supplier and 2 structured consumers.
Each consumer should receive all the events send by the supplier.
The uses the default ConsumerAdmin and default Supplier Admin if the
-use_default_admin option is specified.
-
+
command line options:
-use_default_admin
-events [number of events to send]
@@ -73,9 +74,9 @@ command line options:
MultiTypes:
-----------
Creates a Supplier and Consumer each for the 3 Client types that send
-and receive Any, Structured and Sequence event types.
+and receive Any, Structured and Sequence event types.
Each type of the supplier then sends an event each to the Notification
-channel. All 3 types of consumers should receive 3 events each.
+channel. All 3 types of consumers should receive 3 events each.
command line options:
none.
@@ -86,7 +87,7 @@ Creates 1 Any Supplier and 1 Any Consumer. Events received by the
supplier must be equal to the count send.
command line options:
--events [number of events to send]
+-events [number of events to send]
Filter:
------
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 6b345e31871..9d4b0f3768b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -349,5 +349,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
- return events.check_results ();
+ int status = 0;
+
+ try
+ {
+ status = events.check_results ();
+ }
+ catch (const CORBA::Exception& se)
+ {
+ se._tao_print_exception ("Error: ");
+ status = 1;
+ }
+
+ return status;
}
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 5cc9b2df6ec..c27af8a8979 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -231,5 +231,17 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return 1;
}
- return events.check_results ();
+ int status = 0;
+
+ try
+ {
+ status = events.check_results ();
+ }
+ catch (const CORBA::Exception& se)
+ {
+ se._tao_print_exception ("Error: ");
+ status = 1;
+ }
+
+ return status;
}
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/README b/TAO/orbsvcs/tests/Notify/Blocking/README
index caa10b69a6f..a6187afdabe 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/README
+++ b/TAO/orbsvcs/tests/Notify/Blocking/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification Blocking Policy Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/README b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/README
index 0aac6bd0c6c..5270ee03606 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/README
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/README
@@ -1,12 +1,13 @@
+$Id$
+
Sequence Event ETCL Filter Test
===============================
-
Description
-----------
This test checks push supplier and push consumer ETCL event filter mechanisms.
-The supplier sends a number of events specified by the consumer. The consumer
+The supplier sends a number of events specified by the consumer. The consumer
can filter or not filter the events and can use multiple consumers.
The consumer may specify 'and' and/or 'or' relations on the filterable data
contained within an event.
@@ -18,19 +19,19 @@ Usage
The test consists of a Supplier and Consumer. The usage for each as is
follows:
-$ ./Sequence_Supplier
+$ ./Sequence_Supplier
usage: ./Sequence_Supplier -o <iorfile> -e <# of events>
$ ./Sequence_Consumer -\?
usage: ./Sequence_Consumer -k <ior> -l <low expected events>
-h <high expected events>
-To run this test, run the run_test.pl perl script.
+To run this test, run the run_test.pl perl script.
This script is designed to test various aspects of the filtering
mechanism.
Expected Results
----------------
-The test script will display an error if for any test that fails.
+The test script will display an error if for any test that fails.
Otherwise, the test passed.
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/README b/TAO/orbsvcs/tests/Notify/Discarding/README
index 1b83d695fe7..ef0a54dbde4 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/README
+++ b/TAO/orbsvcs/tests/Notify/Discarding/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification Discard Policy Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/README b/TAO/orbsvcs/tests/Notify/Lanes/README
index 87f6a1a3919..f7e5cddfa38 100644
--- a/TAO/orbsvcs/tests/Notify/Lanes/README
+++ b/TAO/orbsvcs/tests/Notify/Lanes/README
@@ -1,3 +1,5 @@
+$Id$
+
RT Notification test to verify lane support
===========================================
This test makes sure that events are send according to the lanes
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/README b/TAO/orbsvcs/tests/Notify/MT_Dispatching/README
index 5a2dce02e48..5efc49b0db7 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/README
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification MT Dispatching Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/README b/TAO/orbsvcs/tests/Notify/Ordering/README
index 9df80a17192..c94c46eeb85 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/README
+++ b/TAO/orbsvcs/tests/Notify/Ordering/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification Ordering Policy Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/README b/TAO/orbsvcs/tests/Notify/Persistent_Filter/README
index c3963500c29..d2a3f480df6 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/README
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/README
@@ -1,3 +1,5 @@
+$Id$
+
This test is based on the Filter example.
It tests the persistent filter changes. The filter constraints
are saved to persistent data instead of filter IOR.
@@ -5,6 +7,6 @@ are saved to persistent data instead of filter IOR.
The run_test.pl starts NotificationService, consumer and supplier.
After they complete, restart them again with using the persistent
data. The restarted consumer and supplier will verify the filters
-and modify the constraints. The test finally should pass with no
+and modify the constraints. The test finally should pass with no
errors.
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/README b/TAO/orbsvcs/tests/Notify/Persistent_POA/README
index 02919bb46ea..c0b63fcd711 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_POA/README
+++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification Persistent POA Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/README b/TAO/orbsvcs/tests/Notify/Reconnecting/README
index 723c0a4f730..496bea91bd8 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/README
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/README
@@ -31,10 +31,10 @@ This directory contains:
but not event persistence.
ns_st_both.conf -- configures the Notification Service for single
thread operation with support for both topological,
- and event persistence.
+ and event persistence.
ns_mt_both.conf -- configures the Notification Service for multi-
threaded operation with support for both topological,
- and event persistence.
+ and event persistence.
event.conf -- configures the Notification Service for event
persistence without topology persistence. This is
an invalid configuration and should cause the
@@ -67,9 +67,9 @@ the Supplier.
-nonamesvc Don't use the Naming Service to find
EventChannelFactory
- -channel filename Where to store a channel number so the Supplier can
+ -channel filename Where to store a channel number so the Supplier can
find it
- -any or -str or -seq What type of event supplier will send (pick one,
+ -any or -str or -seq What type of event supplier will send (pick one,
default: -any)
-expect n How many events are expected.
-fail n Simulate a recoverable failure every n events.
@@ -77,7 +77,7 @@ the Supplier.
used, then serial number checking is disabled.
This allows testing the consumer with multiple
Suppliers.
- -disconnect Disconnect from notfication service cleanly
+ -disconnect Disconnect from notfication service cleanly
(no reconnect will be possible)
-v Verbose output.
@@ -122,7 +122,7 @@ Service). Structured events and Sequence events are events supported only
by the Notification Service. See the TAO Developer's Guide or the CORBA
specification for more details.
-Only one of these three options should be specified. If none of these
+Only one of these three options should be specified. If none of these
is specified, the default is "-any".
Command line option: -send n
@@ -137,17 +137,17 @@ After it has received that many events, the Consumer will shut down.
Command line option: -fail n
------------------------------
-This Consumer-only option tells the Consumer to throw an exception
+This Consumer-only option tells the Consumer to throw an exception
(CORBA::UNKNOWN) every n events. This simulates a recoverable error in
the consumer. After throwing the exception, the consumer continues
to listen for incoming events. It expects the event it was processing
to be retransmitted.
Because of the retransmission, the use of the -fail option may be
-counterintuitive. If the consumer options are "-expect 10 -fail 4" then
-it will receive events 0, 1, 2, and fail on event 3. It will then
-receive 3, 4, 5, and fail on event 6. Then it will receive 6, 7, 8,
-and fail on event 9. Finally it will receive the retransmission of event
+counterintuitive. If the consumer options are "-expect 10 -fail 4" then
+it will receive events 0, 1, 2, and fail on event 3. It will then
+receive 3, 4, 5, and fail on event 6. Then it will receive 6, 7, 8,
+and fail on event 9. Finally it will receive the retransmission of event
9 and exit.
Command line option: -pause n
@@ -234,7 +234,7 @@ during the test. The default if none of these options is present is "-any".
run_test.pl: command line option -v
--------------------------------------------
This option controls the verbosity of the test script and the Supplier and
-Consumer applications. When it is present, a detailed step-by-step
+Consumer applications. When it is present, a detailed step-by-step
report is produced by the test.
run_test.pl: Test #1: Supplier reconnection.
@@ -246,8 +246,8 @@ The Consumer is configured to receive 20 events. The Supplier is configured
to send ten events.
After sending ten events, the Supplier exits -- simulating a Supplier failure.
-The test script starts a new copy of the Supplier. The new Supplier is
-configured to send ten events starting with event number 10.
+The test script starts a new copy of the Supplier. The new Supplier is
+configured to send ten events starting with event number 10.
It uses information saved by the previous supplier to reconnect to the same
channel, admin, and proxy in the Notification Services.
The Suppler sends the remaining ten events then exists. The Consumer having
@@ -262,9 +262,9 @@ The Notification Service from the previous test is still running and the
saved reconnection information for both the Supplier and Consumer is still
available.
-The test script starts a Consumer configured to receive 20 events and a
+The test script starts a Consumer configured to receive 20 events and a
Supplier configured to send twenty events. Both clients use the reconnection
-information from the previous test to reconnect to the Notification Service.
+information from the previous test to reconnect to the Notification Service.
Twenty events are sent successfully, then both clients exit and the test
is complete.
@@ -292,13 +292,13 @@ run_test.pl: Test #4: The Reconnection Registry
-----------------------------------------------
This test starts with the Notification Service from the previous test.
-The script starts a new Consumer that expects to receive 20 events. The
+The script starts a new Consumer that expects to receive 20 events. The
Consumer reconnects to the Notification Server.
-The script starts a Supplier. It is configured to send 10 events then
-pause waiting for a Notification Service initiated reconnection before
+The script starts a Supplier. It is configured to send 10 events then
+pause waiting for a Notification Service initiated reconnection before
sending the remaining 10 events.
-Both clients register with the Reconnection Registry to receive reconnection
+Both clients register with the Reconnection Registry to receive reconnection
callbacks.
The test script waits for the Supplier to pause. It then kills the
@@ -335,7 +335,7 @@ communication or Consumer failures.
Known Problems as of Feb 2004.
------------------------------
-Sequence events are not working. It is unclear whether this is a problem in
+Sequence events are not working. It is unclear whether this is a problem in
the test or in the Notification Service itself.
Known Problems as of Mar 2004.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/README b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/README
index 0aac6bd0c6c..d8f94c0e9df 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/README
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/README
@@ -1,3 +1,5 @@
+$Id$
+
Sequence Event ETCL Filter Test
===============================
@@ -6,7 +8,7 @@ Description
-----------
This test checks push supplier and push consumer ETCL event filter mechanisms.
-The supplier sends a number of events specified by the consumer. The consumer
+The supplier sends a number of events specified by the consumer. The consumer
can filter or not filter the events and can use multiple consumers.
The consumer may specify 'and' and/or 'or' relations on the filterable data
contained within an event.
@@ -18,19 +20,19 @@ Usage
The test consists of a Supplier and Consumer. The usage for each as is
follows:
-$ ./Sequence_Supplier
+$ ./Sequence_Supplier
usage: ./Sequence_Supplier -o <iorfile> -e <# of events>
$ ./Sequence_Consumer -\?
usage: ./Sequence_Consumer -k <ior> -l <low expected events>
-h <high expected events>
-To run this test, run the run_test.pl perl script.
+To run this test, run the run_test.pl perl script.
This script is designed to test various aspects of the filtering
mechanism.
Expected Results
----------------
-The test script will display an error if for any test that fails.
+The test script will display an error if for any test that fails.
Otherwise, the test passed.
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/README b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/README
index 13486ab0797..33fe7f71367 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/README
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/README
@@ -1,12 +1,13 @@
+$Id$
+
Sequence Event Filter Test
============================
-
Description
-----------
This test checks push supplier and push consumer event filter mechanisms.
-The supplier sends a number of events specified by the consumer. The consumer
+The supplier sends a number of events specified by the consumer. The consumer
can filter or not filter the events and can use multiple consumers.
The consumer may specify 'and' and/or 'or' relations on the filterable data
contained within an event.
@@ -19,7 +20,7 @@ The test consists of a Supplier and Consumer. The usage for each as is
follows:
$ ./Sequence_Supplier -\?
-usage: ./Sequence_Supplier -ORBInitRef <Naming Service Location>
+usage: ./Sequence_Supplier -ORBInitRef <Naming Service Location>
$ ./Sequence_Consumer -\?
usage: ./Sequence_Consumer -l <low> -h high -d <discard policy> -c <constraint string>
@@ -28,12 +29,12 @@ The "low" value specified the number of whole batches of events expected. The "
The "constraint string" allows the TCL filter string to be specified on the command line.
-To run this test, run the run_test.pl perl script.
+To run this test, run the run_test.pl perl script.
This script is designed to test various aspects of the filtering
mechanism.
Expected Results
----------------
-The test script will display an error if for any test that fails.
+The test script will display an error if for any test that fails.
Otherwise, the test passed.
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/README b/TAO/orbsvcs/tests/Notify/Structured_Filter/README
index 879ed382a1c..b25462c995d 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/README
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/README
@@ -1,12 +1,13 @@
+$Id$
+
Structured Event Filter Test
============================
-
Description
-----------
This test checks push supplier and push consumer event filter mechanisms.
-The supplier sends a number of events specified by the consumer. The consumer
+The supplier sends a number of events specified by the consumer. The consumer
can filter or not filter the events and can use multiple consumers.
If filtered, the consumer will receive 1/3 of the total events.
@@ -17,20 +18,20 @@ Usage
The test consists of a Supplier and Consumer. The usage for each as is
follows:
-$ Structured_Supplier
-usage: ./Structured_Supplier -ORBInitRef <Naming Service Location>
+$ Structured_Supplier
+usage: ./Structured_Supplier -ORBInitRef <Naming Service Location>
$ Structured_Consumer -\?
usage: ./Structured_Consumer [-f] -n <num events> -c <num consumers> \
-ORBInitRef <Naming Service Location>
-The -f option applies an event filter to the consumer. The -c option lets
+The -f option applies an event filter to the consumer. The -c option lets
the user specify the number of consumers to use.
-To run this test, run the run_test.pl perl script.
+To run this test, run the run_test.pl perl script.
Expected Results
----------------
-The test script will display an error if for any test that fails.
+The test script will display an error if for any test that fails.
Otherwise, the test passed. \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/README b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/README
index 30fd2d5d9f7..4af5c861fb7 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/README
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/README
@@ -1,15 +1,16 @@
+$Id$
+
Structured Event InterFilterGroupOperator Test
==============================================
-
Description
-----------
-This test checks push supplier and push consumer event logical operators
-between the Supplier/Consumer admins and their proxies. The supplier sends
+This test checks push supplier and push consumer event logical operators
+between the Supplier/Consumer admins and their proxies. The supplier sends
a number of events specified by the consumer. The supplier and consumer can
filter or not filter the events, and can AND and OR the proxy and admin
-filters.
+filters.
Usage
@@ -18,22 +19,22 @@ Usage
The test consists of a Supplier and Consumer. The usage for each as is
follows:
-$ Structured_Supplier
+$ Structured_Supplier
usage: ./Structured_Supplier [-f] -o <AND_OP | OR_OP> \
-ORBInitRef <Naming Service Location>
$ Structured_Consumer -\?
-usage: ./Structured_Consumer [-f] [-s] -n <num events> -c <num consumers> \
+usage: ./Structured_Consumer [-f] [-s] -n <num events> -c <num consumers> \
-o <AND_OP | OR_OP> -ORBInitRef <Naming Service Location>
The -f option applies an the event filter to the supplier or consumer.
The -s option alerts the consumer to supplier filtering.
The -c option lets the user specify the number of consumers to use.
-To run this test, run the run_test.pl perl script.
+To run this test, run the run_test.pl perl script.
Expected Results
----------------
-The test script will display an error if for any test that fails.
+The test script will display an error if for any test that fails.
Otherwise, the test passed.
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/README b/TAO/orbsvcs/tests/Notify/ThreadPool/README
index d690937f041..0575459a378 100644
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/README
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/README
@@ -1,3 +1,5 @@
+$Id$
+
ThreadPool test
===============
@@ -19,7 +21,7 @@ supplier.conf:
This creates the following -
- An EventChannel with a threadpool.
-- A SupplierAdmin (SA1)with a threadpool.
+- A SupplierAdmin (SA1)with a threadpool.
- Another SupplierAdmin (SA2) with no threadpool.
- A ProxyConsumer(1) is connected to SA1 with a threadpool.
@@ -33,11 +35,11 @@ consumer.conf:
-------------
This creates:
-- A ConsumerAdmin (CA1)with a threadpool.
+- A ConsumerAdmin (CA1)with a threadpool.
- Another ConsumerAdmin (CA2) with no threadpool.
An RT POA is created in which the ProxySuppliers are activated.
-
+
- A ProxySupplier(1) is connected to CA1 with a threadpool.
- A ProxySupplier(2) is connected to CA1 with no threadpool.
- A ProxySupplier(3) is connected to CA2 with no threadpool.
@@ -49,4 +51,4 @@ Expected Result:
==============
if a request reaches a threadpool that it was not supposed to, an
error message is printed. otherwise some housekeeping messages are
-generated when the test runs. \ No newline at end of file
+generated when the test runs. \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/README b/TAO/orbsvcs/tests/Notify/Validate_Client/README
index 4bf085ce6e9..b2f45869cfa 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/README
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/README
@@ -1,12 +1,14 @@
+$Id$
+
This test is to verify the Notification Service client connection
-validation feature.
+validation feature.
-The test synthesizes a persistency file that points to a dummy
-service. The Notify service is then run so that it uses the
+The test synthesizes a persistency file that points to a dummy
+service. The Notify service is then run so that it uses the
persistency file to restore a topology and eventually reap the
proxies because the "ping" yields an OBJECT_NOT_EXIST exception.
-The result should be that after a few seconds, a new persistence
+The result should be that after a few seconds, a new persistence
file is created that contains no proxy references.
Run ./run_test.pl and it should output "test passed".
diff --git a/TAO/orbsvcs/tests/Notify/lib/README b/TAO/orbsvcs/tests/Notify/lib/README
index 3e8a49d1c22..72dc92be7b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/README
+++ b/TAO/orbsvcs/tests/Notify/lib/README
@@ -1,4 +1,4 @@
-//$Id$
+$Id$
This directory has the library used by the test examples to test the
Notification Service.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/README b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/README
index 0d326588015..3485dac1a4c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/README
@@ -1,3 +1,5 @@
+$Id$
+
Notification Performance Test
================================
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
index 88b6a01e03c..7288da498b1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
@@ -1,3 +1,5 @@
+$Id$
+
RedGreen Test
This test will measure throughput in different configurations of the
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
index 686b6f6e4ba..721457a7d45 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml
@@ -1,5 +1,8 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
+ <!-- -->
+ <!-- $Id$ -->
+ <!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-DispatchingThreads 1"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
index f72d4165927..5e3a436e51a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml
@@ -1,5 +1,8 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
+ <!-- -->
+ <!-- $Id$ -->
+ <!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory" params="-AllocateTaskperProxy -SourceThreads 2"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
index b8b7e4f8e71..d2e20177daf 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml
@@ -1,5 +1,8 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
+ <!-- -->
+ <!-- $Id$ -->
+ <!-- -->
<static id="Notify_Default_Event_Manager_Objects_Factory"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
index 0673554e968..fb2f0477d6a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml
@@ -1,5 +1,8 @@
<?xml version='1.0'?>
<!-- Converted from ./orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf by svcconf-convert.pl -->
<ACE_Svc_Conf>
+ <!-- -->
+ <!-- $Id$ -->
+ <!-- -->
<static id="Resource_Factory" params="-ORBReactorMaskSignals 0"/>
</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
index 3b27b5e847e..eca874cda74 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
@@ -1,10 +1,11 @@
+$Id$
Notify Throughput
Test to measure Notify's throughput
Command line options:
---------------------
+--------------------
-collocated_ec,
-consumers [count],
-suppliers [count],
@@ -15,6 +16,6 @@ Command line options:
-EC [Channel Name],
-ExpectedCount [count]
-e.g.
+e.g.
./Throughput -ORBInitRef NameService=file:///naming.ior -consumers 1 -suppliers 1 -burst_size 1000 -burst_count 1 -payload 16384
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README
index ddf54440055..3361cb0b7ed 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README
@@ -1,4 +1,4 @@
-## $Id$
+$Id$
1 Path : Load vs Throughput experiment with period=0
====================================================
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README
index 55e2003fc75..beb818bb396 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README
@@ -1,4 +1,4 @@
-## $Id$
+$Id$
3 Paths : Load vs Throughput experiment with period=10ms
========================================================
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
index 1bdb2e76d15..171e2bba96f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
@@ -1,4 +1,4 @@
-//$Id$
+$Id$
Max Throughput of various configurations:
=========================================
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/README
index 916cae33bba..edb4371f5bd 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/README
@@ -1,3 +1,4 @@
+$Id$
This directory contains various experiments for the RT-Notification
and CosNotification Service.