From 48f795fbefe52348101a1d73e5b81e84b513d926 Mon Sep 17 00:00:00 2001 From: nanbor Date: Wed, 27 Dec 2006 20:56:11 +0000 Subject: ChangeLogTag:Wed Dec 27 20:15:29 UTC 2006 Nanbor Wang --- CIAO/ChangeLog | 16 ++++++++++++++++ CIAO/examples/Hello/descriptors/run_test_without_ns.pl | 4 ++-- CIAO/examples/Hello/descriptors_RTCCM/README | 18 ++++++++++++++++++ CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp | 2 +- CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl | 6 +++--- 5 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 CIAO/examples/Hello/descriptors_RTCCM/README mode change 100644 => 100755 CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 7224d79f848..075de563a8c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,19 @@ +Wed Dec 27 20:15:29 UTC 2006 Nanbor Wang + + * examples/Hello/descriptors/run_test_without_ns.pl: + Variable cdp_file is now actually used in the script. + + * examples/Hello/descriptors_RTCCM/rt_run_test.pl: + Variable cdp_file is now actually used in the script. + Fixed broken environment variable usage. + Enable the svn:executable property. + + * examples/Hello/descriptors_RTCCM/rt-example.cdp: + Fixed a typo. + + * examples/Hello/descriptors_RTCCM/README: + Added a short description on how to use this example. + Fri Nov 3 03:03:24 UTC 2006 Shanshan Jiang * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index 25be260cd32..d5f78c7f703 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -17,7 +17,7 @@ $daemons = 2; @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" ); $status = 0; $dat_file = "NodeManagerMap.dat"; -$cdp_file = "DeploymentPlan.cdp"; +$cdp_file = "flattened_deploymentplan_without_ns.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; $E = 0; @@ -114,7 +114,7 @@ $em_running = 1; print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", - "-p flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior"); + "-p $cdp_file -k file://EM.ior -o DAM.ior"); $E->SpawnWaitKill (5000); diff --git a/CIAO/examples/Hello/descriptors_RTCCM/README b/CIAO/examples/Hello/descriptors_RTCCM/README new file mode 100644 index 00000000000..551de85c775 --- /dev/null +++ b/CIAO/examples/Hello/descriptors_RTCCM/README @@ -0,0 +1,18 @@ + README for RTCCM example -- $Id$ -- + +This subdirectory contains a simple example showing how to use the +RTCCM extension supported by CIAO. This example doesn't really use +any of the RT capability, rather, it only shows how to associate +component instances with sets of RT policies we wish to apply. See +$CIAO_ROOT/docs/schema/ServerResourceUsage.txt for more details on how +to put together a ServerResource file (such as the +rt-config-example.scr in this example) to define sets of policies and +how to associate these policy sets with component instances (as in +rt-example.cdp.) + +Because the test uses RT scheduling policies to run the +NodeApplication, you will need administrator privilege to successfully +execute the test script, rt_run_test.pl. Remember to set up the +environment variables (LD_LIBRARY_PATH, ACE_ROOT, and CIAO_ROOT) for +the script to execute okay. + diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp index 6dc5b078d58..a9c04e21e04 100644 --- a/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp +++ b/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp @@ -156,7 +156,7 @@ - hell_event_connection + hello_event_connection click_out EventPublisher diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl old mode 100644 new mode 100755 index a790fef1be0..76cad1275e9 --- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl +++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl @@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{'ACE_ROOT'}/bin"; use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE"; +$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; $daemons_running = 0; $em_running = 0; @@ -17,7 +17,7 @@ $daemons = 2; @iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" ); $status = 0; $dat_file = "NodeManagerMap.dat"; -$cdp_file = "DeploymentPlan.cdp"; +$cdp_file = "rt-example.cdp"; $controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter"; $E = 0; @@ -119,7 +119,7 @@ $em_running = 1; print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", - "-p rt-example.cdp -k file://EM.ior -o DAM.ior"); + "-p $cdp_file -k file://EM.ior -o DAM.ior"); $E->SpawnWaitKill (5000); -- cgit v1.2.1