diff options
-rw-r--r-- | TAO/ChangeLog | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp | 43 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h | 9 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp | 4 | ||||
-rwxr-xr-x | TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp | 15 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp | 21 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h | 4 |
11 files changed, 93 insertions, 46 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7785cd4703f..7f3c24568cb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Wed Dec 3 09:18:34 2003 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h: + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp: + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h: + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp: + * orbsvcs/tests/FT_App/StubBatchConsumer.h: + * orbsvcs/tests/FT_App/StubBatchConsumer.cpp: + * orbsvcs/tests/FT_App/StubFaultAnalyzer.h: + * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp: + * orbsvcs/tests/FT_App/StubFaultConsumer.h: + * orbsvcs/tests/FT_App/StubFaultConsumer.cpp: + Linux build warnings. + Tue Dec 2 18:35:29 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h: diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 805f82887de..2817f319c7a 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -49,19 +49,29 @@ static const char * criterion_initial_value = "INITIAL_VALUE"; // FT_ReplicaFactory_i Construction/destruction FT_ReplicaFactory_i::FT_ReplicaFactory_i () - : ior_output_file_(0) + : internals_ () + , orb_ (CORBA::ORB::_nil ()) + , poa_ (PortableServer::POA::_nil ()) + , object_id_ () + , ior_ () + , ior_output_file_ (0) + , identity_ () + , have_replication_manager_(0) + , replication_manager_(0) , factory_registry_ior_(0) , factory_registry_ (0) , registered_(0) - , ns_name_(0) - , location_("unknown") - , quit_on_idle_(0) - , unregister_by_location_(0) , test_output_file_(0) + , ns_name_(0) + , naming_context_ (CosNaming::NamingContext::_nil ()) + , this_name_ () + , roles_ () + , location_ ("unknown") + , quit_on_idle_ (0) + , unregister_by_location_ (0) + , replicas_ () , empty_slots_(0) , quit_requested_(0) - , have_replication_manager_(0) - , replication_manager_(0) { ACE_DEBUG((LM_DEBUG, "TestReplica type_id: %s\n", FT_TEST::_tc_TestReplica->id() )); // ACE_DEBUG((LM_DEBUG, "Hobbit type_id: %s\n", FT_TEST::_tc_Hobbit->id() )); @@ -294,7 +304,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (CORBA::is_nil(this->poa_)) + if (CORBA::is_nil(this->poa_.in ())) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), @@ -329,8 +339,8 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(reg_obj); - if (CORBA::is_nil(this->factory_registry_)) + this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(reg_obj.in ()); + if (CORBA::is_nil(this->factory_registry_.in ())) { ACE_ERROR (( LM_ERROR, "Can't resolve Factory Registry IOR %s\n", @@ -350,14 +360,14 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ACE_TRY_CHECK; this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (!CORBA::is_nil (replication_manager_)) + if (!CORBA::is_nil (replication_manager_.in ())) { this->have_replication_manager_ = 1; // empty criteria ::PortableGroup::Criteria criteria; this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (CORBA::is_nil (this->factory_registry_)) + if (CORBA::is_nil (this->factory_registry_.in ())) { ACE_ERROR ((LM_ERROR,"ReplicaFactory: ReplicationManager failed to return FactoryRegistry. Factory will not be registered.\n" )); } @@ -366,7 +376,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (!CORBA::is_nil(this->factory_registry_)) + if (!CORBA::is_nil(this->factory_registry_.in ())) { ACE_DEBUG ((LM_DEBUG,"Found a FactoryRegistry DBA ReplicationManager\n" )); } @@ -388,7 +398,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) } - if ( ! CORBA::is_nil (this->factory_registry_)) + if ( ! CORBA::is_nil (this->factory_registry_.in ())) { size_t roleCount = roles_.size(); for (size_t nRole = 0; nRole < roleCount; ++nRole) @@ -396,7 +406,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) const char * roleName = this->roles_[nRole].c_str(); PortableGroup::FactoryInfo info; - info.the_factory = ::PortableGroup::GenericFactory::_narrow(this_obj); + info.the_factory = ::PortableGroup::GenericFactory::_narrow(this_obj.in ()); info.the_location.length(1); info.the_location[0].id = CORBA::string_dup(this->location_); info.the_criteria.length(1); @@ -495,7 +505,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ACE_CHECK_RETURN (-1); ::CORBA::Object_var replica_obj = poa->servant_to_reference(replica ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj ACE_ENV_ARG_PARAMETER); + ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); write_ior (this->test_output_file_, replicaIOR); } @@ -615,6 +625,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object ( )) { METHOD_ENTRY(FT_ReplicaFactory_i::create_object); + ACE_UNUSED_ARG (type_id); InternalGuard guard (this->internals_); ::TAO_PG::Properties_Decoder decoder (the_criteria); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index ddc5b97a04d..b22d82204e9 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -170,11 +170,6 @@ private: private: /** - * A human-readable string to distinguish this from other Notifiers. - */ - ACE_CString identity_; - - /** * Protect internal state. * Mutex should be locked by corba methods, or by * external (public) methods before calling implementation @@ -210,6 +205,10 @@ private: */ const char * ior_output_file_; + /** + * A human-readable string to distinguish this from other Notifiers. + */ + ACE_CString identity_; /** * bool: true if we found a replication manager diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 7baf5ff8e75..cc0872f871e 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -277,10 +277,10 @@ int ReplicationManagerFaultConsumerAdapter::init ( TAO_PG::Properties_Encoder encoder; PortableGroup::Value value; - value <<= notifier_; + value <<= notifier_in (); encoder.add(::FT::FT_NOTIFIER, value); - value <<= replica; + value <<= replica.in (); encoder.add(::FT::FT_MONITORABLE, value); FT::FTDomainId domain_id = 0; diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index 2fa73dfdbfe..f0301274ce0 100755 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -3,7 +3,8 @@ // $Id$ #ifndef REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H #define REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H - +#include /**/ <ace/pre.h> +#include <ace/ACE.h> #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -144,6 +145,6 @@ private: PortableServer::ServantBase_var consumer_servant_; }; - +#include /**/ <ace/post.h> #endif /* REPLICATION_MANAGER_FAULT_CONSUMER_ADAPTER_H */ diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index adfbc645c8b..ae54dfa1af3 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -20,6 +20,8 @@ StubBatchConsumer::~StubBatchConsumer () int StubBatchConsumer::parse_args (int argc, char * argv[]) { + ACE_UNUSED_ARG (argc); + ACE_UNUSED_ARG (argv); int optionError = 0; // No options for now return optionError; @@ -28,7 +30,7 @@ int StubBatchConsumer::parse_args (int argc, char * argv[]) ::PortableServer::POA_ptr StubBatchConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { - return ::PortableServer::POA::_duplicate(this->poa_ ACE_ENV_ARG_PARAMETER); + return ::PortableServer::POA::_duplicate(this->poa_.in () ACE_ENV_ARG_PARAMETER); } PortableServer::ObjectId StubBatchConsumer::objectId()const @@ -65,7 +67,7 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif ACE_CHECK_RETURN (-1); - if (CORBA::is_nil(this->poa_)) + if (CORBA::is_nil(this->poa_.in ())) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), @@ -94,8 +96,8 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil(); this->consumer_id_ = notifier->connect_sequence_fault_consumer( - CosNotifyComm::SequencePushConsumer::_narrow(this_obj), - filter); + CosNotifyComm::SequencePushConsumer::_narrow(this_obj.in ()), + filter.in ()); return result; } @@ -137,6 +139,7 @@ void StubBatchConsumer::push_structured_events ( , CosEventComm::Disconnected )) { + ACE_UNUSED_ARG (notifications); //@@ sequence of structured event handling not written yet } @@ -145,8 +148,10 @@ void StubBatchConsumer::offer_change ( const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL ) - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType) + ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { + ACE_UNUSED_ARG (added); + ACE_UNUSED_ARG (removed); ACE_ERROR ((LM_ERROR, "StubBatchConsumer: offer_change call ignored.\n" )); diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index 17e0521ae5a..d81d9fa061c 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -3,6 +3,9 @@ // $Id$ #ifndef STUBBATCHCONSUMER_H #define STUBBATCHCONSUMER_H +#include /**/ <ace/pre.h> +#include <ace/ACE.h> + #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -141,5 +144,6 @@ private: ::FT::FaultNotifier::ConsumerId consumer_id_; }; +#include /**/ <ace/post.h> #endif /* STUBBATCHCONSUMER_H */ diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 7513c587977..ab4d67fbe2b 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -112,8 +112,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ////////////////////////////////////////// // resolve reference to detector factory CORBA::Object_var detector_obj = this->orb_->string_to_object(this->detector_ior_); - this->factory_ = ::FT::FaultDetectorFactory::_narrow(detector_obj); - if (CORBA::is_nil(this->factory_)) + this->factory_ = ::FT::FaultDetectorFactory::_narrow(detector_obj.in ()); + if (CORBA::is_nil(this->factory_.in ())) { std::cerr << "Can't resolve Detector Factory IOR " << this->detector_ior_ << std::endl; result = -1; @@ -122,8 +122,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ////////////////////////////////////////// // resolve references to notifier CORBA::Object_var not_obj = this->orb_->string_to_object(this->notifier_ior_); - this->notifier_ = ::FT::FaultNotifier::_narrow(not_obj); - if (CORBA::is_nil(this->notifier_)) + this->notifier_ = ::FT::FaultNotifier::_narrow(not_obj.in ()); + if (CORBA::is_nil(this->notifier_.in ())) { std::cerr << "Can't resolve Notifier IOR " << this->notifier_ior_ << std::endl; result = -1; @@ -154,8 +154,8 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { const char * iorName = this->replicaIORs[nRep]; CORBA::Object_var rep_obj = this->orb_->string_to_object(iorName); - FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(rep_obj); - if (CORBA::is_nil(replica)) + FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(rep_obj.in ()); + if (CORBA::is_nil(replica.in ())) { std::cerr << "Can't resolve Replica IOR " << iorName << std::endl; result = -1; @@ -169,10 +169,10 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) TAO_PG::Properties_Encoder encoder; PortableGroup::Value value; - value <<= this->notifier_; + value <<= this->notifier_.in (); encoder.add(::FT::FT_NOTIFIER, value); - value <<= replica; + value <<= replica.in (); encoder.add(::FT::FT_MONITORABLE, value); FT::FTDomainId domain_id = 0; diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index c9224dc955f..cbf8eaf6e35 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -3,6 +3,9 @@ // $Id$ #ifndef STUBFAULTANALYZER_H #define STUBFAULTANALYZER_H +#include /**/ <ace/pre.h> +#include <ace/ACE.h> + #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -124,5 +127,6 @@ private: }; +#include /**/ <ace/post.h> #endif /* STUBFAULTANALYZER_H */ diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index edec397ec36..94d93e97483 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -20,7 +20,7 @@ StubFaultConsumer::~StubFaultConsumer () ::PortableServer::POA_ptr StubFaultConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL) { - return ::PortableServer::POA::_duplicate(this->poa_ ACE_ENV_ARG_PARAMETER); + return ::PortableServer::POA::_duplicate(this->poa_.in () ACE_ENV_ARG_PARAMETER); } PortableServer::ObjectId StubFaultConsumer::objectId()const @@ -37,7 +37,10 @@ size_t StubFaultConsumer::notifications () const int StubFaultConsumer::parse_args (int argc, char * argv[]) { int optionError = 0; -#ifdef NO_ARGS_FOR_NOW +#ifndef NO_ARGS_FOR_NOW + ACE_UNUSED_ARG (argc); + ACE_UNUSED_ARG (argv); +#else // NO_ARGS_FOR_NOW ACE_Get_Opt get_opts (argc, argv, ""); int c; while ((c = get_opts ()) != -1) @@ -146,7 +149,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[]) argv [0] )); } -#endif +#endif NO_ARGS_FOR_NOW return optionError; } @@ -180,7 +183,7 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - if (CORBA::is_nil(this->poa_)) + if (CORBA::is_nil(this->poa_.in ())) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")), @@ -209,8 +212,8 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb, CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil(); this->consumer_id_ = notifier->connect_structured_fault_consumer( - CosNotifyComm::StructuredPushConsumer::_narrow(this_obj), - filter); + CosNotifyComm::StructuredPushConsumer::_narrow(this_obj.in ()), + filter.in ()); return result; } @@ -290,15 +293,17 @@ void StubFaultConsumer::offer_change ( const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL ) - throw (CORBA::SystemException, CosNotifyComm::InvalidEventType) + ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) { + ACE_UNUSED_ARG (added); + ACE_UNUSED_ARG (removed); ACE_ERROR ((LM_ERROR, "StubFaultConsumer: offer_change call ignored.\n" )); } void StubFaultConsumer::disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL) - throw (CORBA::SystemException) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR ((LM_ERROR, "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 013f9cb1a33..374b2e7b588 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -3,6 +3,9 @@ // $Id$ #ifndef STUBFAULTCONSUMER_H #define STUBFAULTCONSUMER_H +#include /**/ <ace/pre.h> +#include <ace/ACE.h> + #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -141,5 +144,6 @@ private: }; +#include /**/ <ace/post.h> #endif /* STUBFAULTCONSUMER_H */ |