diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-23 12:30:15 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-23 12:30:15 +0000 |
commit | 9c09a3c8abe69f6f3c8841b93fedaa779b598fd3 (patch) | |
tree | 573993447a9bd60136a1226ea0a0ecac3b7b233e /CIAO/tests/DAnCE/LocalityManager | |
parent | 5256229b83f41bd15335b5a11fa4cdfbb7cc7763 (diff) | |
download | ATCD-9c09a3c8abe69f6f3c8841b93fedaa779b598fd3.tar.gz |
Thu Feb 23 12:27:54 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/ciao_tests.lst:
* ciao/Base/CIAO_Properties.idl:
* ciao/Containers/Container_Base.idl:
* ciao/Containers/Container_Base_T.h:
* ciao/Containers/Container_Base_T.cpp:
* ciao/Containers/Extension/Extension_Container.h:
* ciao/Containers/Extension/Extension_Container.cpp:
* ciao/Containers/Session/Session_Container.h:
* ciao/Containers/Session/Session_Container.cpp:
* ciao/Deployment/Handlers/Component_Handler.cpp:
* ciao/Deployment/Handlers/Container_Handler.cpp:
* ciao/Deployment/Handlers/Home_Handler.cpp:
Added support for new ciao config property "edu.vanderbilt.dre.CIAO.OpenMode"
which controls the mode that is used to load the shared libraries for
a home or component. By default we use ACE_DEFAULT_SHLIB_MODE
which can be controlled through config.h, but now it can also
be controlled using the deployment plan. This property is of type long
* tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp:
* tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl:
Example cdp using the new open mode property
Diffstat (limited to 'CIAO/tests/DAnCE/LocalityManager')
-rw-r--r-- | CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp | 154 | ||||
-rwxr-xr-x | CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl | 246 |
2 files changed, 400 insertions, 0 deletions
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp new file mode 100644 index 00000000000..20eb56b05ac --- /dev/null +++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/Component_OpenMode.cdp @@ -0,0 +1,154 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>Hello_DDS_Deployment_1</label> + <UUID>Hello_DDS_Deployment_1</UUID> + + <!-- Implementations declarations --> + + <!-- Home implementation --> + + <implementation xmi:id="CompSvrImpl"> + <name>CompSvr</name> + <source /> + <artifact xmi:idref="CompSvrArt" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string> + </value> + </value> + </execParameter> + </implementation> + + <implementation xmi:id="CommandlinePassageComponentImplementation"> + <name>CommandlinePassageComponentImplementation</name> + <source/> + <artifact xmi:idref="CommandlinePassage_ExecArtifact" /> + <artifact xmi:idref="CommandlinePassage_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see 10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Component_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_command_line_test_A_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.OpenMode</name> + <value> + <type> + <kind>tk_long</kind> + </type> + <value> + <long>3</long> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>CommandlinePassage_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>CommandlinePassage_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="CompSvrInst"> + <name>ComponentServerInstance</name> + <node>CommandlinePassageNode</node> + <source /> + <implementation xmi:idref="CompSvrImpl" /> + </instance> + + <instance xmi:id="CommandlinePassageComponentInstance"> + <name>CommandlinePassageComponent</name> + <node>CommandlinePassageNode</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="CommandlinePassageComponentImplementation" /> + <!-- set both edu.vanderbilt.dre.CIAO.ComponentServer.Args and + tc_max to the same number --> + <configProperty> + <name>tc_max</name> + <value> + <type> + <kind>tk_long</kind> + </type> + <value> + <long>33</long> + </value> + </value> + </configProperty> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="CompSvrArt"> + <name>CompoSvrArtifactName</name> + <source /> + <node /> + <location>dance_locality_manager</location> + </artifact> + <artifact xmi:id="CommandlinePassage_ExecArtifact"> + <name>CommandlinePassage_exec</name> + <source/> + <node/> + <location>CommandlinePassage_exec</location> + </artifact> + <artifact xmi:id="CommandlinePassage_SvntArtifact"> + <name>CommandlinePassage_svnt</name> + <source/> + <node/> + <location>CommandlinePassage_svnt</location> + </artifact> + <artifact xmi:id="CommandlinePassage_StubArtifact"> + <name>CommandlinePassage_stub</name> + <source/> + <node/> + <location>CommandlinePassage_stub</location> + </artifact> + + <localityConstraint> + <constraint>SameProcess</constraint> + <constrainedInstance xmi:idref="CompSvrInst" /> + <constrainedInstance xmi:idref="CommandlinePassageComponentInstance" /> + </localityConstraint> + +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl new file mode 100755 index 00000000000..f430ff05152 --- /dev/null +++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_openmode.pl @@ -0,0 +1,246 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 1; +@ports = ( 60001 ); +@iorbases = ( "CommandlinePassage.ior" ); +@iorfiles = 0; +@nodenames = ( "CommandlinePassageNode" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Component_cmd.cdp"; + + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('.'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('.'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('.'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('.'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + $cmd_server_args = "--server-args '\"-ORBSvcConfDirective\" \"static Resource_Factory \\'-ORBConnectionCacheMax 33\\'\"'"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService $cmd_server_args"; + + print "Run dance_node_manager with $d_param\n"; + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 10 seconds to allow task to complete\n"; +sleep (10); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; |