diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 14:35:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-17 14:35:21 +0000 |
| commit | a7171b8f3101d1c5e0dd60fb43dea9dd4c2ac822 (patch) | |
| tree | fa9f84762deb43f6e923ca1a3d5d40f6d73886a4 | |
| parent | eb089f0f88a58fb435790e1f21789e86fe6bf846 (diff) | |
| download | ATCD-a7171b8f3101d1c5e0dd60fb43dea9dd4c2ac822.tar.gz | |
Mon Nov 17 14:34:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
21 files changed, 489 insertions, 463 deletions
diff --git a/flat/CIAO/CIDLC/ServantSourceGenerator.cpp b/flat/CIAO/CIDLC/ServantSourceGenerator.cpp index 7532db1f8c8..96b4d1510d9 100644 --- a/flat/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/flat/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -861,7 +861,7 @@ namespace os << "if (! result.second)" << endl << "{" << "ACE_ERROR_RETURN ((LM_ERROR," << endl - << "\"subscribe on %s failed\\n\"," << endl + << "\"subscribe on %C failed\\n\"," << endl << "\"" << p.name () << "\")," << endl << "0);" << "}"; @@ -911,7 +911,7 @@ namespace os << "if (! result.second)" << endl << "{" << "ACE_ERROR_RETURN ((LM_ERROR," << endl - << "\"generic subscribe on %s failed\\n\"," << endl + << "\"generic subscribe on %C failed\\n\"," << endl << "\"" << p.name () << "\")," << endl << "0);" << "}"; @@ -1957,7 +1957,7 @@ namespace << "this)," << endl << "::CORBA::NO_MEMORY ());" << endl << "::CIAO::Port_Activator_var pa = tmp;" << endl; - + os << "::CIAO::Servant_Activator_var sa = " << endl << "this->container_->ports_servant_activator ();" << endl << "if (!sa->register_port_activator (pa._retn ()))" << endl diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index 70a4ed08ad8..380e2d7e629 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,3 +1,27 @@ +Mon Nov 17 14:34:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Client_init.cpp + * ciao/ComponentServer/CIAO_ComponentServer.cpp + * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp + * ciao/ComponentServer/CIAO_Container_Impl.cpp + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp + * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp + * ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp + * ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp + * ciao/Containers/Container_Base.cpp + * ciao/Containers/Servant_Activator.cpp + * ciao/Containers/Session/Session_Container.cpp + * ciao/Servants/Servant_Impl_Base.cpp + * ciao/Server_init.cpp + * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp + * CIDLC/ServantSourceGenerator.cpp + * DAnCE/DomainApplication/Domain_Application_Impl.cpp + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/DomainApplicationManager/Node_Locator.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp + Layout, %s->%C changes + Mon Nov 17 14:17:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/Deployment/DAnCE_Core.mpc: diff --git a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp index f2c442861b5..c0071734191 100644 --- a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp +++ b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp @@ -8,10 +8,11 @@ namespace DAnCE { - DomainApplication_Impl::DomainApplication_Impl (TNam2Nm & nams, - const Deployment::Properties & configProperty, - Deployment::Connections& conn) - : nams_ (nams) + DomainApplication_Impl::DomainApplication_Impl ( + TNam2Nm & nams, + const Deployment::Properties & configProperty, + Deployment::Connections& conn) + : nams_ (nams) { DANCE_TRACE("DomainApplication_Impl::DomainApplication_Impl"); this->startLaunch (configProperty); @@ -24,23 +25,24 @@ namespace DAnCE try { - for (TApp2Mgr::iterator iter = this->node_applications_.begin(); - iter != this->node_applications_.end(); - ++iter) - { - (*iter).int_id_->destroyApplication ( (*iter).ext_id_.in()); - } - this->node_applications_.unbind_all(); + for (TApp2Mgr::iterator iter = this->node_applications_.begin(); + iter != this->node_applications_.end(); + ++iter) + { + (*iter).int_id_->destroyApplication ( (*iter).ext_id_.in()); + } + this->node_applications_.unbind_all(); } catch (CORBA::Exception &e) { - DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - " - "caught a CORBA exception %s(%s) \"%s\"\n", - e._name(), e._rep_id(), e._info().c_str())); + DANCE_ERROR((LM_ERROR, DLINFO + "DomainApplication_Impl::~DomainApplication_Impl - " + "caught a CORBA exception %C(%C) \"%C\"\n", + e._name(), e._rep_id(), e._info().c_str())); } catch(...) { - DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - " + DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - " "caught an unknown exception.\n")); } } @@ -76,7 +78,7 @@ namespace DAnCE DomainApplication_Impl::startLaunch (const Deployment::Properties & configProperty) { DANCE_TRACE ("DomainApplication_Impl::startLaunch"); - + for (TNam2Nm::iterator iter = this->nams_.begin(); iter != this->nams_.end(); ++iter) @@ -88,7 +90,7 @@ namespace DAnCE //Deployment::NodeApplication_ptr na = Deployment::NodeApplication::_narrow (a); if (CORBA::is_nil (na)) { - DANCE_ERROR ((LM_ERROR, DLINFO + DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplication_Impl::startLaunch -" "Received nil object reference from startLaunch on node managers.\n")); throw Deployment::StartError(); @@ -106,7 +108,7 @@ namespace DAnCE this->connections_[before+i] = (*conn) [i]; } } - + DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplication_Impl::startLaunch - " "Received %u connections from applications\n", this->connections_.length ())); diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 1278f9b2d0e..34cd5ccf553 100644 --- a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -18,7 +18,7 @@ DomainApplicationManager_Impl::DomainApplicationManager_Impl (CORBA::ORB_ptr orb DANCE_TRACE(DLINFO "DomainApplicationManager_Impl::DomainApplicationManager_Impl"); this->preparePlan(); DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::DomainApplicationManager_Impl - " - "Successfully prepared plan : %s\n", this->plan_.UUID.in())); + "Successfully prepared plan : %C\n", this->plan_.UUID.in())); } DomainApplicationManager_Impl::~DomainApplicationManager_Impl() @@ -65,13 +65,13 @@ DomainApplicationManager_Impl::startLaunch (const Deployment::Properties & confi CORBA::NO_MEMORY ()); DomainApplication_Impl* app; ACE_NEW_THROW_EX (app, - DomainApplication_Impl (this->sub_app_mgr_, - configProperty, + DomainApplication_Impl (this->sub_app_mgr_, + configProperty, connections.inout()), CORBA::NO_MEMORY()); providedReference = connections._retn(); - + PortableServer::ObjectId_var id = this->poa_->activate_object (app); this->running_app_.push_back(app); @@ -127,7 +127,7 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a "Caught unknown exception.")); throw Deployment::StopError(); } - + ACE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_impl::destroyApplication - " "Provided application reference unknown\n")); throw Deployment::StopError(); @@ -183,9 +183,9 @@ dump_connections (const ::Deployment::Connections & /*connections*/) const // const CORBA::ULong conn_len = connections.length (); // for (CORBA::ULong i = 0; i < conn_len; ++i) // { - // DANCE_DEBUG((LM_DEBUG, "[%M] instanceName: %s\n", connections[i].instanceName.in ())); + // DANCE_DEBUG((LM_DEBUG, "[%M] instanceName: %C\n", connections[i].instanceName.in ())); // - // DANCE_DEBUG((LM_DEBUG, "[%M] portName: %s\n", connections[i].portName.in ())); + // DANCE_DEBUG((LM_DEBUG, "[%M] portName: %C\n", connections[i].portName.in ())); // // DANCE_DEBUG((LM_DEBUG, "[%M] portkind: ")); // @@ -225,10 +225,10 @@ dump_connections (const ::Deployment::Connections & /*connections*/) const // DANCE_DEBUG((LM_DEBUG, "[%M] Unknown port kind.\n")); // } // - // DANCE_DEBUG((LM_DEBUG, "[%M] endpointInstanceName: %s\n", + // DANCE_DEBUG((LM_DEBUG, "[%M] endpointInstanceName: %C\n", // connections[i].endpointInstanceName.in ())); // - // DANCE_DEBUG((LM_DEBUG, "[%M] endpointPortName: %s\n", + // DANCE_DEBUG((LM_DEBUG, "[%M] endpointPortName: %C\n", // connections[i].endpointPortName.in ())); // DANCE_DEBUG((LM_DEBUG, "[%M] ---------------------\n")); // } @@ -273,15 +273,15 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl tmp_plan.infoProperty = plan.infoProperty; sub_plans.bind (node, tmp_plan); - + DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Created sub-plan for node %s with UUID %s\n", + "Created sub-plan for node %C with UUID %C\n", node.c_str (), child_uuid.c_str ())); } - + DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::split_plan - " "First phase produced %u child plans, proceeding to second\n")); - + // (1) Iterate over the <instance> field of the global DeploymentPlan // structure. // (2) Retrieve the necessary information to contruct the node-level @@ -289,7 +289,7 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl for (CORBA::ULong i = 0; i < plan.instance.length (); ++i) { DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "Processing instance : %s\n", plan.instance[i].name.in())); + "Processing instance : %C\n", plan.instance[i].name.in())); // @@TODO Fill in the child deployment plan in the map. // If the component instance already exists in the child plan, // then we overwrite the existing instance, since the new instance @@ -304,7 +304,7 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl if (0 != sub_plans.find (ACE_CString (my_instance.node.in()), child_plan)) { DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::split_plan - " - "ERROR: Unable to find sub-plan for instance %s\n", + "ERROR: Unable to find sub-plan for instance %C\n", my_instance.node.in ())); } @@ -367,12 +367,12 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl for (CORBA::ULong j = 0; j < plan.connection.length(); ++j) { DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "For connection : %s\n", plan.connection[j].name.in())); + "For connection : %C\n", plan.connection[j].name.in())); for (CORBA::ULong k = 0; k < plan.connection[j].internalEndpoint.length(); ++k) { DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplicationManager_Impl::split_plan - " - "For endpoint : %s(%s)\n", - plan.connection[j].internalEndpoint[k].portName.in(), + "For endpoint : %C(%C)\n", + plan.connection[j].internalEndpoint[k].portName.in(), plan.connection[j].internalEndpoint[k].provider ? "provider" : "client")); if (i == plan.connection[j].internalEndpoint[k].instanceRef) // the instance (i) is referenced by the connection { @@ -414,7 +414,7 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl for (TNodePlans::iterator it = sub_plans.begin(); it != sub_plans.end(); ++it) { cnt += (*it).int_id_.connection.length(); - // DANCE_DEBUG((LM_DEBUG, "[%M] Dumping deployment plan #%s:\n", (*it).ext_id_.c_str())); + // DANCE_DEBUG((LM_DEBUG, "[%M] Dumping deployment plan #%C:\n", (*it).ext_id_.c_str())); // Deployment::DnC_Dump::dump((*it).int_id_); } DANCE_DEBUG ((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::split_plan - " @@ -425,7 +425,7 @@ void DomainApplicationManager_Impl::preparePlan() { DANCE_TRACE ("DomainApplicationManager_Impl::preparePlan()"); - + try { // Map of sub plans for each node @@ -444,14 +444,14 @@ DomainApplicationManager_Impl::preparePlan() if (CORBA::is_nil (nm.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Deployment::StartError exception. NodeManager %s cannot be found\n", + "Deployment::StartError exception. NodeManager %C cannot be found\n", (*iter_plans).ext_id_.c_str())); throw Deployment::StartError ( (*iter_plans).ext_id_.c_str(), "NodeManager not found"); } // Calling preparePlan for node, specified in current sub plan DANCE_DEBUG((LM_TRACE, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Calling preparePlan on node %s\n", + "Calling preparePlan on node %C\n", (*iter_plans).ext_id_.c_str())); Deployment::NodeApplicationManager_ptr nam @@ -461,16 +461,16 @@ DomainApplicationManager_Impl::preparePlan() if (CORBA::is_nil (nam)) { DANCE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "PreparePlan failed for node %s, returning a nill " + "PreparePlan failed for node %C, returning a nill " "NodeApplicationManager poiniter.\n", (*iter_plans).ext_id_.c_str())); throw ::Deployment::StartError(); } // We save NAM reference ptr in TNodes vector were it places to var variable this->sub_app_mgr_.bind (nam, nm); - + DANCE_DEBUG ((LM_INFO, DLINFO "DomainApplicationManager_Impl::preparePlan - " - "Sucessfully prepared node %s for deployment\n", + "Sucessfully prepared node %C for deployment\n", (*iter_plans).ext_id_.c_str())); } } diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp index 57e4c34cd88..7c7043f89fa 100644 --- a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp +++ b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp @@ -11,20 +11,20 @@ namespace DAnCE CosNaming::NamingContext_var nc) : orb_ (CORBA::ORB::_duplicate (orb)), nc_ (CosNaming::NamingContext::_duplicate (nc)) - { + { } - + ::Deployment::NodeManager_ptr Node_Locator::locate_node (const ACE_TCHAR *name) { ACE_CString ior; - + if (this->nodes_.find (name, ior) == 0) return this->resolve_ior (name, ior.c_str ()); else return this->ns_lookup (name); } - + bool Node_Locator::process_node_map (const ACE_TCHAR *filename) { @@ -36,9 +36,9 @@ namespace DAnCE "Error: Provided with nil filename\n")); return false; } - + FILE *inf = ACE_OS::fopen (filename, "r"); - + if (inf == 0) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::process_node_map - " @@ -48,7 +48,7 @@ namespace DAnCE } ACE_Read_Buffer reader (inf, true); - + char* string = 0; // Read from the file line by line while ((string = reader.read ('\n')) != 0) @@ -59,33 +59,33 @@ namespace DAnCE const char* ior_start = ACE_OS::strrchr (string, ' '); // Search from the left to the first space const char* dest_end = ACE_OS::strchr (string, ' '); - + // The destination is first followed by some spaces ACE_CString destination (string, dest_end - string); // And then the IOR ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1)); reader.alloc ()->free (string); - + DANCE_DEBUG ((LM_INFO, DLINFO "Node_Locator::process_node_map - " - "Storing IOR %s for destination %s\n", + "Storing IOR %C for destination %C\n", ior.c_str (), destination.c_str ())); this->nodes_.bind (destination, ior); } - + return true; } - + ::Deployment::NodeManager_ptr Node_Locator::resolve_ior (const ACE_TCHAR *name, const ACE_TCHAR *ior) { DANCE_TRACE ("Node_Locator::resolve_ior"); - + DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Locator::resolve_ior - " "Resolving ior %s for destination %s\n", ior, name)); - + CORBA::Object_var obj = this->orb_->string_to_object (ior); - + if (CORBA::is_nil (obj.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::resolve_ior - " @@ -94,9 +94,9 @@ namespace DAnCE name, ior)); return false; } - + ::Deployment::NodeManager_var nm = ::Deployment::NodeManager::_narrow (obj.in ()); - + if (CORBA::is_nil (nm.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::resolve_ior - " @@ -105,22 +105,22 @@ namespace DAnCE name, ior)); return false; } - + return nm._retn (); } - + void Node_Locator::store_ior (const ACE_TCHAR *name, const ACE_TCHAR *ior) { DANCE_TRACE ("Node_Locator::store_ior"); this->nodes_.bind (name, ior); } - + ::Deployment::NodeManager_ptr Node_Locator::ns_lookup (const ACE_TCHAR *nodename) { DANCE_TRACE ("Node_Locator::ns_lookup"); - + if (CORBA::is_nil (this->nc_.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " @@ -128,17 +128,17 @@ namespace DAnCE nodename)); return ::Deployment::NodeManager::_nil (); } - + try { CosNaming::Name name; name.length (1); - + name[0].id = nodename; - + CORBA::Object_var obj = this->nc_->resolve (name); ::Deployment::NodeManager_var nm = ::Deployment::NodeManager::_narrow (obj.in ()); - + if (CORBA::is_nil (nm.in ())) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " @@ -146,20 +146,20 @@ namespace DAnCE nodename)); return ::Deployment::NodeManager::_nil (); } - + return nm._retn (); } catch (CORBA::Exception &e) { DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - " - "Caught CORBA exception while looking up name %s:%s\n", + "Caught CORBA exception while looking up name %s:%C\n", nodename, e._info ().c_str ())); } catch (...) { - + } - + return ::Deployment::NodeManager::_nil (); } } diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp index 50cd420b160..5b1bb72f370 100644 --- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp +++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp @@ -12,7 +12,7 @@ using namespace DAnCE; ExecutionManager_Impl::ExecutionManager_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, CosNaming::NamingContext_ptr nc) - : orb_ (CORBA::ORB::_duplicate (orb)), + : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)), locator_ (orb, nc) { @@ -27,7 +27,7 @@ ExecutionManager_Impl::~ExecutionManager_Impl() ++iter) { DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " - "deactivating DAM \"%s\"\n", (*iter).ext_id_.c_str())); + "deactivating DAM \"%C\"\n", (*iter).ext_id_.c_str())); PortableServer::ObjectId_var id = this->poa_->servant_to_id ( (*iter).int_id_); DANCE_DEBUG ((LM_TRACE, DLINFO "ExecutionManager_Impl::~ExecutionManager_Impl - " "before deactivate_object...\n")); @@ -46,7 +46,7 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan, { DANCE_TRACE ( "ExecutionManager_Impl::preparePlan"); - // Check if plan is already deployed. + // Check if plan is already deployed. DomainApplicationManager_Impl * dam = 0; if (0 == this->managers_.find (plan.UUID.in(), dam)) { @@ -73,7 +73,7 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan, PortableServer::ObjectId_var id = this->poa_->activate_object (dam_servant); DANCE_DEBUG((LM_NOTICE, DLINFO "ExecutionManager_Impl::preparePlan - " - "Plan with UUID %s was successfully prepared.\n")); + "Plan with UUID %C was successfully prepared.\n")); CORBA::Object_var ref = this->poa_->id_to_reference (id.in()); return Deployment::DomainApplicationManager::_narrow (ref.in ()); } @@ -82,7 +82,7 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan, ExecutionManager_Impl::getManagers () { DANCE_TRACE ( "ExecutionManager_Impl::getManagers ()"); - + ::Deployment::DomainApplicationManagers * managers; ACE_NEW_THROW_EX (managers, ::Deployment::DomainApplicationManagers(), @@ -134,7 +134,7 @@ ExecutionManager_Impl::destroyManager (::Deployment::DomainApplicationManager_pt // This one derived from ExecutionManagerDaemon interface // for shutdowning DAnCE agent -void +void ExecutionManager_Impl::shutdown () { DANCE_TRACE ("ExecutionManager_Impl::shutdown"); @@ -142,15 +142,15 @@ ExecutionManager_Impl::shutdown () } -void -ExecutionManager_Impl::add_node_manager (const ACE_TCHAR *name, +void +ExecutionManager_Impl::add_node_manager (const ACE_TCHAR *name, const ACE_TCHAR *ior) { DANCE_TRACE ("ExecutionManager_Impl::add_node_manager"); this->locator_.store_ior (name, ior); } -void +void ExecutionManager_Impl::load_node_map (const ACE_TCHAR *filename) { DANCE_TRACE ("ExecutionManager_Impl::add_node_manager"); diff --git a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp index 7cc0990fee1..79b5acaa00d 100644 --- a/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp +++ b/flat/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp @@ -46,11 +46,11 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ CORBA::ORB_ptr ) { DANCE_TRACE ("ComponentAttributesSetter::SetComponentAttributes"); - + for (unsigned int i = 0; i < prop.length(); i++) { ACE_CString name = prop[i].name.in(); - // Ignore configuration properties, since attributes can't have . in them, this seems like a good method. + // Ignore configuration properties, since attributes can't have . in them, this seems like a good method. if (name.find (".") != ACE_CString::npos) { continue; @@ -62,12 +62,12 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ method += prop[i].name.in(); CORBA::Request_ptr req (0); - + try { req = obj->_request (method.c_str ()); req->add_in_arg ("x") = prop[i].value; - + req->invoke(); CORBA::release (req); } @@ -75,7 +75,7 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/ { DANCE_ERROR ((LM_WARNING, DLINFO "ComponentAttributesSetter::SetComponentAttributes - " - "Caught BAD_OPERATION while trying to set attribute %s\n", + "Caught BAD_OPERATION while trying to set attribute %C\n", name.c_str ())); } catch (const CORBA::Exception &e) diff --git a/flat/CIAO/ciao/Client_init.cpp b/flat/CIAO/ciao/Client_init.cpp index 82c8541e11f..71392596fa0 100644 --- a/flat/CIAO/ciao/Client_init.cpp +++ b/flat/CIAO/ciao/Client_init.cpp @@ -38,53 +38,53 @@ namespace CIAO { namespace Utility { - void build_config_values_map (CONFIGVALUE_MAP &map, + void build_config_values_map (CONFIGVALUE_MAP &map, const ::Components::ConfigValues &config) { CIAO_TRACE("CIAO::build_config_values_map"); map.unbind_all (); - + for (CORBA::ULong i = 0; i < config.length (); ++i) { int retval = map.rebind (config[i]->name (), config[i]->value ()); - + if (retval == 1) { - CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Duplicate value for %s encountered, " + CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Duplicate value for %C encountered, " "old value overwritten.\n", config[i]->name ())); } else if (retval == -1) { - CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Error binding value for %s, ignoring.\n", + CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Error binding value for %C, ignoring.\n", config[i]->name ())); } CIAO_DEBUG ((LM_TRACE, CLINFO - "build_config_values_map: Bound value for config value %s\n", + "build_config_values_map: Bound value for config value %C\n", config[i]->name ())); } } - - void build_config_values_sequence (::Components::ConfigValues &config, + + void build_config_values_sequence (::Components::ConfigValues &config, const CONFIGVALUE_MAP &map) { CIAO_TRACE ("CIAO::build_config_values_sequence"); - + config.length (map.current_size ()); - + CORBA::ULong pos = 0; - + for (CONFIGVALUE_MAP::const_iterator i = map.begin (); (i.advance ()) != 0; ++pos) { Components::ConfigValue_var newval; - ACE_NEW_THROW_EX (newval, - ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), + ACE_NEW_THROW_EX (newval, + ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), CORBA::NO_MEMORY ()); config[pos] = newval._retn (); } } - + /* void print_config_values (const ::Components::ConfigValues &config, ACE_Log_Priority prio, @@ -94,9 +94,9 @@ namespace CIAO for (CORBA::ULong i = 0; i < config.length (); ++i) { ACE_CString - CIAO_DEBUG ((prio, pfx + - - + CIAO_DEBUG ((prio, pfx + + + } */ diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp index 195d115d9d1..18eca73d467 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp @@ -37,7 +37,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv) CIAO_DISABLE_TRACE (); CIAO_TRACE ("CIAO_ComponentServer::ACE_TMAIN"); - + try { CIAO::Deployment::ComponentServer_Task cs (argc, argv); @@ -46,14 +46,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv) } catch (CIAO::Deployment::ComponentServer_Task::Error &e) { - CIAO_DEBUG ((LM_ALERT, CLINFO "CIAO_ComponentServer main: Caught ComponentServer exception: %s\n", + CIAO_DEBUG ((LM_ALERT, CLINFO "CIAO_ComponentServer main: Caught ComponentServer exception: %C\n", e.err_.c_str ())); } catch (...) { CIAO_DEBUG ((LM_ALERT, CLINFO "CIAO_ComponentServer main: Caught unknown exception.\n")); } - + return -1; } @@ -64,7 +64,7 @@ write_IOR (const char * ior_file_name, const char* ior) { FILE* ior_output_file_ = ACE_OS::fopen (ior_file_name, "w"); - + if (ior_output_file_) { ACE_OS::fprintf (ior_output_file_, @@ -86,17 +86,17 @@ namespace CIAO callback_ior_str_ ("") { CIAO_TRACE ("CIAO_ComponentServer_Task::CIAO_ComponentServer_Task ()"); - + Logger_Service *clf = ACE_Dynamic_Service<Logger_Service>::instance ("CIAO_Logger_Backend_Factory"); - + if (!clf) clf = new Logger_Service; - + this->logger_.reset (clf); - + this->logger_->init (argc, argv); - + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_Task::CIAO_ComponentServer_Task - " "Creating server object\n")); Configurator_Factory cf; @@ -109,7 +109,7 @@ namespace CIAO "Error configuring ComponentServer configurator, exiting.\n")); throw Error ("Unable to load ComponentServer configurator."); } - + this->configurator_->pre_orb_initialize (); @@ -121,36 +121,36 @@ namespace CIAO this->parse_args (argc, argv); this->configure_logging_backend (); - + CIAO::Server_init (this->orb_.in ()); - + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_Task::CIAO_ComponentServer_Task - " "CIAO_ComponentServer object created.\n")); } - - int + + int ComponentServer_Task::svc (void) { CIAO_TRACE ("ComponentServer_Task::svc"); - + CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "Activating the root POA\n")); CORBA::Object_var object = this->orb_->resolve_initial_references ("RootPOA"); - + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in ()); - + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - + poa_manager->activate (); CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "Creating server implementation object\n")); CIAO::Deployment::CIAO_ComponentServer_i *ci_srv = 0; ACE_NEW_NORETURN (ci_srv, CIAO_ComponentServer_i (this->uuid_, this->orb_.in (), root_poa.in ())); - + if (ci_srv == 0) { CIAO_ERROR ((LM_CRITICAL, "ComponentServer_Task::run - " @@ -174,19 +174,19 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO " resolving callback IOR\n")); CORBA::Object_ptr obj = this->orb_->string_to_object (this->callback_ior_str_.c_str ()); ServerActivator_var sa (ServerActivator::_narrow (obj)); - + if (CORBA::is_nil (sa.in ())) { CIAO_DEBUG ((LM_ERROR, CLINFO "ComponentServer_Task::svc - " "Failed to narrow callback IOR\n")); throw Error ("Faled to narrow callback IOR"); } - + Components::ConfigValues_var config; - { + { Components::ConfigValues *cf; ACE_NEW_NORETURN (cf, Components::ConfigValues (0)); - + if (cf == 0) { CIAO_ERROR ((LM_CRITICAL, "ComponentServer_Task::run - " @@ -198,27 +198,27 @@ namespace CIAO // Make callback. CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "Making callback on my ServerActivator\n")); - + CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "Calling back to ServerActivator\n")); - + try { // Callback to NodeApplication to get configuration sa->component_server_callback (cs.in (), this->uuid_.c_str (), config.out ()); - + CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "Configuration received\n")); // @@WO: Probably need to do something with these config values. - + ci_srv->init (sa.in (), config._retn ()); - + CIAO_DEBUG ((LM_NOTICE, CLINFO "ComponentServer_Task::svc - " - "Configuration complete for component server %s\n", + "Configuration complete for component server %C\n", this->uuid_.c_str ())); - + sa->configuration_complete (this->uuid_.c_str ()); } catch (CORBA::BAD_PARAM &) @@ -233,7 +233,7 @@ namespace CIAO "Caught exception while calling back\n")); throw Error ("Caught exception while calling back"); } - + } else { @@ -241,36 +241,36 @@ namespace CIAO "Initializing ComponentServer without ServantActivator callback\n")); ci_srv->init (0, 0); } - + this->orb_->run (); CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - " "ORB Event loop completed.\n")); - + root_poa->destroy (1, 1); - + this->orb_->destroy (); - + return 0; } - - void + + void ComponentServer_Task::run (void) { CIAO_TRACE ("ComponentServer_Task::run"); - + if (this->configurator_->rt_support ()) { CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::run - Starting ORB with RT support\n")); - + this->check_supported_priorities (); - + // spawn a thread // Task activation flags. long flags = THR_NEW_LWP | THR_JOINABLE | this->orb_->orb_core ()->orb_params ()->thread_creation_flags (); - + // Activate task. int result = this->activate (flags); @@ -279,7 +279,7 @@ namespace CIAO if (errno == EPERM) { CIAO_ERROR ((LM_EMERGENCY, CLINFO - "ComponentServer_Task::run - Cannot create thread with scheduling policy %s\n" + "ComponentServer_Task::run - Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program. " "Check svc.conf options and/or run as root\n", sched_policy_name (this->orb_->orb_core ()->orb_params ()->ace_sched_policy ()))); @@ -295,8 +295,8 @@ namespace CIAO if (result != -1) throw Error ("Unknown error waiting for ORB thread to complete"); - - CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB thread completed, terminating ComponentServer %s\n", + + CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB thread completed, terminating ComponentServer %C\n", this->uuid_.c_str ())); } else @@ -306,15 +306,15 @@ namespace CIAO CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB has shutdown, terminating ComponentServer \n")); } } - + void ComponentServer_Task::parse_args (int argc, ACE_TCHAR **argv) { CIAO_TRACE ("ComponentServer_Task::parse_args"); - + CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::parse_args - parsing arguments...\n")); - - ACE_Get_Opt opts (argc, argv, "hu:c:", 1, 0, + + ACE_Get_Opt opts (argc, argv, ACE_TEXT("hu:c:"), 1, 0, ACE_Get_Opt::RETURN_IN_ORDER); opts.long_option ("uuid", 'u', ACE_Get_Opt::ARG_REQUIRED); opts.long_option ("callback-ior", 'c', ACE_Get_Opt::ARG_REQUIRED); @@ -326,13 +326,13 @@ namespace CIAO //int j; char c; ACE_CString s; - + while ((c = opts ()) != -1) { CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::parse_args - " "Found option: \"%s\" with argument \"%s\"\n", opts.last_option (), opts.opt_arg ())); - + switch (c) { case 'u': @@ -341,7 +341,7 @@ namespace CIAO opts.opt_arg ())); this->uuid_ = opts.opt_arg (); break; - + case 'c': CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::parse_args - " "callback ior is %s\n", @@ -353,21 +353,21 @@ namespace CIAO { continue; // no-op, already taken care of } - + case 't': continue; // already taken care of - + case 'o': CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::parse_args - " "IOR Output file: %s\n", opts.opt_arg ())); this->output_file_ = opts.opt_arg (); break; - + case 'h': this->usage (); throw Error ("Command line help requested, bailing out...."); - + default: CIAO_ERROR ((LM_ERROR, CLINFO " Unknown option: %s\n", opts.last_option ())); @@ -377,7 +377,7 @@ namespace CIAO throw Error (err); } } - + // check required options. if (this->uuid_ == "") throw Error ("Option required: -u|--uuid"); @@ -385,7 +385,7 @@ namespace CIAO CIAO_ERROR ((LM_WARNING, CLINFO "ComponentServer_Task::parse_args - Starting ComponentServer without a callback IOR\n")); } - + void ComponentServer_Task::usage (void) { @@ -399,14 +399,14 @@ namespace CIAO "\t-c|--callback-ior <string ior>\t\tSets callback url for the spawning ServerActivator.\n" "\t-o|--output-ior <filename>\t\tOutputs the IOR of the component server object to file\n" )); - + } - + const char * ComponentServer_Task::sched_policy_name (int sched_policy) { const char *name = 0; - + switch (sched_policy) { case ACE_SCHED_OTHER: @@ -419,39 +419,39 @@ namespace CIAO name = "SCHED_FIFO"; break; } - + return name; } - + /// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/ void ComponentServer_Task::check_supported_priorities (void) { CIAO_TRACE ("ComponentServer_Task::check_supported_priorities"); - + int const sched_policy = this->orb_->orb_core ()->orb_params ()->ace_sched_policy (); - + // Check that we have sufficient priority range to run, // i.e., more than 1 priority level. int const max_priority = ACE_Sched_Params::priority_max (sched_policy); int const min_priority = ACE_Sched_Params::priority_min (sched_policy); - + if (max_priority == min_priority) { CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::check_supported_priorities - " - " Not enough priority levels with the %s scheduling policy\n" + " Not enough priority levels with the %C scheduling policy\n" "on this platform to run, terminating ....\n" "Check svc.conf options\n", sched_policy_name (sched_policy))); - + throw Error ("Bad scheduling policy."); } } - - void + + void ComponentServer_Task::configure_logging_backend (void) { Logger_Service diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp index 21f222da371..4d9deb09e7c 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp @@ -9,8 +9,8 @@ namespace CIAO { namespace Deployment { - CIAO_ComponentServer_i::CIAO_ComponentServer_i (const ACE_CString &uuid, - CORBA::ORB_ptr orb, + CIAO_ComponentServer_i::CIAO_ComponentServer_i (const ACE_CString &uuid, + CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) : uuid_ (uuid), orb_ (CORBA::ORB::_duplicate (orb)), @@ -19,72 +19,72 @@ namespace CIAO { CIAO_TRACE("CIAO_ComponentServer_i::CIAO_ComponentServer_i"); } - - // Destructor + + // Destructor CIAO_ComponentServer_i::~CIAO_ComponentServer_i (void) { CIAO_TRACE("CIAO_ComponentServer_i::~CIAO_ComponentServer_i"); } - - - void + + + void CIAO_ComponentServer_i::shutdown (void) { CIAO_TRACE("CIAO_ComponentServer_i::shutdown"); - - CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ComponentServer_i::shutdown - ORB shutdown request received at %s.\n", + + CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ComponentServer_i::shutdown - ORB shutdown request received at %C.\n", this->uuid_.c_str ())); - + if (!this->containers_.is_empty ()) - CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::shutdown - ComponentServer %s still containers!\n", + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::shutdown - ComponentServer %C still containers!\n", this->uuid_.c_str ())); - + this->orb_->shutdown (); } - - - ::Components::ConfigValues * + + + ::Components::ConfigValues * CIAO_ComponentServer_i::configuration (void) { CIAO_TRACE("CIAO_ComponentServer_i::configuration"); return this->config_values_.out (); } - - - ::Components::Deployment::ServerActivator_ptr + + + ::Components::Deployment::ServerActivator_ptr CIAO_ComponentServer_i::get_server_activator (void) { CIAO_TRACE("CIAO_ComponentServer_i::get_server_activator"); return this->serv_act_.in (); } - - - ::Components::Deployment::Container_ptr + + + ::Components::Deployment::Container_ptr CIAO_ComponentServer_i::create_container (const ::Components::ConfigValues & config) { CIAO_TRACE("CIAO_ComponentServer_i::create_container"); - + try { CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_ComponentServer_i::create_container - Request received with %u config values\n", config.length ())); - + CORBA::PolicyList policies; const char *name = 0; CIAO_Container_i *cont = 0; - ACE_NEW_THROW_EX (cont, - CIAO_Container_i (config, 0, name, &policies, this->orb_.in (), this->poa_.in ()), + ACE_NEW_THROW_EX (cont, + CIAO_Container_i (config, 0, name, &policies, this->orb_.in (), this->poa_.in ()), CORBA::NO_MEMORY ()); CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ComponentServer_i::create_container - " "Container servant successfully allocated.\n")); - + PortableServer::ServantBase_var safe_config = cont; CIAO::Deployment::Container_var cont_var = cont->_this (); - + this->containers_.insert (CIAO::Deployment::Container::_duplicate(cont_var.in ())); - + CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_ComponentServer_i::create_container - Container successfully activated and stored," "now manage %u containers\n", this->containers_.size ())); @@ -100,41 +100,41 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, "CIAO_ComponentServer_Impl: Caught unknown exception\n")); } - + throw Components::CreateFailure (); } - - - - void + + + + void CIAO_ComponentServer_i::remove_container (::Components::Deployment::Container_ptr cref) { CIAO_TRACE("CIAO_ComponentServer_i::remove_container"); - + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_i::remove_container - remove request received.\n")); - + if (CORBA::is_nil (cref)) { - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove_container - " "Error: Received nil container reference\n")); throw Components::RemoveFailure (); } - - + + if (this->containers_.is_empty ()) { - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove_container - " "Error: I don't manage any containers!\n")); throw Components::RemoveFailure (); } - - + + try { CONTAINERS::ITERATOR i (this->containers_.begin ()); - + // @@ TODO: artifact from when this was a sequence, should probably use .find, // which will work properly with the new parameterized set class. for (CONTAINERS::iterator i = this->containers_.begin (); @@ -147,13 +147,13 @@ namespace CIAO "Managed container reference is nil, skipping.\n")); continue; } - + if ((*i)->_is_equivalent (cref)) { CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_i::remove_container - Found container, invoking remove....\n")); cref->remove (); if (this->containers_.remove (*i) != 0) - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove_container - Unable to remove " "container reference from internal structure....\n")); CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_i::remove_container - Remove completed, destroying object, " @@ -165,29 +165,29 @@ namespace CIAO catch (CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove_container - " - "Caught CORBA exception whilst removing container: %s\n", + "Caught CORBA exception whilst removing container: %C\n", ex._info ().c_str ())); } - + catch (...) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove_container - Error: Unknown exception caught while removing a container.\n")); } throw Components::RemoveFailure (); } - - - ::Components::Deployment::Containers * + + + ::Components::Deployment::Containers * CIAO_ComponentServer_i::get_containers (void) { CIAO_TRACE("CIAO_ComponentServer_i::get_containers"); - + ::Components::Deployment::Containers *tmp(0); // tmp = new ::Components::Deployment::Containers (); ACE_NEW_THROW_EX (tmp, ::Components::Deployment::Containers (this->containers_.size ()), CORBA::NO_MEMORY ()); - + ::Components::Deployment::Containers_var retval (tmp); CORBA::ULong pos (0); retval->length (this->containers_.size ()); @@ -197,18 +197,18 @@ namespace CIAO { retval[pos++] = ::CIAO::Deployment::Container::_duplicate (*i); } - + return retval._retn (); } - - - void + + + void CIAO_ComponentServer_i::remove (void) { CIAO_TRACE("CIAO_ComponentServer_i::remove"); - + bool successful = true; - + for (CONTAINERS::iterator i = this->containers_.begin (); i.done () != 1; i.advance ()) { @@ -221,7 +221,7 @@ namespace CIAO successful = false; CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ComponentServer_i::remove - " - "Intercepted CORBA exception while trying to remove a container:%s\n", + "Intercepted CORBA exception while trying to remove a container:%C\n", ex._info ().c_str ())); } catch (...) @@ -232,14 +232,14 @@ namespace CIAO "Intercepted exception while trying to remove a container\n")); } } - + this->containers_.reset (); - + if (!successful) throw ::Components::RemoveFailure (); } - - void + + void CIAO_ComponentServer_i::init (::Components::Deployment::ServerActivator_ptr sa, Components::ConfigValues *cvs) { diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp index 5a484eb7093..e4a62af4638 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp @@ -11,7 +11,7 @@ namespace CIAO { namespace Deployment { - // Constructor + // Constructor CIAO_Container_i::CIAO_Container_i (const Components::ConfigValues &config, const Static_Config_EntryPoints_Maps *static_entrypts, const char *name, @@ -24,12 +24,12 @@ namespace CIAO static_entrypts_maps_ (static_entrypts) { CIAO_TRACE("CIAO_Container_i::CIAO_Container_i"); - + for (CORBA::ULong i = 0; i < config.length (); ++i) { this->config_[i] = config[i]; } - + try { if (this->static_entrypts_maps_ == 0) @@ -41,7 +41,7 @@ namespace CIAO else { CIAO_DEBUG((LM_DEBUG, CLINFO "CIAO_Container_i: creating Session container with static linkage\n")); - this->container_ = new CIAO::Session_Container (this->orb_.in (), this, true, + this->container_ = new CIAO::Session_Container (this->orb_.in (), this, true, this->static_entrypts_maps_, name, policies); } @@ -53,14 +53,14 @@ namespace CIAO throw; } } - - - // Destructor + + + // Destructor CIAO_Container_i::~CIAO_Container_i (void) { CIAO_TRACE("CIAO_Container_i::~CIAO_Container_i"); } - + ::Components::CCMObject_ptr CIAO_Container_i::install_component (const char * /*id*/, const char * /*entrypt*/, @@ -70,74 +70,74 @@ namespace CIAO throw CORBA::NO_IMPLEMENT (); return 0; } - - void + + void CIAO_Container_i::remove_component (::Components::CCMObject_ptr /*cref*/) { CIAO_TRACE("CIAO_Container_i::remove_component"); throw CORBA::NO_IMPLEMENT (); } - - ::CIAO::Deployment::CCMObjects * + + ::CIAO::Deployment::CCMObjects * CIAO_Container_i::get_components (void) { CIAO_TRACE("CIAO_Container_i::get_components"); throw CORBA::NO_IMPLEMENT (); return 0; } - - ::Components::ConfigValues * + + ::Components::ConfigValues * CIAO_Container_i::configuration (void) { CIAO_TRACE("CIAO_Container_i::configuration"); throw CORBA::NO_IMPLEMENT (); return 0; } - - ::Components::Deployment::ComponentServer_ptr + + ::Components::Deployment::ComponentServer_ptr CIAO_Container_i::get_component_server (void) { CIAO_TRACE("CIAO_Container_i::get_component_server"); throw CORBA::NO_IMPLEMENT (); return 0; } - - ::Components::CCMHome_ptr + + ::Components::CCMHome_ptr CIAO_Container_i::install_home (const char * id, const char * entrypt, const ::Components::ConfigValues & config) { CIAO_TRACE("CIAO_Container_i::install_home"); - + if (id == 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " "No home ID provided\n")); throw ::Components::Deployment::InvalidConfiguration (); } - + Components::CCMHome_var home; - + if (this->home_map_.find (id, home) == 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " - "Home with id %s already installed, aborting\n", + "Home with id %C already installed, aborting\n", id)); throw Components::CreateFailure (); } - + if (entrypt == 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " "No executor entrypoint found.\n")); throw ::Components::Deployment::InvalidConfiguration (); } - + CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_Container_i::install_home - " - "Attempting to install home with id [%s]\n", + "Attempting to install home with id [%C]\n", id)); - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " "Extracting ConfigValues from sequence of length [%u]\n", config.length ())); @@ -145,16 +145,16 @@ namespace CIAO CIAO::Utility::CONFIGVALUE_MAP cm; CIAO::Utility::build_config_values_map (cm, config); CORBA::Any val; - + const char *tmp; CORBA::String_var exec_art, svnt_art, svnt_entry; if (cm.find (SVNT_ENTRYPT, val) == 0) { val >>= tmp; svnt_entry = tmp; - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " - "Found Servant entrypoint %s\n", svnt_entry.in ())); + "Found Servant entrypoint %C\n", svnt_entry.in ())); } else { @@ -163,14 +163,14 @@ namespace CIAO "Error: No Servant entrypoint porovided, aborting installation\n")); throw Components::InvalidConfiguration (); } - + if (cm.find (SVNT_ARTIFACT, val) == 0) { val >>= tmp; svnt_art = tmp; - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " - "Found Servant artifact %s\n", svnt_art.in ())); + "Found Servant artifact %C\n", svnt_art.in ())); } else { @@ -179,15 +179,15 @@ namespace CIAO "Error: No Servant artifact porovided, aborting installation\n")); throw Components::InvalidConfiguration (); } - + if (cm.find (EXEC_ARTIFACT, val) == 0) { val >>= tmp; exec_art = tmp; - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " - "Found executor artifact: %s\n", exec_art.in ())); + "Found executor artifact: %C\n", exec_art.in ())); } else { @@ -195,45 +195,45 @@ namespace CIAO "CIAO_Container_i::install_home - " "Error: No Executor artifact porovided, aborting installation\n")); } - + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " "Extraction resulted in map of [%u] values", cm.current_size ())); // extract config values here... - + //CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_Container_i::install_home - ", - //"Executor entrypoint [%s], servant entrypoint [%s], servant library [%s]\n", + //"Executor entrypoint [%C], servant entrypoint [%C], servant library [%C]\n", //entrypt, svnt_entrypt.in (), svnt_library.in ())); - + home = this->container_->install_home (exec_art, entrypt, svnt_art, svnt_entry, id); - + if (this->home_map_.bind (id, Components::CCMHome::_duplicate (home.in ())) == -1) { - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_home - " "Unable to bind home into home map\n")); } - + if (cm.find (REGISTER_NAMING, val) == 0) { const char *str_val; - + if (val >>= str_val) { CIAO_ERROR ((LM_WARNING, CLINFO "CIAO_Container_i::install_home - " "Naming service registration not yet supported\n")); - + //CIAO_DEBUG ((LM_NOTICE, CLINFO // "CIAO_Container_i::install_home - " - // "Home with ID [%s] registered in naming service with name [%s]\n", + // "Home with ID [%C] registered in naming service with name [%C]\n", // id, str_val)); } else @@ -244,14 +244,14 @@ namespace CIAO return home._retn (); } - - void + + void CIAO_Container_i::remove_home (::Components::CCMHome_ptr href) { CIAO_TRACE("CIAO_Container_i::remove_home"); - + ::Components::CCMHome_var home (href); - + Home_Iterator i = this->home_map_.begin (); while (!i.done ()) { @@ -263,41 +263,41 @@ namespace CIAO } i.advance (); } - + if (i.done ()) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::remove_home - " "Unable to find matching home managed by this container, throwing RemoveFailure\n")); throw Components::RemoveFailure (); } - + CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::remove_home - " - "Invoking remove on the container impl for home %s.\n", + "Invoking remove on the container impl for home %C.\n", i->key ().c_str ())); this->container_->uninstall_home (home.in ()); CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_Container_i::remove_home - " - "Successfully removed home %s\n", + "Successfully removed home %C\n", i->key ().c_str ())); if (this->home_map_.unbind (i->key ()) != 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::remove_home - " - "Unable to unbind removed home with id %s from home map\n", + "Unable to unbind removed home with id %C from home map\n", i->key ().c_str ())); } } - - ::Components::CCMHomes * + + ::Components::CCMHomes * CIAO_Container_i::get_homes (void) { CIAO_TRACE("CIAO_Container_i::get_homes"); - + ::Components::CCMHomes * tmp_homes; - + ACE_NEW_THROW_EX (tmp_homes, ::Components::CCMHomes (this->home_map_.current_size ()), CORBA::NO_MEMORY ()); - + ::Components::CCMHomes_var retval (tmp_homes); retval->length (this->home_map_.current_size ()); Home_Iterator i = this->home_map_.begin (); @@ -310,12 +310,12 @@ namespace CIAO return retval._retn (); } - - void + + void CIAO_Container_i::remove (void) { CIAO_TRACE("CIAO_Container_i::remove"); - + if (this->home_map_.current_size () != 0 || this->component_map_.current_size () != 0) { @@ -323,21 +323,21 @@ namespace CIAO "Attempting to remove container that still has %u homes and %u components installed\n", this->home_map_.current_size (), this->component_map_.current_size ())); - + } //this->container_->_remove_ref (); } - + void CIAO_Container_i::activate_component (::Components::CCMObject_ptr comp) { CIAO_TRACE ("CIAO_Container_i::activate_component"); - + this->container_->activate_component (comp); } - - + + void CIAO_Container_i::passivate_component (::Components::CCMObject_ptr comp) { @@ -345,13 +345,13 @@ namespace CIAO this->container_->passivate_component (comp); } - - PortableServer::POA_ptr + + PortableServer::POA_ptr CIAO_Container_i::_default_POA (void) { CIAO_TRACE ("CIAO_Container_i::_default_POA"); - return PortableServer::POA::_duplicate (this->poa_.in ()); + return PortableServer::POA::_duplicate (this->poa_.in ()); } } } diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp index 1f951888394..e60ce7e986a 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp @@ -45,14 +45,14 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s\n", + "Received callback from ComponentServer %C\n", server_UUID)); if (this->server_infos_.is_empty ()) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s, but I don't manage any.\n", + "Received callback from ComponentServer %C, but I don't manage any.\n", server_UUID)); throw CORBA::BAD_PARAM (); } @@ -66,7 +66,7 @@ namespace CIAO { CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Comparing %s with %s\n", (*i)->uuid_.c_str (), server_UUID)); + "Comparing %C with %C\n", (*i)->uuid_.c_str (), server_UUID)); if ((*i)->uuid_ == server_UUID) { info = (*i).get (); @@ -76,7 +76,7 @@ namespace CIAO if (info == 0) { CIAO_ERROR ((LM_WARNING, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s, which doesn't belong to me.\n", + "Received callback from ComponentServer %C, which doesn't belong to me.\n", server_UUID)); throw CORBA::BAD_PARAM (); } @@ -85,7 +85,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s, which has already been configured.\n", + "Received callback from ComponentServer %C, which has already been configured.\n", server_UUID)); throw CORBA::BAD_INV_ORDER (); } @@ -94,14 +94,14 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s, which has already called back.\n", + "Received callback from ComponentServer %C, which has already called back.\n", server_UUID)); throw CORBA::BAD_INV_ORDER (); } CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Received callback from ComponentServer %s\n", + "Received callback from ComponentServer %C\n", server_UUID)); info->ref_ = ::Components::Deployment::ComponentServer::_duplicate (serverref); @@ -111,7 +111,7 @@ namespace CIAO // @@TODO: May want to print out configvalues here. CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ServerActivator_i::component_server_callback - " - "Generated %u ConfigValues for ComponentServer %s\n", + "Generated %u ConfigValues for ComponentServer %C\n", config->length (), server_UUID)); } @@ -122,7 +122,7 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::configuration_complete - " - "Received configuration_complete from ComponentServer %s\n", + "Received configuration_complete from ComponentServer %C\n", server_UUID)); try @@ -131,7 +131,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::configuration_complete - " - "Received callback from ComponentServer %s, but I don't manage any.\n", + "Received callback from ComponentServer %C, but I don't manage any.\n", server_UUID)); throw CORBA::BAD_PARAM (); } @@ -151,7 +151,7 @@ namespace CIAO { CIAO_ERROR ((LM_WARNING, CLINFO "CIAO_ServerActivator_i::configuration_complete - " - "Received configuration_complete from ComponentServer %s, which doesn't belong to me.\n", + "Received configuration_complete from ComponentServer %C, which doesn't belong to me.\n", server_UUID)); throw CORBA::BAD_PARAM (); } @@ -160,7 +160,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::configuration_complete - " - "Received configuration_complete from ComponentServer %s, which has already been completed.\n", + "Received configuration_complete from ComponentServer %C, which has already been completed.\n", server_UUID)); throw CORBA::BAD_INV_ORDER (); } @@ -169,7 +169,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::configuration_complete - " - "Received configuration_complete from ComponentServer %s, which has not called back.\n", + "Received configuration_complete from ComponentServer %C, which has not called back.\n", server_UUID)); throw CORBA::BAD_INV_ORDER (); } @@ -204,7 +204,7 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::create_component_server - " - "Attempting to spawn ComponentServer with UUID %s\n", + "Attempting to spawn ComponentServer with UUID %C\n", server->uuid_.c_str ())); // Now we need to get a copy of the one that was inserted... pid_t pid = this->spawn_component_server (*server, cmd_options); @@ -226,7 +226,7 @@ namespace CIAO else { CIAO_ERROR ((LM_WARNING, CLINFO "CIAO_ServerActivator_i::create_component_server - " - "Failed to extract provided non-default server timeout from property '%s', " + "Failed to extract provided non-default server timeout from property '%C', " "falling back to default timeout of %u\n", this->spawn_delay_)); } @@ -239,7 +239,7 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ServerActivator_i::create_component_server - " - "ComponentServer %s successfully spawned and configured!\n", + "ComponentServer %C successfully spawned and configured!\n", server->uuid_.c_str ())); return ::Components::Deployment::ComponentServer::_duplicate (server->ref_.in ()); @@ -274,7 +274,7 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ServerActivator_i::construct_command_line - Creating component server " - " with UUID %s\n", server.uuid_.c_str ())); + " with UUID %C\n", server.uuid_.c_str ())); cmd_options += " -u "; cmd_options += server.uuid_; @@ -292,7 +292,7 @@ namespace CIAO ++arg_i) { CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_ServerActivator_i::construct_command_line - Adding argument %s from ServerResource\n ", + "CIAO_ServerActivator_i::construct_command_line - Adding argument %C from ServerResource\n ", sr->args[arg_i].in ())); cmd_options += " "; // space between command line args cmd_options += sr->args[arg_i]; @@ -304,7 +304,7 @@ namespace CIAO "") != 0) { CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_ServerActivator_i::construct_command_line - Using SvcConf file %s\n ", + "CIAO_ServerActivator_i::construct_command_line - Using SvcConf file %C\n ", sr->svcconf.in ())); cmd_options += " -ORBSvcConf "; cmd_options += sr->svcconf; @@ -333,7 +333,7 @@ namespace CIAO { val >>= path; CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ServerActivator_i::spawn_component_server - " - "Using provided component server executable:%s\n", path)); + "Using provided component server executable:%C\n", path)); } else CIAO_DEBUG ((LM_DEBUG, CLINFO "CIAO_ServerActivator_i::spawn_component_server - " "Using default component server execuable\n")); @@ -385,7 +385,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::single_threaded_wait_for_callback - " - "Timed out while waiting for ComponentServer %s to call back.\n", + "Timed out while waiting for ComponentServer %C to call back.\n", si.uuid_.c_str ())); throw ::Components::CreateFailure (CIAO::CALLBACK_TIMEOUT_EXCEEDED); } @@ -415,7 +415,7 @@ namespace CIAO { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_ServerActivator_i::multi_threaded_wait_for_callback - " - "Timed out while waiting for ComponentServer %s to call back.\n", + "Timed out while waiting for ComponentServer %C to call back.\n", si.uuid_.c_str ())); throw Components::CreateFailure (CIAO::CALLBACK_TIMEOUT_EXCEEDED); } @@ -457,7 +457,7 @@ namespace CIAO { CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::remove_component_server - " - "Calling remove () on ComponentServer %s\n", + "Calling remove () on ComponentServer %C\n", info->uuid_.c_str ())); server->remove (); } @@ -465,7 +465,7 @@ namespace CIAO { CIAO_ERROR ((LM_WARNING, CLINFO "CIAO_ServerActivator_i::remove_component_server - " - "Received RemoveFailure exception from ComponentServer %s\n", + "Received RemoveFailure exception from ComponentServer %C\n", info->uuid_.c_str ())); } @@ -476,19 +476,19 @@ namespace CIAO { CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::remove_component_server - " - "Calling shutdown () on ComponentServer %s\n", + "Calling shutdown () on ComponentServer %C\n", info->uuid_.c_str ())); ccs->shutdown (); } else CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ServerActivator_i::remove_component_server - " - "ComponentServer %s is not a CIAO_ComponentServer, not calling shutdown.\n", + "ComponentServer %C is not a CIAO_ComponentServer, not calling shutdown.\n", info->uuid_.c_str ())); CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_ServerActivator_i::remove_component_server - " - "ComponentServer %s successfully shut down.\n", + "ComponentServer %C successfully shut down.\n", info->uuid_.c_str ())); } diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp index a34353fe5c7..a9fc8f534a2 100755 --- a/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp +++ b/flat/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp @@ -12,7 +12,7 @@ namespace CIAO { namespace Deployment { - + void Basic_Config_Manager::init (CORBA::ORB_ptr orb) { @@ -83,7 +83,7 @@ namespace CIAO policy_list) != 0) { CIAO_ERROR ((LM_ERROR, - "Error binding Policy_Set with name: %s\n", + "Error binding Policy_Set with name: %C\n", sets[i].Id.in ())); throw CORBA::INTERNAL (); } @@ -91,7 +91,7 @@ namespace CIAO { CIAO_DEBUG ((LM_DEBUG, "Basic_Config_Manager::init_resource" - " added policy set : %s with %d policies\n", + " added policy set : %C with %d policies\n", sets[i].Id.in (), array_index)); } } @@ -99,7 +99,7 @@ namespace CIAO { CIAO_DEBUG ((LM_DEBUG, "Basic_Config_Manager::init_resource" - " added policy set : %s with %d policies\n", + " added policy set : %C with %d policies\n", sets[i].Id.in (), array_index)); } } @@ -143,7 +143,7 @@ namespace CIAO if (this->policy_map_.find (name, entry) != 0) { CIAO_DEBUG ((LM_DEBUG, - "Unable to find a PolicyList named %s\n", + "Unable to find a PolicyList named %C\n", name)); retv = 0; } @@ -229,7 +229,7 @@ extern "C" Basic_Config_Manager_Export Config_Manager *create_basic_config_manag extern "C" { - Config_Manager * + Config_Manager * create_basic_config_manager (void) { Basic_Config_Manager *config; diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp b/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp index 4ec837c06fe..6619a445db1 100644 --- a/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp +++ b/flat/CIAO/ciao/ComponentServer/Configurators/RT/RTConfig_Manager.cpp @@ -41,12 +41,12 @@ CIAO::Deployment::RTResource_Config_Manager::print_resources for (i = 0; i < orb_resource.threadpool_list.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, - "-RTResource_Config_Manager::print_resource threadpool: %s\n" + "-RTResource_Config_Manager::print_resource threadpool: %C\n" "\tStack size: %d\n" "\tStatic: %d\n" "\tDynamic %d\n" "\tDefault Prio: %d\n" - "\tBuffering %s\n" + "\tBuffering %C\n" "\tMax Buffered: %d\n" "\tBuffer Size %d\n", orb_resource.threadpool_list[i].Id.in (), @@ -62,7 +62,7 @@ CIAO::Deployment::RTResource_Config_Manager::print_resources for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, - "-RTResource_Config_Manager::print_resource threadpool_with %d, lanes: %s\n", + "-RTResource_Config_Manager::print_resource threadpool_with %d, lanes: %C\n", orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (), orb_resource.threadpool_with_lanes_list[i].Id.in ())); @@ -82,8 +82,8 @@ CIAO::Deployment::RTResource_Config_Manager::print_resources } CIAO_DEBUG ((LM_DEBUG, "\tStack size: %d\n" - "\tBorrowing: %s\n" - "\tBuffering %s\n" + "\tBorrowing: %C\n" + "\tBuffering %C\n" "\tMax Buffered: %d\n" "\tBuffer Size %d\n", orb_resource.threadpool_with_lanes_list[i].stacksize, @@ -96,7 +96,7 @@ CIAO::Deployment::RTResource_Config_Manager::print_resources for (i = 0; i < orb_resource.connection_bands_list.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, - "-RTResource_Config_Manager::print_resource connection %d bands: %s\n", + "-RTResource_Config_Manager::print_resource connection %d bands: %C\n", orb_resource.connection_bands_list[i].bands.length (), orb_resource.connection_bands_list[i].Id.in ())); @@ -139,7 +139,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources for (i = 0; i < orb_resource.threadpool_list.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, - "RTResource_Config_Manager::init_resource threadpool: %s\n", + "RTResource_Config_Manager::init_resource threadpool: %C\n", orb_resource.threadpool_list[i].Id.in ())); RTCORBA::ThreadpoolId thr_id = this->rtorb_->create_threadpool @@ -156,13 +156,13 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources if (this->threadpool_map_.bind (orb_resource.threadpool_list[i].Id.in (), thr_id) != 0) { - CIAO_ERROR ((LM_ERROR, "Error binding thread pool Id: %s to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ())); + CIAO_ERROR ((LM_ERROR, "Error binding thread pool Id: %C to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ())); throw CORBA::INTERNAL (); } else { CIAO_DEBUG ((LM_DEBUG, - "RTResource_Config_Manager::init_resource added thread pool: %s\n", + "RTResource_Config_Manager::init_resource added thread pool: %C\n", orb_resource.threadpool_list[i].Id.in ())); } } @@ -170,7 +170,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i) { CIAO_DEBUG ((LM_DEBUG, - "RTResource_Config_Manager::init_resource threadpool_with %d, lanes: %s\n", + "RTResource_Config_Manager::init_resource threadpool_with %d, lanes: %C\n", orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (), orb_resource.threadpool_with_lanes_list[i].Id.in ())); @@ -207,7 +207,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources thr_id) != 0) { CIAO_ERROR ((LM_ERROR, - "Error binding thread pool name: %s to map when " + "Error binding thread pool name: %C to map when " "initializing RTNodeApplication resources.\n", orb_resource.threadpool_with_lanes_list[i].Id.in ())); throw CORBA::INTERNAL (); @@ -216,7 +216,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources else { CIAO_DEBUG ((LM_DEBUG, - "RTResource_Config_Manager::init_resource added thread pool with lanes: %s\n", + "RTResource_Config_Manager::init_resource added thread pool with lanes: %C\n", orb_resource.threadpool_with_lanes_list[i].Id.in ())); } } @@ -239,7 +239,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources safebands) != 0) { CIAO_ERROR ((LM_ERROR, - "Error binding priority bands name: %s to map " + "Error binding priority bands name: %C to map " "when initializing RTNodeApplication resources.\n", orb_resource.connection_bands_list[i].Id.in ())); throw CORBA::INTERNAL (); @@ -247,7 +247,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources else { CIAO_DEBUG ((LM_DEBUG, - "RTResource_Config_Manager::init_resource added connection bands: %s\n", + "RTResource_Config_Manager::init_resource added connection bands: %C\n", orb_resource.connection_bands_list[i].Id.in ())); } } @@ -292,7 +292,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources policy_list._retn ()) != 0) { CIAO_ERROR ((LM_ERROR, - "Error binding Policy_Set with name: %s\n", + "Error binding Policy_Set with name: %C\n", sets[i].Id.in ())); throw CORBA::INTERNAL (); } @@ -300,7 +300,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources { CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::init_resource " - "added policy set: %s with %d policies\n", + "added policy set: %C with %d policies\n", sets[i].Id.in (), array_index)); } } @@ -308,7 +308,7 @@ CIAO::Deployment::RTResource_Config_Manager::init_resources { CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::init_resource " - "added policy set: %s with %d policies\n", + "added policy set: %C with %d policies\n", sets[i].Id.in (), array_index)); } } @@ -343,7 +343,7 @@ CIAO::Deployment::RTResource_Config_Manager::find_threadpool_by_name (const char if (this->threadpool_map_.find (name, ret_id) != 0) { CIAO_ERROR ((LM_ERROR, - "Unable to find a threadpool named %s\n", + "Unable to find a threadpool named %C\n", name)); throw CORBA::INTERNAL (); } @@ -366,7 +366,7 @@ CIAO::Deployment::RTResource_Config_Manager::find_priority_bands_by_name (const if (this->priority_bands_map_.find (name, entry) != 0) { CIAO_ERROR ((LM_ERROR, - "Unable to find a connection bands named %s\n", + "Unable to find a connection bands named %C\n", name)); throw CORBA::INTERNAL (); } @@ -408,7 +408,7 @@ CIAO::Deployment::RTResource_Config_Manager::find_policies_by_name (const char * } - CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %s\n", + CIAO_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %C\n", name)); POLICY_MAP::ENTRY *entry = 0; @@ -416,7 +416,7 @@ CIAO::Deployment::RTResource_Config_Manager::find_policies_by_name (const char * if (this->policy_map_.find (name, entry) != 0) { CIAO_ERROR ((LM_ERROR, - "Unable to find a PolicyList named %s\n", + "Unable to find a PolicyList named %C\n", name)); throw CORBA::INTERNAL (); } @@ -467,7 +467,7 @@ CIAO::Deployment::RTResource_Config_Manager::create_single_policy if (! CORBA::is_nil (retv.in ())) CIAO_DEBUG ((LM_DEBUG, - "Create Threadpool policy: %s, TPid: %d\n", + "Create Threadpool policy: %C, TPid: %d\n", policy_def.ThreadpoolDef().Id.in (), tpid)); } break; @@ -483,7 +483,7 @@ CIAO::Deployment::RTResource_Config_Manager::create_single_policy if (! CORBA::is_nil (retv.in ())) { CIAO_DEBUG ((LM_DEBUG, - "Created Banded Connection policy: %s\n", + "Created Banded Connection policy: %C\n", policy_def.PriorityBandedConnectionDef().Id.in ())); } } diff --git a/flat/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp b/flat/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp index 5f199f366aa..91e8a3b3f36 100644 --- a/flat/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp +++ b/flat/CIAO/ciao/ComponentServer/Configurators/RTNodeApp_Configurator.cpp @@ -46,7 +46,7 @@ CIAO::RTNodeApp_Configurator::init_resource_manager for (CORBA::ULong i = 0; i < properties.length (); ++i) { // if (CIAO::debug_level () > 9) - CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager processing property: %s\n", + CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager processing property: %C\n", properties[i].name.in ())); if (ACE_OS::strcmp ("CIAOServerResources", properties[i].name.in ()) == 0) @@ -77,7 +77,7 @@ CIAO::RTNodeApp_Configurator::find_container_policies for (CORBA::ULong i = 0; i < properties.length (); ++i) { - CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies processing property: %s\n", + CIAO_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies processing property: %C\n", properties[i].name.in ())); if (ACE_OS::strcmp ("ContainerPolicySet", properties[i].name) == 0) diff --git a/flat/CIAO/ciao/Containers/Container_Base.cpp b/flat/CIAO/ciao/Containers/Container_Base.cpp index 3bc6c54bf39..fd3548ffad9 100644 --- a/flat/CIAO/ciao/Containers/Container_Base.cpp +++ b/flat/CIAO/ciao/Containers/Container_Base.cpp @@ -17,7 +17,7 @@ namespace CIAO { } - Container_i::Container_i (CORBA::ORB_ptr o, + Container_i::Container_i (CORBA::ORB_ptr o, Deployment::CIAO_Container_i *container_impl) : orb_ (CORBA::ORB::_duplicate (o)), container_impl_ (container_impl) @@ -32,20 +32,20 @@ namespace CIAO Container_i::get_receptacle_policy (const char* name) { CORBA::PolicyList_var policy_list; - + ACE_NEW_THROW_EX (policy_list, CORBA::PolicyList (), CORBA::NO_MEMORY ()); - + if (this->rec_pol_map_.find (name, policy_list) != 0) { CIAO_ERROR ((LM_WARNING, CLINFO "Container_i::Ger_receptacle_policy - Unable to find policies " - "for the receptacle %s\n", + "for the receptacle %C\n", name)); policy_list->length (0); } - + return policy_list._retn (); } } diff --git a/flat/CIAO/ciao/Containers/Servant_Activator.cpp b/flat/CIAO/ciao/Containers/Servant_Activator.cpp index 38529e4aa7d..f3d0159bb1b 100644 --- a/flat/CIAO/ciao/Containers/Servant_Activator.cpp +++ b/flat/CIAO/ciao/Containers/Servant_Activator.cpp @@ -52,18 +52,18 @@ namespace CIAO this->mutex_, CORBA::NO_RESOURCES ()); size_t const sz = this->slot_index_; - + for (size_t t = 0; t != sz; ++t) { Port_Activator_var tmp = this->pa_[t]; - + if (ACE_OS::strcmp (tmp->oid (), str.in ()) == 0) { tmp->oid ("dummy"); } } } - + return true; } @@ -78,7 +78,7 @@ namespace CIAO CIAO_DEBUG ((LM_INFO, CLINFO "Servant_Activator_i::incarnate, " - "Attempting to activate port name [%s] \n", + "Attempting to activate port name [%C] \n", str.in ())); { @@ -104,7 +104,7 @@ namespace CIAO " value from the array is null \n")); continue; } - + if (ACE_OS::strcmp (tmp->oid (), str.in ()) == 0) { @@ -112,14 +112,14 @@ namespace CIAO // lock held. Oh well, let us get some sense of sanity in // CIAO to do think about these. CIAO_DEBUG ((LM_INFO, CLINFO - "Servant_Activator_i::incarnate - Activating Port %s\n", + "Servant_Activator_i::incarnate - Activating Port %C\n", str.in ())); - + return this->pa_[t]->activate (oid); } } } - + throw CORBA::OBJECT_NOT_EXIST (); } @@ -152,12 +152,12 @@ namespace CIAO "Servant_Activator_i::etherealize - Port Activator is NULL\n")); continue; } - + if (ACE_OS::strcmp (tmp->oid (), str.in ()) == 0) { CIAO_DEBUG ((LM_INFO, CLINFO - "Servant_Activator_i::etherealize - Deactivating Port %s\n", + "Servant_Activator_i::etherealize - Deactivating Port %C\n", str.in ())); this->pa_[t]->deactivate (servant); } @@ -186,7 +186,7 @@ namespace CIAO CIAO_DEBUG ((LM_INFO, CLINFO "Servant_Activator_i::" "register_port_activator" - " with port name [%s]," + " with port name [%C]," " the slot_index_ is [%d] \n", pa->name (), this->slot_index_)); diff --git a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp index ae40971e07b..b16cb1f7f66 100644 --- a/flat/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/flat/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -76,7 +76,7 @@ namespace CIAO } CIAO_DEBUG ((LM_TRACE, CLINFO "Session_Container::init - " - "Initializing a container with name %s\n", + "Initializing a container with name %C\n", name)); CORBA::Object_var poa_object = @@ -232,15 +232,15 @@ namespace CIAO { CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_home - " - "Loading home [%s] from shared libraries\n", + "Loading home [%C] from shared libraries\n", name)); CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_home - " - "Executor library [%s] with entrypoint [%s]\n", + "Executor library [%C] with entrypoint [%C]\n", primary_artifact, entry_point)); CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_home - " - "Servant library [%s] with entrypoint [%s]\n", + "Servant library [%C] with entrypoint [%C]\n", servant_artifact, servant_entrypoint)); ACE_DLL executor_dll, servant_dll; @@ -262,7 +262,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_home -" - "ERROR: %s\n", + "ERROR: %C\n", exception.c_str ())); throw Components::Deployment::UnknownImplId (); @@ -278,7 +278,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_home -" - "ERROR in opening the executor DLL [%s] \n", + "ERROR in opening the executor DLL [%C] \n", primary_artifact)); throw Components::Deployment::UnknownImplId (); @@ -297,7 +297,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_home -" - "ERROR in opening the servant DLL [%s] \n", + "ERROR in opening the servant DLL [%C] \n", servant_artifact)); throw Components::Deployment::UnknownImplId (); @@ -316,7 +316,7 @@ namespace CIAO "Session_Container.cpp -" "Session_Container::ciao_install_home -" "ERROR in opening the executor entry point " - "for executor DLL [%s] \n", + "for executor DLL [%C] \n", primary_artifact)); error += primary_artifact; } @@ -326,7 +326,7 @@ namespace CIAO "Session_Container.cpp -" "Session_Container::ciao_install_home -" "ERROR in opening the servant entry point " - "for servant DLL [%s] \n", + "for servant DLL [%C] \n", servant_artifact)); error += servant_artifact; } @@ -348,7 +348,7 @@ namespace CIAO else { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Session_Container::install_home - Loading statically linked home [%s]\n", + "Session_Container::install_home - Loading statically linked home [%C]\n", name)); if (static_entrypts_maps_ == 0 @@ -388,7 +388,7 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_home - Error:%s\n", + "Session_Container::ciao_install_home - Error:%C\n", error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); @@ -453,15 +453,15 @@ namespace CIAO { CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_component - " - "Loading component [%s] from shared libraries\n", + "Loading component [%C] from shared libraries\n", name)); CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_component - " - "Executor library [%s] with entrypoint [%s]\n", + "Executor library [%C] with entrypoint [%C]\n", primary_artifact, entry_point)); CIAO_DEBUG ((LM_DEBUG, CLINFO "Session_Container::install_component - " - "Servant library [%s] with entrypoint [%s]\n", + "Servant library [%C] with entrypoint [%C]\n", servant_artifact, servant_entrypoint)); ACE_DLL executor_dll, servant_dll; @@ -483,7 +483,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_component -" - "ERROR: %s\n", + "ERROR: %C\n", exception.c_str ())); throw Components::Deployment::UnknownImplId (); @@ -499,7 +499,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_component -" - "ERROR in opening the executor DLL [%s] \n", + "ERROR in opening the executor DLL [%C] \n", primary_artifact)); throw Components::Deployment::UnknownImplId (); @@ -518,7 +518,7 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container.cpp -" "Session_Container::ciao_install_component -" - "ERROR in opening the servant DLL [%s] \n", + "ERROR in opening the servant DLL [%C] \n", servant_artifact)); throw Components::Deployment::UnknownImplId (); @@ -537,7 +537,7 @@ namespace CIAO "Session_Container.cpp -" "Session_Container::ciao_install_component -" "ERROR in opening the executor entry point " - "for executor DLL [%s] \n", + "for executor DLL [%C] \n", primary_artifact)); error += primary_artifact; } @@ -547,7 +547,7 @@ namespace CIAO "Session_Container.cpp -" "Session_Container::ciao_install_component -" "ERROR in opening the servant entry point " - "for servant DLL [%s] \n", + "for servant DLL [%C] \n", servant_artifact)); error += servant_artifact; } @@ -569,7 +569,7 @@ namespace CIAO else { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Session_Container::install_component - Loading statically linked component [%s]\n", + "Session_Container::install_component - Loading statically linked component [%C]\n", name)); if (static_entrypts_maps_ == 0 @@ -609,7 +609,7 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_component - Error:%s\n", + "Session_Container::ciao_install_component - Error:%C\n", error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); @@ -695,7 +695,7 @@ namespace CIAO catch (CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::activate_component - " - "Caught CORBA exception while activating a component: %s\n", + "Caught CORBA exception while activating a component: %C\n", ex._info ().c_str ())); throw; } @@ -741,7 +741,7 @@ namespace CIAO catch (CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::passivate_component - " - "Caught CORBA exception while passivating a component: %s\n", + "Caught CORBA exception while passivating a component: %C\n", ex._info ().c_str ())); throw; } @@ -830,7 +830,7 @@ namespace CIAO catch (CORBA::Exception &ex) { CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::uninstall_servant - " - "Caught CORBA exception while uninstalling servant: %s\n", + "Caught CORBA exception while uninstalling servant: %C\n", ex._info ().c_str ())); throw Components::RemoveFailure (); } diff --git a/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp index 3975b4ff41b..5b055812cf4 100644 --- a/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp +++ b/flat/CIAO/ciao/Servants/Servant_Impl_Base.cpp @@ -55,7 +55,7 @@ namespace CIAO Components::FacetDescriptions_var facets = this->get_all_facets (); CORBA::ULong const facet_len = facets->length (); - + for (CORBA::ULong i = 0; i < facet_len; ++i) { PortableServer::ObjectId_var facet_id = @@ -78,7 +78,7 @@ namespace CIAO this->get_all_consumers (); CORBA::ULong const consumer_len = consumers->length (); - + for (CORBA::ULong j = 0; j < consumer_len; ++j) { PortableServer::ObjectId_var cons_id = @@ -458,7 +458,7 @@ namespace CIAO { CIAO_TRACE("Servant_Impl_Base::add_receptacle"); CIAO_DEBUG ((LM_INFO, CLINFO - "Servant_Impl_Base::add_receptacle - attempting to add new connection to receptacle (%s)\n", + "Servant_Impl_Base::add_receptacle - attempting to add new connection to receptacle (%C)\n", receptacle_name)); ::Components::ReceptacleDescription_var safe; @@ -468,7 +468,7 @@ namespace CIAO safe) == -1) { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Servant_Impl_Base::add_receptacle - Found no receptacle named (%s), creating it...\n", + "Servant_Impl_Base::add_receptacle - Found no receptacle named (%C), creating it...\n", receptacle_name)); ACE_NEW_THROW_EX (rd, @@ -497,7 +497,7 @@ namespace CIAO else { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Servant_Impl_Base::add_receptacle - Found a receptacle named (%s)\n", + "Servant_Impl_Base::add_receptacle - Found a receptacle named (%C)\n", receptacle_name)); rd = safe.inout (); @@ -514,14 +514,14 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "Servant_Impl_Base::add_receptacle - Added new connection to " - "existing receptacle named (%s)\n", + "existing receptacle named (%C)\n", receptacle_name)); } if (this->receptacle_table_.bind (receptacle_name, safe) == 0) { CIAO_DEBUG ((LM_INFO, CLINFO - "Servant_Impl_Base::add_receptacle - Successfully added new receptacle named (%s)\n", + "Servant_Impl_Base::add_receptacle - Successfully added new receptacle named (%C)\n", receptacle_name)); } } @@ -533,7 +533,7 @@ namespace CIAO CIAO_TRACE("Servant_Impl_Base::add_consumer"); if (0 == port_name || ::CORBA::is_nil (port_ref)) { - CIAO_ERROR ((LM_ERROR, CLINFO "Servant_Impl_Base::add_consumer - Bad port name [%s] or bad objref\n", + CIAO_ERROR ((LM_ERROR, CLINFO "Servant_Impl_Base::add_consumer - Bad port name [%C] or bad objref\n", port_name)); throw ::CORBA::BAD_PARAM (); return; @@ -642,15 +642,15 @@ namespace CIAO CIAO_TRACE ("Servant_Impl_Base::activate_component"); throw CORBA::NO_IMPLEMENT (); } - - + + void Servant_Impl_Base::passivate_component (void) { CIAO_TRACE ("Servant_Impl_Base::passivate_component"); throw CORBA::NO_IMPLEMENT (); } - + Components::SessionComponent_ptr Servant_Impl_Base::get_executor (void) { @@ -658,20 +658,20 @@ namespace CIAO throw CORBA::NO_IMPLEMENT (); } - void + void Servant_Impl_Base::set_attributes (const Components::ConfigValues &/*descr*/) { CIAO_TRACE ("Servant_Impl_Base::set_attributes"); throw CORBA::NO_IMPLEMENT (); } - - ::Components::CCMHome_ptr + + ::Components::CCMHome_ptr Servant_Impl_Base::get_ccm_home (void) { CIAO_TRACE ("Servant_Impl_Base::get_ccm_home"); throw CORBA::NO_IMPLEMENT (); } - + PortableServer::POA_ptr Servant_Impl_Base::_default_POA (void) { @@ -679,16 +679,16 @@ namespace CIAO return PortableServer::POA::_duplicate (container_->the_POA ()); } - - ::Components::Cookie * + + ::Components::Cookie * Servant_Impl_Base::subscribe (const char *, ::Components::EventConsumerBase_ptr) { CIAO_TRACE ("Servant_Impl_Base::subscribe"); throw CORBA::NO_IMPLEMENT (); } - - + + ::Components::EventConsumerBase_ptr Servant_Impl_Base::unsubscribe (const char *, ::Components::Cookie *) @@ -696,7 +696,7 @@ namespace CIAO CIAO_TRACE ("Servant_Impl_Base::unsubscribe"); throw CORBA::NO_IMPLEMENT (); } - + void Servant_Impl_Base::connect_consumer (const char *, ::Components::EventConsumerBase_ptr) @@ -704,44 +704,44 @@ namespace CIAO CIAO_TRACE ("Servant_Impl_Base::connect_consumer"); throw CORBA::NO_IMPLEMENT (); } - + ::Components::EventConsumerBase_ptr Servant_Impl_Base::disconnect_consumer (const char *) { CIAO_TRACE ("Servant_Impl_Base::disconnect_consumer"); throw CORBA::NO_IMPLEMENT (); } - - ::Components::EmitterDescriptions * + + ::Components::EmitterDescriptions * Servant_Impl_Base::get_all_emitters (void) { CIAO_TRACE ("Servant_Impl_Base::get_all_emitters"); throw CORBA::NO_IMPLEMENT (); } - - ::Components::PublisherDescriptions * + + ::Components::PublisherDescriptions * Servant_Impl_Base::get_all_publishers (void) { CIAO_TRACE ("Servant_Impl_Base::get_all_publishers"); throw CORBA::NO_IMPLEMENT (); } - - ::CORBA::Boolean + + ::CORBA::Boolean Servant_Impl_Base::same_component (::CORBA::Object_ptr) { CIAO_TRACE ("Servant_Impl_Base::same_component"); throw CORBA::NO_IMPLEMENT (); } - - - ::Components::Cookie * + + + ::Components::Cookie * Servant_Impl_Base::connect (const char *, ::CORBA::Object_ptr) { CIAO_TRACE ("Servant_Impl_Base::connect"); throw CORBA::NO_IMPLEMENT (); } - + ::CORBA::Object_ptr Servant_Impl_Base::disconnect (const char *, ::Components::Cookie *) diff --git a/flat/CIAO/ciao/Server_init.cpp b/flat/CIAO/ciao/Server_init.cpp index b6065ecac1c..b12c7fab7fb 100644 --- a/flat/CIAO/ciao/Server_init.cpp +++ b/flat/CIAO/ciao/Server_init.cpp @@ -37,11 +37,11 @@ namespace CIAO return -1; } - + // -------------------------------------------------------------- // Implementation of NameUtility class // -------------------------------------------------------------- - bool NameUtility::bind_name (const char *namestr, + bool NameUtility::bind_name (const char *namestr, CORBA::Object_ptr obj, CosNaming::NamingContextExt_var &root) { @@ -55,7 +55,7 @@ namespace CIAO CosNaming::Name name; NameUtility::create_name (namestr, name); - + if (name.length () > 1) { // This name has contexts, create them. @@ -63,18 +63,18 @@ namespace CIAO Utility::NameUtility::create_context_path (root.in (), name); name.length (name.length () + 1); } - + return NameUtility::bind_object_path (root.in (), name, obj); } - void + void NameUtility::create_name (const char *namestr, CosNaming::Name &name) { ACE_Auto_Basic_Array_Ptr<char> namebfr (ACE::strnew (namestr)); ACE_Tokenizer tok (namebfr.get ()); - + tok.delimiter ('/'); - + for (char *p = tok.next (); p; p=tok.next ()) { CORBA::ULong pos = name.length (); @@ -82,7 +82,7 @@ namespace CIAO name[pos].id = CORBA::string_dup (p); } } - + void NameUtility::create_context_path (const CosNaming::NamingContextExt_ptr nc, const CosNaming::Name& name) { @@ -113,7 +113,7 @@ namespace CIAO if (lengthMissing == name.length ()) { - CIAO_ERROR ((LM_ERROR, CLINFO + CIAO_ERROR ((LM_ERROR, CLINFO "NameUtility::CreateContextPath - Null name length.\n\n")); } @@ -124,19 +124,19 @@ namespace CIAO ++l) { tmpName.length (l + 1); - + for (CORBA::ULong i = 0; i <= l; ++i) { tmpName[i] = name[i]; CORBA::String_var newSCName = nc->to_string (tmpName); CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::CreateContextPath - What's left of the name:%s\n", + "NameUtility::CreateContextPath - What's left of the name:%C\n", newSCName.in ())); } tmpCtxVar = nc->bind_new_context (tmpName); - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "NameUtility::CreateContextPath - Bound New Context.\n")); } } @@ -149,8 +149,8 @@ namespace CIAO { CosNaming::Name tmpName; CORBA::String_var newSCName = nc->to_string (name); - CIAO_DEBUG ((LM_TRACE, CLINFO - "NameUtility::BindObjectPath - The name is: %s\n", newSCName.in ())); + CIAO_DEBUG ((LM_TRACE, CLINFO + "NameUtility::BindObjectPath - The name is: %C\n", newSCName.in ())); try { @@ -159,7 +159,7 @@ namespace CIAO catch (const CosNaming::NamingContext::NotFound&) { - CIAO_DEBUG ((LM_TRACE, CLINFO + CIAO_DEBUG ((LM_TRACE, CLINFO "NameUtility::BindObjectPath - Name not found, doing new bind.\n")); nc->bind (name, obj); } @@ -193,7 +193,7 @@ namespace CIAO objV = nc->resolve (name); tmpContextV = CosNaming::NamingContext::_narrow (objV.in ()); } - + if (CORBA::is_nil (tmpContextV.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO @@ -217,7 +217,7 @@ namespace CIAO // Append 'tmpListV' to 'basicListV' CORBA::ULong basicListLen = basicListV->length (); basicListV->length (basicListLen+tmpListV->length ()); - + for (CORBA::ULong i = 0; i < tmpListV->length (); ++i) { (*basicListV)[i+basicListLen] = (*tmpListV)[i]; @@ -226,7 +226,7 @@ namespace CIAO // Re-calculate 'max_remaining' max_remaining = max_list_size - basicListV->length(); } - + bIterV->destroy (); } @@ -243,7 +243,7 @@ namespace CIAO objV = nc->resolve(name); tmpContextV = CosNaming::NamingContext::_narrow (objV.in ()); - + if (CORBA::is_nil (tmpContextV.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO @@ -272,7 +272,7 @@ namespace CIAO NameUtility::recursive_unbind (tmpContextV.in (), tmpName); } } - + nc->unbind (name); tmpContextV->destroy (); } diff --git a/flat/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/flat/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp index 28ee99aab89..822e96a7f32 100644 --- a/flat/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp +++ b/flat/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp @@ -117,7 +117,7 @@ namespace CIAO RTEventService::connect_event_consumer ( Consumer_Config_ptr consumer_config) { - ACE_DEBUG ((LM_TRACE, CLINFO + ACE_DEBUG ((LM_TRACE, CLINFO "CIAO::RTEventService::connect_event_consumer\n")); RTEvent_Consumer_Config_ptr rt_config = @@ -238,7 +238,7 @@ namespace CIAO events[0].data.any_value.replace (unk); ACE_DEBUG ((LM_DEBUG, - "******* push event for source string: %s\n", + "******* push event for source string: %C\n", source_id)); ACE_DEBUG ((LM_DEBUG, "******* push event for source id: %i\n", @@ -309,7 +309,7 @@ namespace CIAO RTEventService::create_sender (const char * addr_serv_id) { ACE_DEBUG ((LM_DEBUG, - "Create a Sender object with addr_serv_id: %s\n", + "Create a Sender object with addr_serv_id: %C\n", addr_serv_id )); // We need a local socket to send the data, open it and check @@ -355,7 +355,7 @@ namespace CIAO ::CORBA::UShort listen_port) { ACE_DEBUG ((LM_DEBUG, - "Create a receiver object with addr_serv_id: %s\n", + "Create a receiver object with addr_serv_id: %C\n", addr_serv_id )); // Create and initialize the receiver @@ -554,7 +554,7 @@ namespace CIAO RTEvent_Supplier_Config_impl::supplier_id (const char * supplier_id) { ACE_DEBUG ((LM_DEBUG, CLINFO - "RTEvent_Supplier_Config_impl::supplier_id::supplier's id: %s\n", supplier_id)); + "RTEvent_Supplier_Config_impl::supplier_id::supplier's id: %C\n", supplier_id)); this->supplier_id_ = supplier_id; @@ -649,7 +649,7 @@ namespace CIAO ACE_Hash<ACE_CString> hasher; RtecEventComm::EventSourceID int_source_id = hasher (source_id); - ACE_DEBUG ((LM_DEBUG, "******* the source string is: %s\n", source_id)); + ACE_DEBUG ((LM_DEBUG, "******* the source string is: %C\n", source_id)); ACE_DEBUG ((LM_DEBUG, "******* the source id is: %i\n", int_source_id)); this->qos_.insert_source (int_source_id, 0); @@ -672,7 +672,7 @@ namespace CIAO RTEvent_Consumer_Config_impl::consumer_id (const char * consumer_id) { ACE_DEBUG ((LM_DEBUG, CLINFO - "RTEvent_Consumer_Config_impl::set_consumer_id:%s\n", + "RTEvent_Consumer_Config_impl::set_consumer_id:%C\n", consumer_id)); this->consumer_id_ = consumer_id; |