From b31c86b4d8a966abc29b63d73bc69c3d6f0c0b1f Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Wed, 4 Feb 2009 01:31:33 +0000 Subject: Wed Feb 4 01:26:49 UTC 2009 William R. Otte --- flat/CIAO/CIAO_TAO.mwc | 1 + flat/CIAO/CIAO_TAO_DAnCE.mwc | 1 + flat/CIAO/ChangeLog | 36 ++++++++++++++++++++-- .../ExecutionManager/ExecutionManager_Module.cpp | 2 +- .../NodeApplication/ComponentAttributesSetter.cpp | 9 +++--- flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp | 22 +++++++++++++ .../DAnCE/NodeApplication/NodeApplication_Impl.cpp | 14 +++++++-- flat/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp | 8 ++++- .../CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp | 6 ++-- flat/CIAO/DAnCE/tests/MocksTest/MockTest.mpc | 2 ++ flat/CIAO/examples/Hello/descriptors/run_test.pl | 6 ++-- 11 files changed, 91 insertions(+), 16 deletions(-) diff --git a/flat/CIAO/CIAO_TAO.mwc b/flat/CIAO/CIAO_TAO.mwc index 34f18232000..d5809047302 100644 --- a/flat/CIAO/CIAO_TAO.mwc +++ b/flat/CIAO/CIAO_TAO.mwc @@ -9,6 +9,7 @@ workspace { $(ACE_ROOT)/ACEXML/apps/svcconf $(TAO_ROOT)/tao $(TAO_ROOT)/TAO_IDL + $(TAO_ROOT)/utils $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent.mpc $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc diff --git a/flat/CIAO/CIAO_TAO_DAnCE.mwc b/flat/CIAO/CIAO_TAO_DAnCE.mwc index 971a9ef95ce..6545f9aa363 100644 --- a/flat/CIAO/CIAO_TAO_DAnCE.mwc +++ b/flat/CIAO/CIAO_TAO_DAnCE.mwc @@ -9,6 +9,7 @@ workspace { $(ACE_ROOT)/ACEXML/parser/parser $(ACE_ROOT)/ACEXML/apps/svcconf $(TAO_ROOT)/TAO_IDL + $(TAO_ROOT)/utils $(TAO_ROOT)/tao/tao.mpc $(TAO_ROOT)/tao/PortableServer.mpc $(TAO_ROOT)/tao/Valuetype.mpc diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index de2c25b3605..9d244ed08d0 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,12 +1,42 @@ -Tue Feb 3 14:24:17 UTC 2009 William R. Otte +Wed Feb 4 01:26:49 UTC 2009 William R. Otte + * CIAO_TAO.mwc: + * CIAO_TAO_DAnCE.mwc: + + Added TAO_ROOT/utils. + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: + * DAnCE/NodeManager/NodeManager_Impl.cpp: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Logging changes. + + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + + Compile fixes. + + * DAnCE/NodeApplication/Name_Utilities.cpp: + + Fixed segmentation faults. + + * DAnCE/tests/MocksTest/MockTest.mpc: + + Disabled. + * examples/Hello/descriptors/run_test.pl: - Migrating changes to a new workspace. + Fixes to use correct binaries and arguments. This test now runs. +Tue Feb 3 14:24:17 UTC 2009 William R. Otte + + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: + * DAnCE/NodeManager/Node_Manager_Module.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + * examples/Hello/descriptors/run_test.pl: + + Migrating changes to a new workspace. + Mon Jan 12 17:41:29 UTC 2009 Abdullah Sowayan * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp index 7a33a060763..13751581223 100644 --- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp +++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp @@ -36,7 +36,7 @@ namespace DAnCE "%s", ior); ACE_OS::fclose (ior_output_file_); - DANCE_DEBUG ( (LM_TRACE, "[%M] EM's ior was written into file \"%C\"\n", ior_file_name)); + DANCE_DEBUG ( (LM_TRACE, DLINFO "ExectionManager::write_IOR - EM's ior was written into file \"%C\"\n", ior_file_name)); return true; } else diff --git a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp index 3f376e54fa7..a93cbeff4f1 100644 --- a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp @@ -1,14 +1,15 @@ // $Id$ +#include "tao/DynamicInterface/Request.h" + #include "ComponentAttributesSetter.h" -#include "Deployment/Deployment_ApplicationC.h" //#include "Cdmw_ccm_dance1_cif.stub.hpp" #include "tao/DynamicInterface/DII_CORBA_methods.h" +#include "tao/DynamicInterface/Context.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/DynamicInterface/Context.h" -#include "tao/DynamicInterface/Request.h" #include "DAnCE/Logger/Log_Macros.h" +#include "Deployment/Deployment_ApplicationC.h" //bool read_config_value( const ACE_CString & name, // const Deployment::Properties & prop, @@ -61,7 +62,7 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ ACE_CString method = "_set_"; method += prop[i].name.in(); - CORBA::Request_var req; + ::CORBA::Request_var req; try { diff --git a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp index f0541437caa..dd34beee6b7 100644 --- a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp @@ -30,6 +30,15 @@ namespace DAnCE CosNaming::NamingContext_ptr ctx) { DANCE_TRACE ("Name_Utilities::bind_object"); + + if (CORBA::is_nil (ctx)) + { + DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - " + "Provided naming context is nil, component %s will not be registered.", + name)); + return false; + } + try { CosNaming::Name nm; @@ -82,6 +91,12 @@ namespace DAnCE { DANCE_TRACE ("Name_Utilities::bind_context"); + if (CORBA::is_nil (ctx)) + { + DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_context - " + "Provided naming context is nil, the naming context will not be bound.")); + } + CosNaming::Name newname (nm.length ()); for (CORBA::ULong i = 0; @@ -109,6 +124,13 @@ namespace DAnCE CosNaming::NamingContext_ptr ctx) { DANCE_TRACE ("Name_Utilities::unbind_object"); + + if (CORBA::is_nil (ctx)) + { + DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::unbind_object - " + "Provided naming context is nil, instance %s will not be unbound\n", + name)); + } CosNaming::Name nm; Name_Utilities::build_name (name, nm); diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 0ef8d58bfd8..c4dae455ef3 100644 --- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -24,6 +24,7 @@ #ifdef GEN_OSTREAM_OPS #include +#include #endif /* GEN_OSTREAM_OPS */ using namespace DAnCE; @@ -1558,7 +1559,12 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe providedReference.length())); #ifdef GEN_OSTREAM_OPS - std::cerr << providedReference << std::endl; + { + std::ostringstream pr_stream; + pr_stream << providedReference << std::endl; + DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_impl::finishLaunch - Provided references: %s", + pr_stream.str ().c_str ())); + } #endif /* GEN_OSTREAM_OPS */ for (unsigned int j = 0; j < this->plan_.connection.length(); ++j) @@ -1571,7 +1577,11 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe inst)); #ifdef GEN_OSTREAM_OPS - std::cerr << this->plan_.connection[j]; + { + std::ostringstream conn_stream; + conn_stream << this->plan_.connection[j] << std::endl; + DANCE_DEBUG ((LM_TRACE, "NodeApplication_impl::finishLaunch - Local connections: %s", conn_stream.str ().c_str ())); + } #endif /* GEN_OSTREAM_OPS */ Components::CCMObject_var obj = diff --git a/flat/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/flat/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp index 61e58edc94c..2c84c84ceb9 100644 --- a/flat/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp +++ b/flat/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp @@ -11,6 +11,7 @@ #ifdef GEN_OSTREAM_OPS #include +#include #endif /* GEN_OSTREAM_OPS */ namespace DAnCE @@ -100,7 +101,12 @@ namespace DAnCE "started for node %s and plan %s\n", this->name_.c_str(), plan.UUID.in())); #ifdef GEN_OSTREAM_OPS - std::cerr << plan << std::endl; + { + std::ostringstream plan_stream; + plan_stream << plan << std::endl; + DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::preparePlan - $s", + plan_stream.str ().c_str ())); + } #endif /* GEN_OSTREAM_OPS */ // resourceCommitment will be used on next development stage diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp index a3ba092d8ff..380d9a595d1 100644 --- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp +++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp @@ -171,14 +171,14 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[]) get_opts.opt_arg ())); this->options_.timeout_ = ACE_OS::atoi (get_opts.opt_arg ()); break; - + case 'd': DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - " - "Binding to provided Domain Naming Context: '%C'\n", + "Binding to provided Domain Naming Context: '%s'\n", get_opts.opt_arg ())); this->options_.domain_nc_ = get_opts.opt_arg (); break; - + case 'h': //case '?': // Display help for use of the server. //default: diff --git a/flat/CIAO/DAnCE/tests/MocksTest/MockTest.mpc b/flat/CIAO/DAnCE/tests/MocksTest/MockTest.mpc index 5f50a17473d..2de6e7bf904 100644 --- a/flat/CIAO/DAnCE/tests/MocksTest/MockTest.mpc +++ b/flat/CIAO/DAnCE/tests/MocksTest/MockTest.mpc @@ -2,6 +2,7 @@ // $Id$ project(*MockTest): dance, taoserver, naming, dance_mocks { + requires += ofccm exename = MockTest after += MockObject @@ -12,6 +13,7 @@ project(*MockTest): dance, taoserver, naming, dance_mocks { } project(*MockObject): dance_mocks{ + requires += ofccm sharedname = MockObject dynamicflags = MOCKTEST_BUILD_DLL diff --git a/flat/CIAO/examples/Hello/descriptors/run_test.pl b/flat/CIAO/examples/Hello/descriptors/run_test.pl index d19d255f639..02b7e48d8d6 100755 --- a/flat/CIAO/examples/Hello/descriptors/run_test.pl +++ b/flat/CIAO/examples/Hello/descriptors/run_test.pl @@ -72,17 +72,19 @@ sub run_node_daemons { $port = $ports[$i]; $nodename = $nodenames[$i]; $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_component_server"; + $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; $d_cmd = "$DAnCE/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -d 30"; + + print "$d_param"; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); $result = $Daemons[$i]->Spawn (); push(@processes, $Daemons[$i]); if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { + 30) == -1) { print STDERR "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; for (; $i >= 0; --$i) { -- cgit v1.2.1