diff options
Diffstat (limited to 'TAO/CIAO/performance-tests/Benchmark')
17 files changed, 48 insertions, 48 deletions
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl index d363628c891..f9f1b747279 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl +++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl @@ -20,7 +20,7 @@ module Benchmark * @interface RoundTrip * * This Latency test provides operations to measure the round-trip - * latency of the ORB. The interface is same as that of + * latency of the ORB. The interface is same as that of * $TAO_ROOT/performance-tests/Latency/Single_Threaded */ @@ -37,7 +37,7 @@ module Benchmark * * This interface is used to start the tests. */ - interface Controller + interface Controller { /// Start the test void start (); diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc index 32f12acaa2e..c04f758a3bd 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc +++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ project(Benchmark_stub): ciao_client_dnc { @@ -32,7 +32,7 @@ project(Benchmark_svnt) : ciao_component_dnc { project (*server) : taoserver, strategies,ciao_component_dnc { after += Benchmark_svnt - libs += Benchmark_svnt Benchmark_stub + libs += Benchmark_svnt Benchmark_stub Source_Files { server.cpp @@ -40,7 +40,7 @@ project (*server) : taoserver, strategies,ciao_component_dnc { BenchmarkEC.cpp BenchmarkES.cpp } - + IDL_Files { BenchmarkE.idl } diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt index a0ae140a0ee..e1ed8e75a32 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt +++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/NOTE.txt @@ -2,7 +2,7 @@ $Id$ PRE Condition: ============= -This test assumes that there is an appropriate svc.conf file present in +This test assumes that there is an appropriate svc.conf file present in $CIAO_ROOOT/tools/ComponentServer. Moreover, the Component Server does not curerntly expose interfaces to configure multi-threading. Hence, this experiment, will produce the desired results *only* when this feature has been @@ -11,5 +11,5 @@ added in CIAO. Till then, the server will run in single-threaded mode. Similarly, the client also requires the svc.conf file that enables multi-threading. This file is present in this directory. -The svc.conf file required for this experiment can be obtained from +The svc.conf file required for this experiment can be obtained from $TAO_ROOT/performance-tests/Latency/Thread_Pool diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README index 0cadcfc8e51..24a6ed860b6 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README +++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/README @@ -1,12 +1,12 @@ /** @page Multi_Threaded README File - - This black box experiment measures "multi-threading" support present in CIAO. -In this test, a client component spawns four threads that concurrently invoke operations + + This black box experiment measures "multi-threading" support present in CIAO. +In this test, a client component spawns four threads that concurrently invoke operations on the server. The latency, throughput and jitter for each thread is printed out. The -motivation of this test is to observe scalability when a ComponentServer receives -multiple requests from parallel clients. A sister test, ../Multi_Process documents +motivation of this test is to observe scalability when a ComponentServer receives +multiple requests from parallel clients. A sister test, ../Multi_Process documents behavior as parallel clients (separate processes) invoke requests on the server. */ diff --git a/TAO/CIAO/performance-tests/Benchmark/README b/TAO/CIAO/performance-tests/Benchmark/README index ec8463d2aae..972473f5b33 100644 --- a/TAO/CIAO/performance-tests/Benchmark/README +++ b/TAO/CIAO/performance-tests/Benchmark/README @@ -4,9 +4,9 @@ The most basic of the Boeing scenarios that form part of the OEP. This is done to illustrate how the OEP can be implemented using -CIAO. +CIAO. - This example does not yet use MPC to generate MSVC + This example does not yet use MPC to generate MSVC projects/workspaces/solutions or makefiles - we are still working on getting the execution of the CIDL compiler integrated into MPC. The CIDL compiler execution has diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README index 8bd003eaf72..8fad0d190cb 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/README @@ -2,8 +2,8 @@ @page RoundTrip README File - The RoundTrip component. This component measures the round-trip -latency for single-threaded case. This test adapted from + The RoundTrip component. This component measures the round-trip +latency for single-threaded case. This test adapted from $TAO_ROOT/performance-tests/Latency/Single_Threaded */ diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc index 793f486cbbf..57e8ed9c264 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc @@ -7,9 +7,9 @@ project(RoundTrip_stub): ciao_client_dnc { libs += Benchmark_stub - idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export - idlflags += -Wb,stub_export_include=RoundTrip_stub_export.h - idlflags += -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export + idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export + idlflags += -Wb,stub_export_include=RoundTrip_stub_export.h + idlflags += -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export idlflags += -Wb,skel_export_include=RoundTrip_svnt_export.h dynamicflags = ROUNDTRIP_STUB_BUILD_DLL @@ -31,7 +31,7 @@ project(RoundTrip_svnt) : ciao_servant_dnc { libpaths += .. - idlflags += -Wb,export_macro=ROUNDTRIP_SVNT_Export + idlflags += -Wb,export_macro=ROUNDTRIP_SVNT_Export idlflags += -Wb,export_include=RoundTrip_svnt_export.h dynamicflags = ROUNDTRIP_SVNT_BUILD_DLL @@ -59,7 +59,7 @@ project(RoundTrip_exec) : ciao_component_dnc { libs += RoundTrip_stub Benchmark_stub Benchmark_svnt RoundTrip_svnt libpaths += .. - idlflags += -Wb,export_macro=ROUNDTRIP_EXEC_Export + idlflags += -Wb,export_macro=ROUNDTRIP_EXEC_Export idlflags += -Wb,export_include=RoundTrip_exec_export.h dynamicflags = ROUNDTRIP_EXEC_BUILD_DLL diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl index a28de5948d2..b42a56eb907 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl @@ -5,7 +5,7 @@ * @file RoundTripEI.idl * * - * @author + * @author */ //============================================================================= @@ -24,7 +24,7 @@ module Benchmark * define the component executor interface explicitly here. */ local interface RoundTrip_Exec : CCM_RoundTrip, CCM_LatencyTest, - Components::SessionComponent + Components::SessionComponent { }; diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf index e1706aae4e5..071cb24a082 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/svc.conf @@ -1,5 +1,5 @@ # -# $Id$ +# $Id$ # dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc index ee44efc892a..4cce64553db 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc @@ -7,9 +7,9 @@ project(RoundTripClient_stub): ciao_client_dnc { libs += Benchmark_stub - idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export - idlflags += -Wb,stub_export_include=RoundTripClient_stub_export.h - idlflags += -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export + idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export + idlflags += -Wb,stub_export_include=RoundTripClient_stub_export.h + idlflags += -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export idlflags += -Wb,skel_export_include=RoundTripClient_svnt_export.h dynamicflags = ROUNDTRIPCLIENT_STUB_BUILD_DLL @@ -29,7 +29,7 @@ project(RoundTripClient_svnt) : ciao_servant_dnc { libs += RoundTripClient_stub Benchmark_stub Benchmark_svnt libpaths += .. - idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export + idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_SVNT_Export idlflags +=-Wb,export_include=RoundTripClient_svnt_export.h dynamicflags = ROUNDTRIPCLIENT_SVNT_BUILD_DLL @@ -59,7 +59,7 @@ project(RoundTripClient_exec) : ciao_component_dnc { libpaths += .. - idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export + idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export idlflags += -Wb,export_include=RoundTripClient_exec_export.h dynamicflags = ROUNDTRIPCLIENT_EXEC_BUILD_DLL diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl index d9009c56e8a..d2aad00938b 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl @@ -5,7 +5,7 @@ * @file RoundTripClientEI.idl * * - * @author + * @author */ //============================================================================= @@ -24,8 +24,8 @@ module Benchmark * define the component executor interface explicitly here. */ local interface RoundTripClient_Exec : CCM_RoundTripClient, - Components::SessionComponent, - CCM_Controller //Monolithic + Components::SessionComponent, + CCM_Controller //Monolithic { }; diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl index b7f83dbedd8..57af615669e 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/Test.idl @@ -1,5 +1,5 @@ // -// $Id$ +// $Id$ // /// Measure roundtrip delay diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp index c6f2f81ae0c..1a48222b34f 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ #include "LatencyTest.h" #include "ace/Sched_Params.h" diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad b/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad index 0c0be0cb71c..feca2a714e1 100644 --- a/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad +++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/Multi_Threaded.cad @@ -19,8 +19,8 @@ <componentfileref idref="com-RoundTrip"/> <componentinstantiation id="a_RoundTrip"/> </homeplacement> - - <processcollocation> + + <processcollocation> <homeplacement id="a_RoundTripClientHome"> <componentfileref idref="com-RoundTripClient"/> <componentinstantiation id="a_RoundTripClient"> @@ -29,7 +29,7 @@ </registercomponent> </componentinstantiation> </homeplacement> - + <homeplacement id="b_RoundTripClientHome"> <componentfileref idref="com-RoundTripClient"/> @@ -48,8 +48,8 @@ </registercomponent> </componentinstantiation> </homeplacement> - - + + <homeplacement id="d_RoundTripClientHome"> <componentfileref idref="com-RoundTripClient"/> <componentinstantiation id="d_RoundTripClient"> @@ -60,7 +60,7 @@ </homeplacement> <destination>Remote</destination> </processcollocation> - + </partitioning> @@ -86,7 +86,7 @@ <componentinstantiationref idref="a_RoundTrip"/> </providesport> </connectinterface> - + <connectinterface> <usesport> <usesidentifier>latency</usesidentifier> diff --git a/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt b/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt index 7bcd2fbfade..a9b27abedd8 100644 --- a/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt +++ b/TAO/CIAO/performance-tests/Benchmark/descriptors/NOTE.txt @@ -39,10 +39,10 @@ test.dat: the RoundTrip component on the location given in test.dat. RoundTripClient.cad : A descriptor file for the client component RoundTripClient that uses the interface provided by - RoundTrip. + RoundTrip. Test-IOR.cad: This cad file should be used to for testing a CORBA server with a CIAO client. The IOR of the server should added in - this file. + this file. There are automated perl scripts that can run the tests to generate the required results. These are located in the individual component directories @@ -50,7 +50,7 @@ Round Trip and RoundTripClient. The descriptors directory has the required .cad files that specify the component configuration used in the various experiments. -To run a simple CORBA component with a normal client: +To run a simple CORBA component with a normal client: cd descriptors; ../Roundtrip/run_test.pl @@ -60,6 +60,6 @@ To run a simple CORBA component with a normal client: server. Statistics are printed for RoundTrip latency jitter etc cd descritors; - ../RoundTripClient/run_test_ior_cad.pl - Script runs a CORBA server and a CIAO component that acts as a client. + ../RoundTripClient/run_test_ior_cad.pl + Script runs a CORBA server and a CIAO component that acts as a client. Similar statistics are printed. diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp index 345610c1eb2..fa0bdba0bbd 100644 --- a/TAO/CIAO/performance-tests/Benchmark/server.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ #include "LatencyTest.h" diff --git a/TAO/CIAO/performance-tests/Benchmark/svc.conf b/TAO/CIAO/performance-tests/Benchmark/svc.conf index 7b8129f5667..9e0c5ed01ed 100644 --- a/TAO/CIAO/performance-tests/Benchmark/svc.conf +++ b/TAO/CIAO/performance-tests/Benchmark/svc.conf @@ -1,5 +1,5 @@ # -# $Id$ +# $Id$ # static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" |