From ed4d5e98e34dd6117542430242e098f7c7dbfadb Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Thu, 5 Feb 2009 14:44:03 +0000 Subject: ChangeLogTag: Thu Feb 5 14:40:18 UTC 2009 William R. Otte --- flat/CIAO/ChangeLog | 24 +- .../DAnCE/NodeApplication/NodeApplication_Impl.cpp | 14 +- .../EmitsConnectionExplicitHome_NS.cdp | 238 +++++++++++++++++ .../MultiplexConnectionExplicitHome_NS.cdp | 286 +++++++++++++++++++++ .../PublishConnectionExplicitHome_NS.cdp | 244 ++++++++++++++++++ .../SimplexConnectionExplicitHome_NS.cdp | 279 ++++++++++++++++++++ .../CIAO/ExecutionManager-Deployments/run_test.pl | 13 +- flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp | 16 +- 8 files changed, 1089 insertions(+), 25 deletions(-) create mode 100644 flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp create mode 100644 flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp create mode 100644 flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp create mode 100644 flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index 279ec437b92..79e4710ea0a 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,9 +1,21 @@ -Thu Feb 5 00:39:48 UTC 2009 William R. Otte +Thu Feb 5 14:40:18 UTC 2009 William R. Otte - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * tools/Config_Handlers/ERE_Handler.cpp: - Fixed a segmentation fault. + Fixes to enable external reference connections for non-provider connections. +Thu Feb 5 00:39:48 UTC 2009 William R. Otte + + * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: + + Fixed a segmentation fault. + * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp: * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp: * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp: @@ -11,9 +23,9 @@ Thu Feb 5 00:39:48 UTC 2009 William R. Otte * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp: * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - - Tests similar to those in NodeManager-Deployments, except across two nodes. - + + Tests similar to those in NodeManager-Deployments, except across two nodes. + Wed Feb 4 22:08:09 UTC 2009 William R. Otte * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index b8ef873ccad..e1f9c715a50 100644 --- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -1603,7 +1603,10 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe for (unsigned int i = 0; i < providedReference.length(); ++i) { - //DANCE_DEBUG((LM_DEBUG, "[%M] NodeApplication_impl::finishLaunch - loop on all connections iteration %d for connection %C\n", i, providedReference[i].name.in())); + /*DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " + "loop on all connections iteration %d for connection %C\n", + i, + providedReference[i].name.in()));*/ if (name.compare (providedReference[i].name.in()) == 0) { @@ -1681,7 +1684,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe if (CORBA::is_nil (ext_inst.in())) { DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - " - "facet for %C can't be narrowed \n", name.c_str ())); + "reference for %C can't be narrowed \n", name.c_str ())); + throw ::Deployment::InvalidConnection(); break; } try @@ -1884,9 +1888,9 @@ NodeApplication_Impl::connect_emitter_ext (Components::CCMObject_ptr inst, try { DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - " - "connect_consumer for %C started\n", port_name.c_str())); + "connect_emitter_ext for %C started\n", port_name.c_str())); inst->connect_consumer (port_name.c_str(), event); - DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect_consumer finished\n")); + DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect_emitter_ext finished\n")); } catch (const ::Components::AlreadyConnected& ) { @@ -1912,7 +1916,7 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst, if (CORBA::is_nil (inst)) { DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::connect_publisher - " - "Provided a nil CCMObject reference while connecting port %C\n", + "Provided a nil CCMObject reference while connecting port %C\n", port_name.c_str ())); throw ::Deployment::InvalidConnection (); } diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..6c01f6d36d6 --- /dev/null +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp @@ -0,0 +1,238 @@ + + + SimpleComponent_Home + + + + + + SimpleEmitterHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleEmitterHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleEmitterHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleEmitter_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleEmitter_exec + + + + + + + SimpleEmitterComponentImplementation + + + + + + + SimpleConsumerHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleConsumerHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleConsumerHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleConsumer_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleConsumer_exec + + + + + + + SimpleConsumerComponentImplementation + + + + + + + SimpleEmitterHome + NodeOne + + + + + + + SimpleEmitterComponent + NodeOne + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleEmitterHome + + + + + edu.vanderbilt.dre.DAnCE.RegisterNaming + + + tk_string + + + SimpleEmitterComponent + + + + + + + SimpleConsumerHome + NodeTwo + + + + + + + SimpleConsumerComponent + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleConsumerHome + + + + + + + TestConnection + + hello_ + true + EventConsumer + + + + corbaname:rir:/NameService#SimpleEmitterComponent + false + hello + Meaningless + + + + + + SimpleEmitter_exec + + + SimpleEmitter_exec + + + SimpleEmitter_svnt + + + SimpleEmitter_svnt + + + + SimpleConsumer_exec + + + SimpleConsumer_exec + + + SimpleConsumer_svnt + + + SimpleConsumer_svnt + + + diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..dc865e8d0a3 --- /dev/null +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp @@ -0,0 +1,286 @@ + + + SimpleComponent_Home + + + + + + SimpleProviderHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleProviderHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleProviderHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleProvider_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleProvider_exec + + + + + + + SimpleProviderComponentImplementation + + + + + + + SimpleMultipleUserHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleMultipleUserHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleMultipleUserHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleMultipleUser_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleMultipleUser_exec + + + + + + + SimpleMultipleUserComponentImplementation + + + + + + + SimpleProviderHome + NodeOne + + + + + + + SimpleProviderComponent + NodeOne + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleProviderHome + + + + + + + SimpleMultipleUserHome + NodeTwo + + + + + + + SimpleMultipleUserComponent + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleMultipleUserHome + + + + + edu.vanderbilt.dre.DAnCE.RegisterNaming + + + tk_string + + + SimpleMultipleUserComponent + + + + + + + SimpleMultipleUserComponentReverse + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleMultipleUserHome + + + + + + + TestConnection + + trig + true + Facet + + + + corbaname:rir:/NameService#SimpleMultipleUserComponent + false + trig + Meaningless + + + + + + TestConnectionReverse + + trig + true + Facet + + + + corbaname:rir:/NameService#SimpleMultipleUserComponent + false + trig + Meaningless + + + + + + + SimpleProvider_exec + + + SimpleProvider_exec + + + SimpleProvider_svnt + + + SimpleProvider_svnt + + + + SimpleMultipleUser_exec + + + SimpleMultipleUser_exec + + + SimpleMultipleUser_svnt + + + SimpleMultipleUser_svnt + + + diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..054e7964bea --- /dev/null +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp @@ -0,0 +1,244 @@ + + + SimpleComponent_Home + + + + + + SimplePublisherHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimplePublisherHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimplePublisherHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimplePublisher_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimplePublisher_exec + + + + + + + SimplePublisherComponentImplementation + + + + + + + SimpleConsumerHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleConsumerHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleConsumerHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleConsumer_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleConsumer_exec + + + + + + + SimpleConsumerComponentImplementation + + + + + + + SimplePublisherHome + NodeOne + + + + + + + SimplePublisherComponent + NodeOne + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimplePublisherHome + + + + + edu.vanderbilt.dre.DAnCE.RegisterNaming + + + tk_string + + + SimplePublisherComponentInstance + + + + + + + SimpleConsumerHome + NodeTwo + + + + + + + SimpleConsumerComponent + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleConsumerHome + + + + + + + TestConnection + + + hello_ + true + EventConsumer + + + + corbaname:rir:/NameService#SimplePublisherComponentInstance + false + hello + Meaningless + + + + + + SimplePublisher_exec + + + SimplePublisher_exec + + + SimplePublisher_svnt + + + SimplePublisher_svnt + + + + SimpleConsumer_exec + + + SimpleConsumer_exec + + + SimpleConsumer_svnt + + + SimpleConsumer_svnt + + + diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp new file mode 100644 index 00000000000..c60ad818d6f --- /dev/null +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp @@ -0,0 +1,279 @@ + + + SimpleComponent_Home + + + + + + SimpleProviderHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleProviderHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleProviderHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleProvider_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleProvider_exec + + + + + + + SimpleProviderComponentImplementation + + + + + + + SimpleUserHomeImplementation + + + + + + home factory + + + tk_string + + + create_Simple_SimpleUserHome_Impl + + + + + edu.vanderbilt.dre.CIAO.ServantEntrypoint + + + tk_string + + + create_Simple_SimpleUserHome_Servant + + + + + edu.vanderbilt.dre.CIAO.ServantArtifact + + + tk_string + + + SimpleUser_svnt + + + + + edu.vanderbilt.dre.CIAO.ExecutorArtifact + + + tk_string + + + SimpleUser_exec + + + + + + + SimpleUserComponentImplementation + + + + + + + SimpleProviderHome + NodeOne + + + + + + + SimpleProviderComponent + NodeOne + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleProviderHome + + + + + + + SimpleUserHome + NodeTwo + + + + + + + SimpleUserComponent + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleUserHome + + + + + edu.vanderbilt.dre.DAnCE.RegisterNaming + + + tk_string + + + SimpleUserComponent + + + + + + + SimpleUserComponentReverse + NodeTwo + + + + + edu.vanderbilt.dre.DAnCE.ExplicitHome + + + tk_string + + + SimpleUserHome + + + + + + + TestConnection + + trig + true + Facet + + + + + corbaname:rir:/NameService#SimpleUserComponent + false + trig + Meaningless + + + + + TestConnectionReverse + + trig + false + SimplexReceptacle + + + + trig + true + Facet + + + + + + + SimpleProvider_exec + + + SimpleProvider_exec + + + SimpleProvider_svnt + + + SimpleProvider_svnt + + + + SimpleUser_exec + + + SimpleUser_exec + + + SimpleUser_svnt + + + SimpleUser_svnt + + + diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index e69442ce9d2..b357e74d537 100755 --- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl @@ -92,9 +92,16 @@ sub run_node_daemons { return 0; } -opendir(DIR, "."); -@files = grep(/\.cdp$/,readdir(DIR)); -closedir(DIR); +print "$#ARGV"; + +if ($#ARGV == -1) +{ + opendir(DIR, "."); + @files = grep(/\.cdp$/,readdir(DIR)); + closedir(DIR); +} else { + @files = @ARGV; +} foreach $file (@files) { print "Starting test for deployment $file\n"; diff --git a/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp index ba16cd23e81..8a8a8f31666 100644 --- a/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp +++ b/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp @@ -25,7 +25,7 @@ namespace CIAO ++erep_b) { ERE_Handler::handle_external_ref_endpoint ((*erep_b), - dest[pos++]); + dest[pos++]); } } @@ -35,20 +35,14 @@ namespace CIAO Deployment::ExternalReferenceEndpoint &dest) { CIAO_TRACE("ERE_Handler::external_ref_endpoint"); - dest.location = - src.location ().c_str (); - - dest.provider = - src.provider (); - - dest.portName = - src.portName ().c_str (); - + dest.location = src.location ().c_str (); + dest.provider = src.provider (); + if (src.portName_p ()) + dest.portName = src.portName ().c_str (); dest.supportedType.length (src.count_supportedType ()); std::for_each (src.begin_supportedType (), src.end_supportedType (), String_Seq_Functor (dest.supportedType)); - } ExternalReferenceEndpoint -- cgit v1.2.1