diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify')
126 files changed, 680 insertions, 1757 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index 08309efacca..d4ec6de24c1 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -79,7 +79,6 @@ AdminProperties_Task::svc (void) { ACE_DEBUG((LM_DEBUG, "+")); this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::IMP_LIMIT, impl_limit) { @@ -243,7 +242,6 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); @@ -253,40 +251,32 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL) this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -AdminProperties::run_test (ACE_ENV_SINGLE_ARG_DECL) +AdminProperties::run_test (void) { bool reject = true; this->create_channel(reject ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->ec_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ec_->destroy(); reject = false; this->create_channel(reject ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->test_max_clients (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->test_max_clients (); - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + this->ec_->destroy (); } void @@ -296,17 +286,13 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL) AdminProperties_StructuredPushConsumer *consumer; ACE_NEW (consumer, AdminProperties_StructuredPushConsumer (this)); consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create the supplier TAO_Notify_Tests_StructuredPushSupplier *supplier = 0; ACE_NEW (supplier, TAO_Notify_Tests_StructuredPushSupplier ()); supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; AdminProperties_Task supplier_task; @@ -322,17 +308,14 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL) // received. This relies on our use of -ORBClientConnectionHandler RW. supplier_task.wait (); - this->ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ORB_run(); // consumer is destroyed by consumer->disconnect() CORBA::Long received_count = consumer->events_received_.value (); // disconnect the participants. - consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->disconnect (); + supplier->disconnect (); // If the reject_new_events setting == true, then the supplier should // have received an imp_limit exception for each event it tried to push @@ -367,13 +350,11 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL) } void -AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL) +AdminProperties::test_max_clients (void) { - this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_suppliers (); - this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_consumers (); // check the results and print the assessment. if (this->consumers_connected_count_ > this->max_consumers_) @@ -386,7 +367,7 @@ AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL) } void -AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) +AdminProperties::create_suppliers (void) { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; @@ -404,11 +385,9 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW (supplier, TAO_Notify_Tests_StructuredPushSupplier ()); supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; supplier->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->suppliers_connected_count_++; } @@ -427,7 +406,7 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) } void -AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL) +AdminProperties::create_consumers (void) { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; @@ -444,10 +423,8 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW (consumer, TAO_Notify_Tests_StructuredPushConsumer ()); consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->consumers_connected_count_++; } @@ -475,10 +452,8 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { test.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test.run_test (); } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 44abf483bf7..f1a5eb3d8e4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -101,16 +101,16 @@ public: // Initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. private: - void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); - void create_consumers (ACE_ENV_SINGLE_ARG_DECL); + void create_suppliers (void); + void create_consumers (void); void create_channel(bool reject ACE_ENV_ARG_DECL); /// Test MaxSuppliers and MaxConsumers - void test_max_clients (ACE_ENV_SINGLE_ARG_DECL); + void test_max_clients (void); /// Test MaxQueueLength properties void test_max_queue_length (bool reject ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index f3087187a05..f1cda8b802c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -84,11 +84,9 @@ ConnectDisconnect::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1);; // Create all participants. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -96,7 +94,6 @@ ConnectDisconnect::init (int argc, ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1);; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -104,7 +101,6 @@ ConnectDisconnect::init (int argc, ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -188,7 +184,7 @@ ConnectDisconnect::parse_args(int argc, char *argv[]) } void -ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL) +ConnectDisconnect::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -196,13 +192,12 @@ ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) +ConnectDisconnect::run_test (void) { for (int iterations = 0; iterations < count_; ++iterations) { @@ -216,10 +211,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->any_consumer_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->any_consumer_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create and connect Structured consumers. ACE_NEW (this->structured_consumer_[i], @@ -227,10 +220,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->structured_consumer_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->structured_consumer_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create and connect Sequence consumers. ACE_NEW (this->sequence_consumer_[i], @@ -238,7 +229,6 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->sequence_consumer_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->sequence_consumer_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); } @@ -250,10 +240,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->any_supplier_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->any_supplier_[i]->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create and connect Structured suppliers. ACE_NEW (this->structured_supplier_[i], @@ -261,10 +249,8 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->structured_supplier_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->structured_supplier_[i]->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create and connect Sequence suppliers. ACE_NEW (this->sequence_supplier_[i], @@ -272,54 +258,46 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL) i)); this->sequence_supplier_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->sequence_supplier_[i]->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } for (i = 0; i < this->consumers_; ++i) { // Disconnnect Any consumers. - this->any_consumer_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->any_consumer_[i]->disconnect (); // Disconnect Structured Consumers. this->structured_consumer_[i]->disconnect ( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; // Disconnect Sequence Consumers. this->sequence_consumer_[i]->disconnect ( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; } for (i = 0; i < this->suppliers_; ++i) { // Disconnnect Any suppliers. - this->any_supplier_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->any_supplier_[i]->disconnect (); // Disconnect Structured Suppliers. this->structured_supplier_[i]->disconnect ( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; // Disconnect Sequence Suppliers. this->sequence_supplier_[i]->disconnect ( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_CHECK; } } } void -ConnectDisconnect::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ConnectDisconnect::end_test (void) { consumer_done( 0 ); } @@ -341,8 +319,7 @@ ConnectDisconnect::check_results (void) // Destroy the channel. ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->destroy (); return 0; } @@ -362,13 +339,10 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.run_test (); - client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.end_test (); } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index a08cd5dd3ad..57e225f4215 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -77,17 +77,17 @@ public: ACE_ENV_ARG_DECL); // initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. - void end_test (ACE_ENV_SINGLE_ARG_DECL); + void end_test (void); // End the test. int check_results (void); // Check if we got the expected results. protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC. CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 58d348d5859..8cc5936b06a 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -65,19 +65,16 @@ Events::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; if (use_default_admin_ == 1) { this->supplier_admin_ = - this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->default_supplier_admin (); } else { @@ -85,7 +82,6 @@ Events::init (int argc, this->ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -93,8 +89,7 @@ Events::init (int argc, if (use_default_admin_ == 1) { this->consumer_admin_ = - this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->default_consumer_admin (); } else { @@ -102,7 +97,6 @@ Events::init (int argc, this->ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -112,10 +106,8 @@ Events::init (int argc, -1); this->consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Event_StructuredPushConsumer* consumer2 = 0; ACE_NEW_RETURN (consumer2, @@ -123,21 +115,17 @@ Events::init (int argc, -1); consumer2->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer2->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->supplier_, Event_StructuredPushSupplier (this), -1); this->supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer_start( 0 ); @@ -188,7 +176,7 @@ Events::parse_args (int argc, } void -Events::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Events::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -196,7 +184,6 @@ Events::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; /****************************************************************/ /* @@ -214,7 +201,7 @@ Events::create_EC (ACE_ENV_SINGLE_ARG_DECL) admin[1].value <<= (CORBA::Long)2; ec_->set_admin (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK;*/ +/ /****************************************************************/ ACE_ASSERT (!CORBA::is_nil (this->ec_.in ())); @@ -233,13 +220,12 @@ Events::on_event_received (void) if (this->result_count_ == 2 * this->event_count_) { ACE_DECLARE_NEW_CORBA_ENV; - this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->end_test (); } } void -Events::run_test (ACE_ENV_SINGLE_ARG_DECL) +Events::run_test (void) { // operations: CosNotification::StructuredEvent event; @@ -287,12 +273,11 @@ Events::run_test (ACE_ENV_SINGLE_ARG_DECL) this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Events::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Events::end_test (void) { consumer_done( 0 ); } @@ -302,8 +287,7 @@ Events::check_results (void) { // Destroy the channel. ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->destroy (); if (this->result_count_ == 2 * this->event_count_) { @@ -336,13 +320,10 @@ main (int argc, char* argv[]) events.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index e7493489b67..208b36eef8d 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -81,17 +81,17 @@ public: void on_event_received (void); // Called when an event is received. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. - void end_test (ACE_ENV_SINGLE_ARG_DECL); + void end_test (void); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 3d54679c307..4d0d9928cd3 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -24,11 +24,9 @@ Filter::init (int argc, char* argv [] Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -36,7 +34,6 @@ Filter::init (int argc, char* argv [] this->ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -44,32 +41,27 @@ Filter::init (int argc, char* argv [] this->ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); this->ffact_ = - ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + ec_->default_filter_factory (); return 0; } void -Filter::run_test (ACE_ENV_SINGLE_ARG_DECL) +Filter::run_test (void) { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n")); CosNotifyFilter::FilterAdmin_var ca_filter_admin = CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->run_filter_test (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ec_->destroy (); } void @@ -79,35 +71,28 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A ACE_DEBUG ((LM_DEBUG, " Calling remove_all_filters\n")); // Clear all filters. - filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + filter_admin->remove_all_filters (); this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Adding a filter \n")); CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Adding another filter \n")); this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->verify_filter_count (filter_admin, 2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n")); this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (TAO_debug_level) @@ -115,34 +100,28 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_A // remove the filter. filter_admin->remove_filter (id_1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n")); this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Calling remove_all_filters \n")); - filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + filter_admin->remove_all_filters (); if (TAO_debug_level) { ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n")); this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Make sure all filters are removed - this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Filters test has run successfully\n")); } @@ -151,8 +130,7 @@ void Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL) { expected_count = expected_count; // if we don;t do this, we get a warning on linux about arg not used. - CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (); ACE_ASSERT (filter_seq->length () == expected_count); } @@ -162,7 +140,6 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE // setup a filter at the filter admin CosNotifyFilter::Filter_var filter = this->ffact_->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (filter.in ())); @@ -175,10 +152,8 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Print the ID if (TAO_debug_level) @@ -190,8 +165,7 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE void Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL) { - CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (); ACE_DEBUG ((LM_DEBUG, "Getting all %d filters...\n ", filter_seq->length ())); @@ -203,7 +177,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG void -Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Filter::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -211,7 +185,6 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } @@ -233,10 +206,8 @@ main (int argc, char* argv[]) events.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h index 9bd93156d6d..ac36162682b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h @@ -39,11 +39,11 @@ public: ACE_ENV_ARG_DECL); // initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC /// Run some tests to check the filters. diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index ebfd98f3df1..89225a9b9be 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -87,12 +87,10 @@ IdAssignment::init (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var rootObj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (rootObj.in ())) { @@ -104,7 +102,6 @@ IdAssignment::init (int argc, CosNaming::NamingContext_var rootNC = CosNaming::NamingContext::_narrow (rootObj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNaming::Name name (1); name.length (1); @@ -112,7 +109,6 @@ IdAssignment::init (int argc, CORBA::Object_var obj = rootNC->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (obj.in ())) { @@ -126,12 +122,11 @@ IdAssignment::init (int argc, obj.in() ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; } CosNotifyChannelAdmin::ChannelID -IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL) +IdAssignment::create_ec (void) { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -141,7 +136,6 @@ IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL) initial_admin, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return id; } @@ -155,7 +149,6 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id this->notify_factory_->get_event_channel (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (ec.in())) { @@ -164,8 +157,7 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id return; } - ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->destroy (); } CosNotifyChannelAdmin::AdminID @@ -180,7 +172,6 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id this->notify_factory_->get_event_channel (channel_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (CORBA::is_nil (ec.in ())) { @@ -193,7 +184,6 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id ec->new_for_suppliers (ifgop, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (CORBA::is_nil (supplier_admin.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -218,7 +208,6 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id this->notify_factory_->get_event_channel (channel_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (CORBA::is_nil (ec.in ())) { @@ -231,7 +220,6 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id ec->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (CORBA::is_nil (consumer_admin.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -256,7 +244,6 @@ IdAssignment::destroy_consumer_admin ( this->notify_factory_->get_event_channel (channel_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -268,7 +255,6 @@ IdAssignment::destroy_consumer_admin ( CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = ec->get_consumeradmin (admin_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (consumer_admin.in())) { @@ -276,8 +262,7 @@ IdAssignment::destroy_consumer_admin ( " (%P|%t) Unable to get consumer admin\n")); } - consumer_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer_admin->destroy (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -296,7 +281,6 @@ IdAssignment::destroy_supplier_admin ( this->notify_factory_->get_event_channel (channel_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -307,14 +291,12 @@ IdAssignment::destroy_supplier_admin ( CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = ec->get_supplieradmin (admin_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (supplier_admin.in ())) ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to get supplier admin\n")); - supplier_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier_admin->destroy (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -322,7 +304,7 @@ IdAssignment::destroy_supplier_admin ( } void -IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) +IdAssignment::run_test(void) { CosNotifyChannelAdmin::ChannelID* ec_id = 0; ACE_NEW (ec_id, @@ -346,8 +328,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_id[ec_count] = this->create_ec (); // Connect <consumer_admin_count_> number of consumers // to the current ec. @@ -358,7 +339,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) consumer_admin_id [cons_count] = this->create_consumer_admin (ec_id [ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Connect <supplier_admin_count_> number of suppliers @@ -370,7 +350,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) supplier_admin_id [supp_count] = this->create_supplier_admin (ec_id [ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -379,7 +358,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) { this->destroy_ec (ec_id[ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } // for @@ -393,8 +371,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_id[ec_count] = this->create_ec (); int cons_count, supp_count; // Connect <consumer_admin_count_> number of consumers @@ -406,7 +383,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) consumer_admin_id[cons_count] = this->create_consumer_admin (ec_id[ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Connect <supplier_admin_count_> number of suppliers @@ -416,7 +392,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) supplier_admin_id[supp_count] = this->create_supplier_admin (ec_id[ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Destroy the admins. @@ -429,7 +404,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) this->destroy_consumer_admin (ec_id[ec_count], consumer_admin_id[cons_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // Destroy supplier admins @@ -440,7 +414,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) this->destroy_supplier_admin (ec_id[ec_count], supplier_admin_id[supp_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -450,7 +423,6 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL) { this->destroy_ec (ec_id[ec_count] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } // for @@ -471,10 +443,8 @@ int main (int argc, char* argv[]) test.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test.run_test (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 7b4a7e3920f..77506312d60 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -29,10 +29,10 @@ public: void init (int argc, char *argv[] ACE_ENV_ARG_DECL); - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); private: - CosNotifyChannelAdmin::ChannelID create_ec (ACE_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::ChannelID create_ec (void); void destroy_ec (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 0bb420600c7..d6c97bdd122 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -69,12 +69,10 @@ LifeCycle::init (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var rootObj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (rootObj.in ())) { @@ -86,7 +84,6 @@ LifeCycle::init (int argc, CosNaming::NamingContext_var rootNC = CosNaming::NamingContext::_narrow (rootObj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNaming::Name name (1); name.length (1); @@ -94,14 +91,12 @@ LifeCycle::init (int argc, CORBA::Object_var obj = rootNC->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in() ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; if (CORBA::is_nil (notify_factory_.in ())) { @@ -113,32 +108,26 @@ LifeCycle::init (int argc, } void -LifeCycle::run_test(ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::run_test(void) { for (int i = 0; i < this->count_; ++i) { - this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_ec (); - this->create_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_supplier_admin (); - this->create_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_consumer_admin (); - this->destroy_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->destroy_consumer_admin (); - this->destroy_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->destroy_supplier_admin (); - this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->destroy_ec (); } } void -LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::create_ec (void) { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -148,7 +137,6 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL) initial_admin, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (ec_.in ())) { ACE_ERROR ((LM_ERROR, @@ -162,7 +150,7 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL) } void -LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::create_supplier_admin (void) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = @@ -171,7 +159,6 @@ LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) supplier_admin_ = this->ec_->new_for_suppliers (ifgop, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (supplier_admin_.in ())) { @@ -186,14 +173,13 @@ LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) } void -LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::create_consumer_admin (void) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; consumer_admin_ = ec_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (consumer_admin_.in())) { @@ -208,10 +194,9 @@ LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) } void -LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::destroy_supplier_admin (void) { - this->supplier_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->supplier_admin_->destroy (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -219,10 +204,9 @@ LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) } void -LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::destroy_consumer_admin (void) { - this->consumer_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->consumer_admin_->destroy (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -230,10 +214,9 @@ LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) } void -LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL) +LifeCycle::destroy_ec (void) { - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ec_->destroy (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -255,10 +238,8 @@ main (int argc, char *argv[]) test.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test.run_test (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h index 94a2869641b..e3c7c60af8c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h @@ -25,17 +25,17 @@ public: void init (int argc, char *argv[] ACE_ENV_ARG_DECL); - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); int parse_args (int argc, char *argv[]); private: - void create_ec (ACE_ENV_SINGLE_ARG_DECL); - void create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL); - void create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL); - void destroy_ec (ACE_ENV_SINGLE_ARG_DECL); - void destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL); - void destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL); + void create_ec (void); + void create_supplier_admin (void); + void create_consumer_admin (void); + void destroy_ec (void); + void destroy_supplier_admin (void); + void destroy_consumer_admin (void); CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index f8bb9dd472a..2e248a84c05 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -99,8 +99,7 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer) if (disconnect_on_last_event_ == 1) { - consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->disconnect (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "PushConsumer has been disconnected.\n")); consumer = 0; @@ -119,8 +118,7 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer) if (disconnect_on_last_event_ == 1) { - consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->disconnect (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer has been disconnected.\n")); consumer = 0; @@ -139,8 +137,7 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer) if (disconnect_on_last_event_ == 1) { - consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->disconnect (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer has been disconnected.\n")); @@ -157,11 +154,9 @@ MultiTypes::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1);; // Create all participants. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -169,7 +164,6 @@ MultiTypes::init (int argc, ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1);; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -177,7 +171,6 @@ MultiTypes::init (int argc, ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -192,42 +185,30 @@ MultiTypes::init (int argc, // Init and connect all consumers. structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); structured_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); any_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); any_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sequence_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sequence_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Init and connect all suppliers. any_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); any_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); structured_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); structured_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sequence_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sequence_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer_start( 0 ); @@ -242,7 +223,7 @@ MultiTypes::parse_args(int, char **) } void -MultiTypes::create_EC (ACE_ENV_SINGLE_ARG_DECL) +MultiTypes::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -250,13 +231,12 @@ MultiTypes::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL) +MultiTypes::run_test (void) { // Send an Any, all consumers should receive it. CORBA::Any any; @@ -265,7 +245,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Sending Any Event..\n")); any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n")); @@ -287,7 +266,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Sending Structured Event..\n")); structured_supplier_->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n")); @@ -315,7 +293,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Sending Sequence Event..\n")); sequence_supplier_->send_events (events ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 2 events..\n")); @@ -333,7 +310,6 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Sending LAST Any Event, Consumers will attempt disconnect..\n")); any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n")); @@ -360,7 +336,7 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer) } void -MultiTypes::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MultiTypes::end_test (void) { consumer_done( 0 ); } @@ -370,8 +346,7 @@ MultiTypes::check_results (void) { // Destroy the channel. ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->destroy (); return 0; } @@ -393,13 +368,10 @@ main (int argc, char* argv[]) client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.run_test (); - client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.end_test (); } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index ac2701e61b8..5ce121020b8 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -112,10 +112,10 @@ public: ACE_ENV_ARG_DECL); // initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. - void end_test (ACE_ENV_SINGLE_ARG_DECL); + void end_test (void); // End the test. int check_results (void); @@ -125,7 +125,7 @@ protected: // Wait to receive events. void wait_for_all_consumers (int expected_count_per_consumer); - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC. CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 7842be55e57..dfd1065d18f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -84,11 +84,9 @@ Sequence::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -96,7 +94,6 @@ Sequence::init (int argc, this->ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -104,7 +101,6 @@ Sequence::init (int argc, this->ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -113,10 +109,8 @@ Sequence::init (int argc, -1); this->consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CosNotification::QoSProperties properties (3); properties.length (3); @@ -135,11 +129,9 @@ Sequence::init (int argc, -1); this->supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer_start( 0 ); @@ -212,7 +204,7 @@ Sequence::parse_args (int argc, } void -Sequence::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Sequence::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -220,7 +212,6 @@ Sequence::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (this->ec_.in ())); } @@ -235,13 +226,12 @@ Sequence::on_event_received (void) if (this->events_received_.value () == this->event_count_) { ACE_DECLARE_NEW_CORBA_ENV; - this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->end_test (); } } void -Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL) +Sequence::run_test (void) { // operations: CosNotification::StructuredEvent event; @@ -303,7 +293,6 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL) this->supplier_->send_events (batch ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // reset batch.length (this->supplier_batch_size_); @@ -318,13 +307,12 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL) this->supplier_->send_events (batch ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Sequence::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Sequence::end_test (void) { consumer_done( 0 ); } @@ -334,8 +322,7 @@ Sequence::check_results (void) { // Destroy the channel. ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->destroy (); if (this->events_received_.value () == this->event_count_) { @@ -368,13 +355,10 @@ main (int argc, char* argv[]) events.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index 5a8e1138f3b..03b4806efa1 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -82,17 +82,17 @@ public: void on_event_received (void); // Called when an event is received. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. - void end_test (ACE_ENV_SINGLE_ARG_DECL); + void end_test (void); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC int event_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index fd0dffb4620..8097219f16c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -62,11 +62,9 @@ Simple_Test::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -74,7 +72,6 @@ Simple_Test::init (int argc, this->ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -82,7 +79,6 @@ Simple_Test::init (int argc, this->ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -91,10 +87,8 @@ Simple_Test::init (int argc, -1); this->consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); Event_AnyPushConsumer* consumer2; ACE_NEW_RETURN (consumer2, @@ -102,21 +96,17 @@ Simple_Test::init (int argc, -1); consumer2->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer2->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->supplier_, Event_AnyPushSupplier (this), -1); this->supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer_start( 0 ); @@ -161,7 +151,7 @@ Simple_Test::parse_args (int argc, } void -Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Simple_Test::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -169,7 +159,6 @@ Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } @@ -187,13 +176,12 @@ Simple_Test::on_event_received (void) if (this->result_count_ == 2 * this->event_count_) { ACE_DECLARE_NEW_CORBA_ENV; - this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->end_test (); } } void -Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL) +Simple_Test::run_test (void) { CORBA::Any data; @@ -203,12 +191,11 @@ Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL) this->supplier_->send_event (data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -Simple_Test::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Test::end_test (void) { consumer_done( 0 ); } @@ -218,8 +205,7 @@ Simple_Test::check_results (void) { // Destroy the channel ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->ec_->destroy (); if (this->result_count_ == 2 * this->event_count_) { @@ -252,13 +238,10 @@ main (int argc, char* argv[]) events.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index a941fcfb027..b4ce9ede15f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -82,17 +82,17 @@ public: void on_event_received (void); // Called when an event is received. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. - void end_test (ACE_ENV_SINGLE_ARG_DECL); + void end_test (void); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 3933aaa37a1..90e572856b7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -73,11 +73,9 @@ Updates::init (int argc, Notify_Test_Client::init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; @@ -85,7 +83,6 @@ Updates::init (int argc, ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); @@ -93,7 +90,6 @@ Updates::init (int argc, ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -102,28 +98,24 @@ Updates::init (int argc, -1); consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (supplier_, Updates_StructuredPushSupplier (this), -1); supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } void -Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Updates::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -131,7 +123,6 @@ Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL) initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } @@ -198,22 +189,20 @@ Updates::reset_counts (void) } void -Updates::run_test (ACE_ENV_SINGLE_ARG_DECL) +Updates::run_test (void) { - this->test_subscription_change (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->test_subscription_change (); if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Finished testing subscription_change!\n")); - this->test_offer_change (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->test_offer_change (); ACE_DEBUG ((LM_DEBUG, "Updates test has run successfully!\n")); } void -Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL) +Updates::test_subscription_change (void) { { // reset counts. @@ -244,7 +233,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE) @@ -282,7 +270,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE). @@ -318,7 +305,6 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (0, 4); // The supplier should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for. @@ -337,7 +323,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL) } void -Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) +Updates::test_offer_change (void) { { // reset counts. @@ -368,7 +354,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE) @@ -406,7 +391,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE). @@ -442,7 +426,6 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL) removed ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; this->wait_for_updates (0, 4); // The consumer should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for. @@ -472,10 +455,8 @@ main (int argc, char* argv[]) updates.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - updates.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + updates.run_test (); } ACE_CATCH (CORBA::SystemException, se) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index e4c7104f9bf..9e6e2d89b84 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -81,7 +81,7 @@ public: int init (int argc, char *argv [] ACE_ENV_ARG_DECL); // initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. /// print_event_types @@ -94,17 +94,17 @@ public: void wait_for_updates (int expected_added, int expected_removed); protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create EC /// Helper to add types. void add_type (CosNotification::EventTypeSeq& type_seq, const char* type); // test subscription_change - void test_subscription_change (ACE_ENV_SINGLE_ARG_DECL); + void test_subscription_change (void); // test offer_change - void test_offer_change (ACE_ENV_SINGLE_ARG_DECL); + void test_offer_change (void); /// Reset the counts. void reset_counts (void); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp index 3e7c1986bb9..a331251bff0 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp @@ -31,20 +31,17 @@ Notify_Structured_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties (2); properties.length (2); @@ -73,11 +70,9 @@ Notify_Structured_Push_Consumer::_connect ( this->proxy_->set_qos (properties); this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp index c1ef387256c..f6ae74bdfe1 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp @@ -80,7 +80,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -100,10 +99,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, *client), CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // ****************************************************************** @@ -118,49 +115,39 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status != 0) ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Error: Narrow failed.\n"),1); CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (admin.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Error: nil ConsumerAdmin.\n"),1); create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n")); - - client.ORB_run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + + client.ORB_run (); ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_1->disconnect(); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } ACE_CATCH (CORBA::Exception, e) { diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 8097361c468..61dc86833e9 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -40,13 +40,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -120,7 +120,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -142,7 +141,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) ACE_TRY_NEW_ENV { supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -162,10 +160,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -181,24 +177,20 @@ int main (int argc, char* argv[]) { Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); // Activate the signaler with the POA sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -219,7 +211,6 @@ int main (int argc, char* argv[]) if (!CORBA::is_nil (admin.in ())) { create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -228,7 +219,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvent (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events)); @@ -236,11 +226,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_1->disconnect(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } } diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp index 09944124843..014e77822a6 100644 --- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp @@ -12,7 +12,6 @@ ACE_TMAIN (int argc, char *argv[]) // Initialize the base class. Notify_Test_Client client; client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory (); @@ -20,8 +19,7 @@ ACE_TMAIN (int argc, char *argv[]) ACE_DEBUG((LM_DEBUG, "Destroying ECF...\n")); - ecf_ext->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ecf_ext->destroy (); ACE_DEBUG((LM_DEBUG, "ECF destroyed.\n")); } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp index 4a34581b4f4..45fcfbd5e78 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp @@ -46,20 +46,17 @@ Notify_Sequence_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var consumer = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties (4); properties.length (4); @@ -78,11 +75,9 @@ Notify_Sequence_Push_Consumer::_connect ( this->proxy_->set_qos (properties); this->proxy_->connect_sequence_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp index f107177b9d5..e119d4728d0 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp @@ -30,20 +30,17 @@ Notify_Structured_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties (2); properties.length (2); @@ -55,11 +52,9 @@ Notify_Structured_Push_Consumer::_connect ( this->proxy_->set_qos (properties); this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp index d357454f33d..2da610b8bb1 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp @@ -106,7 +106,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -123,10 +122,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // ****************************************************************** @@ -141,46 +138,36 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n")); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; - + ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_1->disconnect(); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } ACE_CATCH (CORBA::Exception, e) { diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index 95d08daca21..3bb8d6146fc 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -53,13 +53,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -145,7 +145,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -182,7 +181,6 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL) events[i] = event; } supplier_1->send_events (events ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } static void @@ -196,10 +194,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -215,13 +211,11 @@ int main (int argc, char* argv[]) { Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (use_deadline_ordering) { @@ -233,12 +227,10 @@ int main (int argc, char* argv[]) } sig_impl.reset( new sig_i( client.orb() ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = client.orb()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -253,7 +245,6 @@ int main (int argc, char* argv[]) create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -262,7 +253,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendBatch (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -270,11 +260,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_1->disconnect(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } ACE_CATCH (CORBA::Exception, e) diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp index b457324f6ed..ad1ca25b5d8 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp @@ -95,7 +95,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -117,10 +116,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, *client), CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // ****************************************************************** @@ -135,21 +132,17 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) { @@ -161,27 +154,21 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n")); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; - + ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_1->disconnect(); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } } } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 9fee28c5c34..59c61f643f6 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -44,13 +44,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -136,7 +136,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -177,10 +176,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -196,13 +193,11 @@ int main (int argc, char* argv[]) { Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (use_deadline_ordering) { @@ -214,15 +209,13 @@ int main (int argc, char* argv[]) } sig_impl.reset( new sig_i( client.orb() ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { CORBA::String_var ior = client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); ACE_ASSERT (output_file != 0); @@ -233,9 +226,8 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::SupplierAdmin_var admin = create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_ASSERT(!CORBA::is_nil (admin.in ())); - + create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -244,7 +236,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvent (i + 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -252,11 +243,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_1->disconnect(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } ACE_CATCH (CORBA::Exception, e) diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp index 1ad6142c0d4..81ded8db860 100644 --- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp +++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp @@ -11,15 +11,13 @@ ACE_TMAIN (int argc, char *argv[]) ACE_TRY_NEW_ENV { int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Failed to initialize the Notify Testing Driver.\n")), 1); - driver.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + driver.run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 851210f4877..28a4cc23c25 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -80,7 +80,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -104,20 +103,17 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumers[ i ]->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumers[ i ]->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } static void -disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) +disconnect_consumers (void) { for (unsigned int i = 0; i < consumer_count; i++) { - consumers[ i ]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumers[ i ]->disconnect (); } } @@ -133,20 +129,16 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object = client.orb ()->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) { @@ -158,26 +150,20 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; - disconnect_consumers(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + disconnect_consumers(); ACE_DEBUG ((LM_DEBUG, "Consumer done.\n")); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } } } diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 4612ff106bf..9632f3db7bb 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -41,13 +41,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -130,7 +130,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -151,7 +150,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) for (unsigned int i = 0; i < supplier_count; i++) { suppliers[i]->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } ACE_CATCH (CORBA::Exception, e) @@ -173,20 +171,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); suppliers[i]->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; suppliers[i]->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } static void -disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) +disconnect_suppliers (void) { for (unsigned int i = 0; i < supplier_count; ++i) { - suppliers[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + suppliers[i]->disconnect (); } } @@ -201,23 +196,19 @@ int main (int argc, char* argv[]) { Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ior_output_file != 0) { @@ -236,7 +227,6 @@ int main (int argc, char* argv[]) create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_suppliers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -245,7 +235,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvent (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nEach Supplier sent %d events.\n", event_count)); @@ -253,11 +242,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - disconnect_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + disconnect_suppliers(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp index d8cb3fe8a76..a03e57d5a89 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp @@ -34,20 +34,17 @@ Notify_Sequence_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties (3); properties.length (3); @@ -67,11 +64,9 @@ Notify_Sequence_Push_Consumer::_connect ( this->proxy_->set_qos (properties); this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp index d8e9f5a6552..59e0dc6c578 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp @@ -35,20 +35,17 @@ Notify_Structured_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (use_ordering_) { @@ -62,11 +59,9 @@ Notify_Structured_Push_Consumer::_connect ( this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } @@ -90,7 +85,7 @@ Notify_Structured_Push_Consumer::push_structured_event ( { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: too many events received.\n"))); } - + if (this->count_ >= this->expected_) { this->client_.consumer_done (this); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp index 79f44545167..425c1c17145 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp @@ -101,7 +101,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -121,10 +120,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char* argv[]) @@ -134,44 +131,34 @@ int main (int argc, char* argv[]) Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_1->disconnect(); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index c1d572de8c2..35cf3d385a5 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -30,13 +30,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -141,7 +141,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -176,7 +175,6 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL) events[i] = event; } supplier_1->send_events (events ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } static void @@ -189,10 +187,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -207,30 +203,25 @@ int main (int argc, char* argv[]) { Supplier_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotification::QoSProperties qos (1); qos.length (1); qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy); qos[0].value <<= order_policy; ec->set_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ior_output_file != 0) { @@ -249,7 +240,6 @@ int main (int argc, char* argv[]) create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -258,7 +248,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendBatch (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -266,11 +255,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_1->disconnect(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp index d86df34f06b..73a8b9e7d8c 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp @@ -97,7 +97,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -116,10 +115,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, *client), CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char* argv[]) @@ -129,45 +126,35 @@ int main (int argc, char* argv[]) Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_1->disconnect(); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index bda45d89f6c..9920f3ca97b 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -29,13 +29,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -143,7 +143,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -171,7 +170,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) ACE_TRY_NEW_ENV { supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -191,10 +189,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char* argv[]) @@ -204,30 +200,25 @@ int main (int argc, char* argv[]) { Supplier_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotification::QoSProperties qos (1); qos.length (1); qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy); qos[0].value <<= order_policy; ec->set_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ior_output_file != 0) { @@ -246,7 +237,6 @@ int main (int argc, char* argv[]) create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); ACE_ASSERT(!CORBA::is_nil (admin.in ())); create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -255,7 +245,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvent (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -263,11 +252,9 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_1->disconnect(); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp index 7bb9c0d3801..1f1757b255d 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp @@ -16,11 +16,10 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman } void -TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_Application_Command::handle_init (void) { // Call the Base class. - TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Notify_Tests_Application_Command::handle_init (); CORBA::ORB_var orb; @@ -29,7 +28,6 @@ TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL) TAO_Notify_Tests_RT_Priority_Mapping* mapping = new TAO_Notify_Tests_RT_Priority_Mapping (); mapping->init (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; LOOKUP_MANAGER->_register (mapping); } diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h index 34376e99515..88493add5f7 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h @@ -36,7 +36,7 @@ public: /// Destructor ~TAO_Notify_Tests_RT_Application_Command (); - virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL); + virtual void handle_init (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 4d9aa177a6c..e6595fc4225 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -177,7 +177,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_POA_Command::execute_i (void) { if (this->command_ == CREATE) { @@ -190,12 +190,10 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve parent poa. PortableServer::POA_var parent_poa; @@ -204,7 +202,6 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) // Create the POA. this->create (rt_orb.in (), parent_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Created RT POA %s\n", this->POA_name_.c_str ())); } @@ -213,10 +210,8 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) PortableServer::POA_var poa; LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->destroy (1,0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Destroyed RT POA %s\n", this->POA_name_.c_str ())); } @@ -255,7 +250,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ rt_orb->create_priority_model_policy (priority_model_, server_priority_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (lanes_.length () != 0) { @@ -277,14 +271,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else if (thread_pool_static_threads_ > 0) @@ -307,12 +299,10 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; thread_pool_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (bands_.length () != 0) @@ -321,14 +311,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ bands_policy = rt_orb->create_priority_banded_connection_policy (this->bands_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::PolicyList poa_policy_list; CORBA::Policy_var activation_policy = parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0) { @@ -379,12 +367,10 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ // Get the POA Manager. PortableServer::POAManager_var poa_manager = - parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + parent_poa->the_POAManager (); parent_poa->create_POA (POA_name_.c_str (), poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index b5bcb27a825..bdebc7806cc 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -45,7 +45,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Get the command name. virtual const char* get_name (void); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp index ee30db74bd1..4d81fcdc42f 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp @@ -15,12 +15,10 @@ TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->priority_mapping_ = mapping_manager->mapping (); } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 43acfd70c38..36199f3cbd9 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -159,7 +159,6 @@ StructuredPushConsumer_i::push_structured_event ( static_cast<int>(this->received_) )); ACE_THROW (CORBA::UNKNOWN()); - ACE_CHECK; } if (notification.filterable_data.length () > 0) { @@ -393,7 +392,6 @@ SequencePushConsumer_i::push_structured_events ( static_cast<int>(nevent + 1) )); ACE_THROW (CORBA::UNKNOWN()); - ACE_CHECK; } const CosNotification::StructuredEvent & notification = notifications[nevent]; if (notification.filterable_data.length () > 0) @@ -605,7 +603,6 @@ AnyPushConsumer_i::push ( static_cast<int>(this->received_) )); ACE_THROW (CORBA::UNKNOWN()); - ACE_CHECK; } CORBA::ULong seq = 0; if (data >>= seq) @@ -701,11 +698,9 @@ ReconnectionCallback_i::reconnect ( ACE_TEXT ("(%P|%t) Consumer received reconnection request\n") )); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!CORBA::is_nil (this->ecf_.in ())) { this->consumer_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->reconnect_count_ += 1; } else @@ -717,7 +712,7 @@ ReconnectionCallback_i::reconnect ( } CORBA::Boolean -ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ReconnectionCallback_i::is_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Boolean (1); @@ -733,16 +728,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i () void -ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL) +ReconnectionCallback_i::fini (void) { if (this->id_is_valid_) { NotifyExt::ReconnectionRegistry_var registry = NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->id_is_valid_ = false; } } @@ -756,22 +749,17 @@ ReconnectionCallback_i::init ( this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf); PortableServer::ObjectId_var reconnection_callback_id = poa->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ReconnectionCallback_var callback = NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ReconnectionRegistry_var registry = NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->id_is_valid_ = true; } @@ -918,7 +906,6 @@ void Consumer_Main::usage(FILE * out)const int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (0 != this->parse_args(argc, argv)) { @@ -928,7 +915,6 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object)) { @@ -939,24 +925,19 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate (); if (this->use_naming_service_ ) { - this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->find_notify_factory (); } else { - int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int ok = resolve_notify_factory (); if (!ok) { return -1; @@ -965,11 +946,9 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->reconnecting_ = load_ids (); - init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_event_channel (); - init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_consumer_admin (); switch (this->mode_) { @@ -984,8 +963,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) )); } this->structured_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_); - init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_structured_proxy_supplier (); break; } case MODE_SEQUENCE: @@ -999,8 +977,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) )); } this->sequence_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_); - init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_sequence_proxy_supplier (); break; } case MODE_ANY: @@ -1014,8 +991,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) )); } this->any_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_); - init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_any_proxy_supplier (); break; } default: @@ -1031,7 +1007,6 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->root_poa_.in (), this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); save_ids (); return 0; @@ -1136,32 +1111,27 @@ Consumer_Main::reconnect ( } this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory); this->reconnecting_ = true; - init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_event_channel (); - init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_consumer_admin (); switch (this->mode_) { case MODE_STRUCTURED: { - init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_structured_proxy_supplier (); break; } case MODE_SEQUENCE: { - init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_sequence_proxy_supplier (); break; } case MODE_ANY : { - init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_any_proxy_supplier (); break; } } @@ -1175,7 +1145,7 @@ Consumer_Main::reconnect ( int -Consumer_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::resolve_naming_service (void) { // ignore redundant calls if (CORBA::is_nil (this->naming_context_.in ())) @@ -1183,22 +1153,19 @@ Consumer_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); } return !CORBA::is_nil (this->naming_context_.in ()); } int -Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::find_notify_factory (void) { - int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + int status = this->resolve_naming_service (); if (status) { CosNaming::Name name (1); @@ -1208,36 +1175,32 @@ Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN(0); } return ! CORBA::is_nil (this->ecf_.in ()); } int -Consumer_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::resolve_notify_factory (void) { CORBA::Object_var factory_obj = this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); return ! CORBA::is_nil (this->ecf_.in ()); } void -Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::init_event_channel (void) { bool ok = false; if (this->reconnecting_) @@ -1247,7 +1210,6 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) this->ec_ = this->ecf_->get_event_channel ( this->ec_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (this->ec_.in ()); if (ok && this->verbose_) { @@ -1345,7 +1307,6 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) adminprops, this->ec_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (ec_.in ()); if (ok && this->verbose_) { @@ -1371,7 +1332,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1); void -Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::init_consumer_admin (void) { bool ok = false; if (this->reconnecting_) @@ -1380,7 +1341,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY_EX(TWO) { - this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + this->sa_ = this->ec_->default_consumer_admin (); ACE_TRY_CHECK_EX(TWO); ok = ! CORBA::is_nil (this->sa_.in ()); this->sa_id_ = default_admin_id; @@ -1429,7 +1390,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY_EX(THREE) { - this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + this->sa_ = this->ec_->default_consumer_admin (); ACE_TRY_CHECK_EX(THREE); ok = ! CORBA::is_nil (this->sa_.in ()); this->sa_id_ = default_admin_id; @@ -1457,7 +1418,6 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::OR_OP, this->sa_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (this->sa_.in ()); #ifdef TEST_SET_QOS @@ -1474,7 +1434,6 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much qosprops.length(i); this->sa_->set_qos (qosprops ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif @@ -1496,7 +1455,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) } } void -Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::init_structured_proxy_supplier (void) { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1508,7 +1467,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) this->structured_proxy_id_ ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1530,7 +1488,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::STRUCTURED_EVENT, this->structured_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1542,7 +1499,6 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) } this->structured_proxy_push_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->structured_proxy_push_supplier_.in ())) { @@ -1557,15 +1513,12 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_consumer_id = this->root_poa_->activate_object ( &(this->structured_push_consumer_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->structured_push_consumer_ref_ = CosNotifyComm::StructuredPushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (this->structured_push_consumer_ref_.in ())) @@ -1580,12 +1533,11 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) this->structured_proxy_push_supplier_->connect_structured_push_consumer ( this->structured_push_consumer_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->structured_push_consumer_.set_connected(true); } void -Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::init_sequence_proxy_supplier (void) { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1596,7 +1548,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) proxy = this->sa_->get_proxy_supplier( this->sequence_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1618,14 +1569,12 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::SEQUENCE_EVENT, this->sequence_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); #ifdef TEST_SET_QOS // temporary if (ok) { set_proxy_qos (proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif // TEST_SET_QOS if (ok && this->verbose_) @@ -1638,7 +1587,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) } this->sequence_proxy_push_supplier_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->sequence_proxy_push_supplier_.in ())) { @@ -1655,15 +1603,12 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_consumer_id = this->root_poa_->activate_object ( &(this->sequence_push_consumer_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->sequence_push_consumer_ref_ = CosNotifyComm::SequencePushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ())) { @@ -1677,7 +1622,6 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) this->sequence_proxy_push_supplier_->connect_sequence_push_consumer ( this->sequence_push_consumer_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->sequence_push_consumer_.set_connected(true); } @@ -1698,11 +1642,10 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much qosprops.length(i); proxy->set_qos (qosprops ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) +Consumer_Main::init_any_proxy_supplier (void) { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1713,7 +1656,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) proxy = this->sa_->get_proxy_supplier( this->any_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1754,7 +1696,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::ANY_EVENT, this->any_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) @@ -1767,7 +1708,6 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) } this->any_proxy_push_supplier_ = CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->any_proxy_push_supplier_.in ())) { @@ -1782,15 +1722,12 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_consumer_id = this->root_poa_->activate_object ( &(this->any_push_consumer_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->any_push_consumer_ref_ = CosNotifyComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (this->any_push_consumer_ref_.in ())) @@ -1804,33 +1741,28 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL) this->any_proxy_push_supplier_->connect_any_push_consumer ( this->any_push_consumer_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->any_push_consumer_.set_connected(true); } -int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL) +int Consumer_Main::fini (void) { - this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); - + this->reconnection_callback_.fini (); + if (this->disconnect_on_exit_) { if (!CORBA::is_nil (this->structured_proxy_push_supplier_.in ())) { - this->structured_proxy_push_supplier_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->structured_proxy_push_supplier_->disconnect_structured_push_supplier (); } if (!CORBA::is_nil (this->sequence_proxy_push_supplier_.in ())) { - this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier (); } if (!CORBA::is_nil (this->any_proxy_push_supplier_.in ())) { - this->any_proxy_push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->any_proxy_push_supplier_->disconnect_push_supplier (); } if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id) { @@ -1849,7 +1781,7 @@ int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL) } -int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL) +int Consumer_Main::run (void) { int result = 0; @@ -1860,7 +1792,6 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_Time_Value tv(0, 100 * 1000); this->orb_->run(tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(-1); } // see if consumers detected errors @@ -1885,13 +1816,11 @@ main (int argc, char *argv[]) if (result == 0) { - result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = app.run (); } if (result == 0) { - app.fini (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + app.fini (); } } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index b6326ac31d7..3db09828745 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -174,7 +174,7 @@ public: CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_ ACE_ENV_ARG_DECL); - void fini (ACE_ENV_SINGLE_ARG_DECL); + void fini (void); size_t reconnect_count () const; @@ -183,7 +183,7 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Boolean is_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -204,8 +204,8 @@ class Consumer_Main int parse_single_arg (int argc, char *argv[]); int init (int argc, char *argv[] ACE_ENV_ARG_DECL); - int run (ACE_ENV_SINGLE_ARG_DECL); - int fini (ACE_ENV_SINGLE_ARG_DECL); + int run (void); + int fini (void); void usage (FILE * log) const; void reconnect ( @@ -215,19 +215,19 @@ class Consumer_Main private: /// Find naming service. - int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (void); /// Resolve the Notify factory from the Naming service. - int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL); + int find_notify_factory (void); /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory") - int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL); + int resolve_notify_factory (void); - void init_event_channel (ACE_ENV_SINGLE_ARG_DECL); - void init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL); - void init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL); - void init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL); - void init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL); + void init_event_channel (void); + void init_consumer_admin (void); + void init_structured_proxy_supplier (void); + void init_sequence_proxy_supplier (void); + void init_any_proxy_supplier (void); void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 1bd46703440..8bb82aa7548 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -135,11 +135,9 @@ ReconnectionCallback_i::reconnect ( ACE_TEXT ("(%P|%t) Supplier received reconnection request\n") )); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!CORBA::is_nil (this->ecf_.in ())) { this->supplier_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->reconnect_count_ += 1; } else @@ -151,7 +149,7 @@ ReconnectionCallback_i::reconnect ( } CORBA::Boolean -ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ReconnectionCallback_i::is_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Boolean (1); @@ -166,16 +164,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i () void -ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL) +ReconnectionCallback_i::fini (void) { if (this->id_is_valid_) { NotifyExt::ReconnectionRegistry_var registry = NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->id_is_valid_ = false; } } @@ -189,22 +185,17 @@ ReconnectionCallback_i::init ( this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf); PortableServer::ObjectId_var reconnection_callback_id = poa->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ReconnectionCallback_var callback = NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ReconnectionRegistry_var registry = NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->id_is_valid_ = true; } @@ -349,7 +340,6 @@ void Supplier_Main::usage(FILE * log)const int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (0 != this->parse_args(argc, argv)) { @@ -359,7 +349,6 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object)) { @@ -370,24 +359,19 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate (); if (this->use_naming_service_ ) { - this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->find_notify_factory (); } else { - int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int ok = resolve_notify_factory (); if (!ok) { return -1; @@ -396,31 +380,26 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->reconnecting_ = load_ids (); - init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_event_channel (); - init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_supplier_admin (); switch (this->mode_) { case MODE_STRUCTURED: { - init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_structured_proxy_consumer (); break; } case MODE_SEQUENCE: { - init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_sequence_proxy_consumer (); break; } case MODE_ANY: { - init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + init_any_proxy_consumer (); break; } default: @@ -435,7 +414,6 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL) this->root_poa_.in (), this->ecf_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); save_ids (); return 0; @@ -534,30 +512,25 @@ Supplier_Main::reconnect ( { this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory); this->reconnecting_ = true; - init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_event_channel (); - init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_supplier_admin (); switch (this->mode_) { case MODE_STRUCTURED: { - init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_structured_proxy_consumer (); break; } case MODE_SEQUENCE: { - init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_sequence_proxy_consumer (); break; } case MODE_ANY: { - init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + init_any_proxy_consumer (); break; } } @@ -565,7 +538,7 @@ Supplier_Main::reconnect ( int -Supplier_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::resolve_naming_service (void) { // ignore redundant calls if (CORBA::is_nil (this->naming_context_.in ())) @@ -573,22 +546,19 @@ Supplier_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); } return !CORBA::is_nil (this->naming_context_.in ()); } int -Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::find_notify_factory (void) { - int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + int status = this->resolve_naming_service (); if (status) { CosNaming::Name name (1); @@ -598,36 +568,32 @@ Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN(0); } return ! CORBA::is_nil (this->ecf_.in ()); } int -Supplier_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::resolve_notify_factory (void) { CORBA::Object_var factory_obj = this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( factory_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(0); return ! CORBA::is_nil (this->ecf_.in ()); } void -Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::init_event_channel (void) { bool ok = false; if (this->reconnecting_) @@ -637,7 +603,6 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) this->ec_ = this->ecf_->get_event_channel ( this->ec_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (this->ec_.in ()); if (ok && this->verbose_) { @@ -735,7 +700,6 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) adminprops, this->ec_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (ec_.in ()); if (ok && this->verbose_) { @@ -761,7 +725,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1); void -Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::init_supplier_admin (void) { bool ok = false; if (this->reconnecting_ && this->sa_id_ != default_admin_id) @@ -791,7 +755,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY_EX(TWO) { - this->sa_ = this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + this->sa_ = this->ec_->default_supplier_admin (); ACE_TRY_CHECK_EX(TWO); ok = ! CORBA::is_nil (this->sa_.in ()); this->sa_id_ = default_admin_id; @@ -820,7 +784,6 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::OR_OP, this->sa_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (this->sa_.in ()); if (ok && this->verbose_) { @@ -833,7 +796,7 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) } void -Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::init_structured_proxy_consumer (void) { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -845,7 +808,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) this->structured_proxy_id_ ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -867,7 +829,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::STRUCTURED_EVENT, this->structured_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -879,7 +840,6 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) } this->structured_proxy_push_consumer_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ())) { @@ -893,15 +853,12 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_supplier_id = this->root_poa_->activate_object ( &(this->structured_push_supplier_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->structured_push_supplier_ref_ = CosNotifyComm::StructuredPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (structured_push_supplier_ref_.in ())) { @@ -916,11 +873,10 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) this->structured_proxy_push_consumer_->connect_structured_push_supplier ( structured_push_supplier_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::init_sequence_proxy_consumer (void) { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -931,7 +887,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) proxy = this->sa_->get_proxy_consumer( this->sequence_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -953,7 +908,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::SEQUENCE_EVENT, this->sequence_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -965,7 +919,6 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) } this->sequence_proxy_push_consumer_ = CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ())) { @@ -981,15 +934,12 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_supplier_id = this->root_poa_->activate_object ( &(this->sequence_push_supplier_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->sequence_push_supplier_ref_ = CosNotifyComm::SequencePushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (sequence_push_supplier_ref_.in ())) { @@ -1003,11 +953,10 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) this->sequence_proxy_push_consumer_->connect_sequence_push_supplier ( sequence_push_supplier_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) +Supplier_Main::init_any_proxy_consumer (void) { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -1018,7 +967,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) proxy = this->sa_->get_proxy_consumer( this->any_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1040,7 +988,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::ANY_EVENT, this->any_proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ok = ! CORBA::is_nil (proxy.in ()); if (ok && this->verbose_) { @@ -1052,7 +999,6 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) } this->any_proxy_push_consumer_ = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (this->any_proxy_push_consumer_.in ())) { @@ -1068,15 +1014,12 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var push_supplier_id = this->root_poa_->activate_object ( &(this->any_push_supplier_) ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->any_push_supplier_ref_ = CosNotifyComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (CORBA::is_nil (any_push_supplier_ref_.in ())) { @@ -1090,15 +1033,13 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL) this->any_proxy_push_consumer_->connect_any_push_supplier ( any_push_supplier_ref_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } -int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL) +int Supplier_Main::fini (void) { if (this->disconnect_on_exit_) { - this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->reconnection_callback_.fini (); if (!CORBA::is_nil (this->structured_proxy_push_consumer_.in ())) { if (this->verbose_) @@ -1107,8 +1048,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) Disconnecting structured\n") )); } - this->structured_proxy_push_consumer_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->structured_proxy_push_consumer_->disconnect_structured_push_consumer (); } if (!CORBA::is_nil (this->sequence_proxy_push_consumer_.in ())) { @@ -1118,8 +1058,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) Disconnecting sequence\n") )); } - this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer (); } if (!CORBA::is_nil (this->any_proxy_push_consumer_.in ())) { @@ -1129,8 +1068,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL) ACE_TEXT ("(%P|%t) Disconnecting any\n") )); } - this->any_proxy_push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-4); + this->any_proxy_push_consumer_->disconnect_push_consumer (); } if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id) { @@ -1148,7 +1086,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL) return 0; } -void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL) +void Supplier_Main::send_structured_event (void) { CosNotification::StructuredEvent event; @@ -1193,10 +1131,9 @@ void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL) this->structured_proxy_push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } -void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL) +void Supplier_Main::send_sequence_event (void) { CosNotification::EventBatch event_batch(1); event_batch.length (1); @@ -1243,10 +1180,9 @@ void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL) this->sequence_proxy_push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } -void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL) +void Supplier_Main::send_any_event (void) { CORBA::Any event; event <<= CORBA::ULong (this->serial_number_); @@ -1261,10 +1197,9 @@ void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL) this->any_proxy_push_consumer_->push (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } -int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) +int Supplier_Main::run (void) { int result = 0; bool paused = false; @@ -1316,20 +1251,17 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL) { case MODE_STRUCTURED: { - send_structured_event (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + send_structured_event (); break; } case MODE_SEQUENCE: { - send_sequence_event (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + send_sequence_event (); break; } case MODE_ANY: { - send_any_event (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + send_any_event (); break; } } @@ -1353,13 +1285,11 @@ main (int argc, char *argv[]) if (result == 0) { - result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = app.run (); } if (result == 0) { - app.fini (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + app.fini (); } } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index f429cf7892c..4e7659b35f3 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -86,7 +86,7 @@ public: CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_ ACE_ENV_ARG_DECL); - void fini (ACE_ENV_SINGLE_ARG_DECL); + void fini (void); size_t reconnect_count () const; @@ -95,7 +95,7 @@ public: ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Boolean is_alive (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -116,8 +116,8 @@ class Supplier_Main int parse_single_arg (int argc, char *argv[]); int init (int argc, char *argv[] ACE_ENV_ARG_DECL); - int run (ACE_ENV_SINGLE_ARG_DECL); - int fini (ACE_ENV_SINGLE_ARG_DECL); + int run (void); + int fini (void); void usage (FILE * log) const; void reconnect ( @@ -127,24 +127,24 @@ class Supplier_Main private: /// Find naming service. - int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (void); /// Resolve the Notify factory from the Naming service. - int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL); + int find_notify_factory (void); /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory") - int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL); + int resolve_notify_factory (void); - void init_event_channel (ACE_ENV_SINGLE_ARG_DECL); - void init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL); - void init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL); - void init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL); - void init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL); + void init_event_channel (void); + void init_supplier_admin (void); + void init_structured_proxy_consumer (void); + void init_sequence_proxy_consumer (void); + void init_any_proxy_consumer (void); /// send events. - void send_structured_event (ACE_ENV_SINGLE_ARG_DECL); - void send_sequence_event (ACE_ENV_SINGLE_ARG_DECL); - void send_any_event (ACE_ENV_SINGLE_ARG_DECL); + void send_structured_event (void); + void send_sequence_event (void); + void send_any_event (void); void save_ids(); bool load_ids(); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp index 9a7df06e215..89e4f24aae5 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp @@ -29,20 +29,17 @@ Notify_Sequence_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties (3); properties.length (3); @@ -53,11 +50,9 @@ Notify_Sequence_Push_Consumer::_connect ( this->proxy_->set_qos (properties); this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp index c59a53095fb..5409e3e29c7 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp @@ -79,15 +79,12 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter ("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if(CORBA::is_nil(filter.in())) { @@ -104,7 +101,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec "$.enum < 0"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // apply filter admin->add_filter (filter.in ()); @@ -128,10 +124,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // ****************************************************************** @@ -146,21 +140,17 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) { @@ -172,23 +162,18 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + + sig->done (); } } } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 483a7446f92..38a282be7f0 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -40,13 +40,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -173,7 +172,6 @@ SendEvents (int id ACE_ENV_ARG_DECL) ACE_TRY_NEW_ENV { supplier_1->send_events (events ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -193,10 +191,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -212,23 +208,19 @@ int main (int argc, char* argv[]) { Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -249,7 +241,6 @@ int main (int argc, char* argv[]) if (!CORBA::is_nil (admin.in ())) { create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -258,7 +249,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvents (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n")); @@ -268,8 +258,7 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp index b39323d5890..d2b0eaf5979 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp @@ -34,20 +34,17 @@ Notify_Sequence_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties(3); properties.length(3); @@ -59,11 +56,9 @@ Notify_Sequence_Push_Consumer::_connect ( proxy_->set_qos(properties); proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 5ac22e79b8b..190f715ac9b 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -84,7 +84,6 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); } @@ -104,10 +103,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, *client), CORBA::NO_MEMORY ()); consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // ****************************************************************** @@ -121,38 +118,31 @@ int main (int argc, char* argv[]) Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(status == 0); ACE_UNUSED_ARG(status); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (filter) { CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil(filter.in())); @@ -163,25 +153,20 @@ int main (int argc, char* argv[]) constraint_list[0].constraint_expr = CORBA::string_dup(constraintString); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; admin->add_filter(filter.in()); } ACE_ASSERT (!CORBA::is_nil (admin.in ())); create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); return 0; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index 30c0a2e2b0d..aa77ad56994 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -42,13 +42,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -122,7 +122,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -174,7 +173,6 @@ SendEvents (int id ACE_ENV_ARG_DECL) ACE_TRY_NEW_ENV { supplier_1->send_events(events ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -194,10 +192,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -214,24 +210,20 @@ int main (int argc, char* argv[]) Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -252,7 +244,6 @@ int main (int argc, char* argv[]) if (!CORBA::is_nil (admin.in ())) { create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -261,7 +252,6 @@ int main (int argc, char* argv[]) { ACE_DEBUG((LM_DEBUG, "+")); SendEvents (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n")); @@ -271,8 +261,7 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp index 18a1c92a0d2..8d106648c2d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp @@ -35,27 +35,22 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume { ACE_UNUSED_ARG(notify_channel); CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } static void validate_expression(bool expr, const char* msg) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index 7f41538007e..3579b78f725 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -63,10 +63,8 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char * argv[]) @@ -76,7 +74,6 @@ int main (int argc, char * argv[]) Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); @@ -86,19 +83,16 @@ int main (int argc, char * argv[]) CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ())); if (useFilter) { CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (filter.in ())) { @@ -114,7 +108,6 @@ int main (int argc, char * argv[]) constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1 and group != 0"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; consumer_admin->add_filter (filter.in ()); } @@ -123,28 +116,22 @@ int main (int argc, char * argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n")); - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n")); - sig->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index 161d3f3e8c4..674f7479170 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -31,13 +31,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -73,7 +73,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -105,7 +104,6 @@ send_event (int id) ACE_DEBUG((LM_DEBUG, "+")); supplier->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -125,10 +123,8 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char * argv[]) @@ -138,21 +134,18 @@ int main (int argc, char * argv[]) { Notify_Test_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil(ec.in())); CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CosNotifyChannelAdmin::SupplierAdmin_var admin = create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); @@ -164,7 +157,6 @@ int main (int argc, char * argv[]) { CORBA::String_var ior = client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen (ior_file, "w"); ACE_ASSERT (output_file != 0); @@ -181,7 +173,6 @@ int main (int argc, char * argv[]) { ACE_DEBUG((LM_DEBUG, "+")); send_event (i); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -189,8 +180,7 @@ int main (int argc, char * argv[]) ACE_OS::unlink (ior_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp index 232c98a0f45..7ac0f3014aa 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp @@ -81,25 +81,21 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (consumerFilter_ != None) { CosNotifyFilter::FilterFactory_var ffact = - notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + notify_channel->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT(! CORBA::is_nil (filter.in ())); @@ -110,7 +106,6 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume constraint_list[0].constraint_expr = CORBA::string_dup ("group != 1"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; proxysupplier->add_filter (filter.in ()); } @@ -119,14 +114,11 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } static void validate_expression(bool expr, const char* msg) diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp index 352ef42df08..81bdb94275d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp @@ -10,25 +10,21 @@ Notify_Push_Supplier::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = supplier_admin->obtain_notification_push_consumer ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (useFilter) { CosNotifyFilter::FilterFactory_var ffact = - notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + notify_channel->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT(! CORBA::is_nil (filter.in ())); @@ -39,7 +35,6 @@ Notify_Push_Supplier::_connect ( constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; proxyconsumer->add_filter (filter.in ()); } @@ -47,12 +42,9 @@ Notify_Push_Supplier::_connect ( this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow ( proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index eb633882bcc..2bb76afe96d 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -80,10 +80,8 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char * argv[]) @@ -93,7 +91,6 @@ int main (int argc, char * argv[]) Consumer_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status != 0) { ACE_ERROR((LM_ERROR, "Error: Unable to init consumer.\n")); @@ -108,19 +105,16 @@ int main (int argc, char * argv[]) ec->new_for_consumers ((consumerFilter == OrOp ? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP), adminid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ())); if (consumerFilter != None) { CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (filter.in ())) { @@ -136,7 +130,6 @@ int main (int argc, char * argv[]) constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; consumer_admin->add_filter (filter.in ()); } @@ -145,28 +138,22 @@ int main (int argc, char * argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (sig.in ())); create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n")); - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n")); - sig->done(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index 69463ea273a..92d96729b15 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -32,13 +32,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -115,7 +115,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec CosNotifyChannelAdmin::AND_OP), adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -147,7 +146,6 @@ send_event (int id) ACE_DEBUG((LM_DEBUG, "+")); supplier->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -168,10 +166,8 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier->_connect (admin, ec, useFilters ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, @@ -179,12 +175,10 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, ACE_ENV_ARG_DECL) { CosNotifyFilter::FilterFactory_var ffact = - notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + notify_channel->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT(!CORBA::is_nil (filter.in ())); @@ -195,10 +189,8 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, constraint_list[0].constraint_expr = CORBA::string_dup ("type != 0"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int main (int argc, char * argv[]) @@ -208,21 +200,18 @@ int main (int argc, char * argv[]) { Supplier_Client client; int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_UNUSED_ARG(status); ACE_ASSERT(status == 0); CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("Struct_Multi_Filter", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil(ec.in())); CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CosNotifyChannelAdmin::SupplierAdmin_var admin = create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER); @@ -241,7 +230,6 @@ int main (int argc, char * argv[]) { CORBA::String_var ior = client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen (ior_file, "w"); ACE_ASSERT (output_file != 0); @@ -258,7 +246,6 @@ int main (int argc, char * argv[]) { ACE_DEBUG((LM_DEBUG, "+")); send_event (i); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events)); @@ -266,8 +253,7 @@ int main (int argc, char * argv[]) ACE_OS::unlink (ior_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); return 0; } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 07ba1cbfdd9..1a316c6d55f 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -21,7 +21,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter () } char* -TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -79,7 +79,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra ACE_NEW_THROW_EX (infoseq_ptr, CosNotifyFilter::ConstraintInfoSeq (0), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return infoseq_ptr; } @@ -109,26 +108,25 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void -TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_Test_Filter::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK; PortableServer::POA_var my_POA = _default_POA (); @@ -156,7 +154,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this)); @@ -170,12 +167,10 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct CORBA::Object_var object = orb->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -284,7 +279,7 @@ TAO_Notify_Tests_RT_Test_Filter::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_Tests_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 3ca5f7d6445..be8498014d8 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -43,7 +43,7 @@ public: ~TAO_Notify_Tests_RT_Test_Filter (); protected: - virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL) + virtual char * constraint_grammar (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -70,17 +70,17 @@ protected: CosNotifyFilter::ConstraintNotFound )); - virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) + virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL) + virtual void remove_all_constraints (void) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -114,7 +114,7 @@ protected: CosNotifyFilter::CallbackNotFound )); - virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (ACE_ENV_SINGLE_ARG_DECL) + virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index ecd20e34d7a..ac48714aae7 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -23,7 +23,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_ PortableServer::ServantBase_var servant_var (this); - return _this (ACE_ENV_SINGLE_ARG_PARAMETER); + return _this (); } CosNotifyFilter::Filter_ptr @@ -55,12 +55,10 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_gr PortableServer::ObjectId_var oid = this->filter_poa_->activate_object (filter ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); CORBA::Object_var obj = this->filter_poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); return CosNotifyFilter::Filter::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index 463a3fc9b8d..65da45fc8b0 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -25,7 +25,7 @@ class TestSupplier : public POA_CosNotifyComm::StructuredPushSupplier { - virtual void disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { + virtual void disconnect_structured_push_supplier(void) throw (CORBA::SystemException) { } virtual void subscription_change( const CosNotification::EventTypeSeq&, @@ -38,7 +38,7 @@ class TestSupplier class TestConsumer : public POA_CosNotifyComm::StructuredPushConsumer { - virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) { + virtual void disconnect_structured_push_consumer(void) throw (CORBA::SystemException) { } virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED) @@ -65,7 +65,6 @@ int main(int ac, char **av) PortableServer::POA_var poa; orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (orb.in ())); if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0) @@ -108,10 +107,8 @@ int main(int ac, char **av) } CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (obj.in ())); poa = PortableServer::POA::_narrow(obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (poa.in ())); PortableServer::POAManager_var mgr = poa->the_POAManager(); mgr->activate(); @@ -122,27 +119,22 @@ int main(int ac, char **av) policies[0] = poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var persistentPOA = poa->create_POA ( "PersistentPOA", mgr.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0]->destroy (); if (pass1) { CosNotifyChannelAdmin::EventChannelFactory_var cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; NotifyExt::EventChannelFactory_var ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ecf.in ())) { @@ -185,21 +177,18 @@ int main(int ac, char **av) CosNotifyChannelAdmin::ChannelID ecid; ::CosNotifyChannelAdmin::EventChannel_var ec = ecf->create_channel(qosprops, adminprops, ecid ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::AdminID consumer_admin_id; CosNotifyChannelAdmin::ConsumerAdmin_var ca = ec->new_for_consumers(CosNotifyChannelAdmin::OR_OP, consumer_admin_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::AdminID supplier_admin_id; CosNotifyChannelAdmin::SupplierAdmin_var sa = ec->new_for_suppliers(CosNotifyChannelAdmin::OR_OP, supplier_admin_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::ProxyID proxy_id; CosNotifyChannelAdmin::ProxySupplier_var ps = @@ -207,7 +196,6 @@ int main(int ac, char **av) CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::StructuredProxyPushSupplier_var strps = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(ps.in()); @@ -216,7 +204,6 @@ int main(int ac, char **av) CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::SequenceProxyPushSupplier_var seqps = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(ps.in()); @@ -225,7 +212,6 @@ int main(int ac, char **av) CosNotifyChannelAdmin::ANY_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::ProxyPushSupplier_var anyps = CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(ps.in()); @@ -235,7 +221,6 @@ int main(int ac, char **av) CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::StructuredProxyPushConsumer_var strpc = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(pc.in()); @@ -243,7 +228,6 @@ int main(int ac, char **av) CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::SequenceProxyPushConsumer_var seqpc = CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(pc.in()); @@ -252,23 +236,19 @@ int main(int ac, char **av) CosNotifyChannelAdmin::ANY_EVENT, proxy_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyChannelAdmin::ProxyPushConsumer_var anypc = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(pc.in()); CosNotifyFilter::FilterFactory_var ff = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter1 = ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (filter1.in ())); CosNotifyFilter::Filter_var filter2 = ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT(! CORBA::is_nil (filter2.in ())); @@ -278,66 +258,48 @@ int main(int ac, char **av) constraint_list[0].constraint_expr = CORBA::string_dup("Number == 100"); filter1->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; filter2->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ca->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sa->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; strps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; seqps->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; anyps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; strpc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; seqpc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; anypc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; anypc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotification::EventTypeSeq added1(1), removed1(0); added1.length(1); added1[0].domain_name = CORBA::string_dup("nightly_builds"); added1[0].type_name = CORBA::string_dup("*"); ca->subscription_change(added1, removed1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Connect a PushConsumer and PushSupplier TestSupplier test_supplier_svt; PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TestConsumer test_consumer_svt; PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; strpc->connect_structured_push_supplier(push_sup.in()); strps->connect_structured_push_consumer(push_cons.in()); @@ -345,14 +307,11 @@ int main(int ac, char **av) persistentPOA->deactivate_object (oid1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; persistentPOA->deactivate_object (oid2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ecf->destroy(); //////////////////////////////// // TODO make this not hardcoded ACE_OS::rename ("abc.xml", "loadtest.xml"); @@ -365,12 +324,9 @@ int main(int ac, char **av) // Create a new ecf, which should load itself from loadtest.xml CosNotifyChannelAdmin::EventChannelFactory_var cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - ACE_TRY_CHECK; NotifyExt::EventChannelFactory_var ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (ecf.in ())) { @@ -378,17 +334,13 @@ int main(int ac, char **av) } // Force a change, which should write out a new abc.xml. - ecf->save_topology (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ecf->save_topology (); - ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ecf->destroy(); } poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + orb->destroy (); poa = PortableServer::POA::_nil (); orb = CORBA::ORB::_nil (); retval = 0; diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 86b477c1bba..028edce2389 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -225,12 +225,11 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) } void -TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Activation_Manager::write_ior (void) { PortableServer::ServantBase_var servant_var (this); - Notify_Test::Activation_Manager_var am_object = _this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Notify_Test::Activation_Manager_var am_object = _this (); CORBA::ORB_var orb; LOOKUP_MANAGER->resolve (orb); @@ -238,7 +237,6 @@ TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL) // Write IOR to a file, if asked. CORBA::String_var str = orb->object_to_string (am_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (this->ior_output_file_) { @@ -251,7 +249,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -260,7 +258,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_D } void -TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Activation_Manager::start (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -273,17 +271,15 @@ TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Activation_Manager::signal_peer (void) { CORBA::ORB_var orb; LOOKUP_MANAGER->resolve (orb); CORBA::Object_var object = orb->string_to_object (this->ior_input_file_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (peer.in ())) { @@ -292,5 +288,5 @@ TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL) this->ior_input_file_.c_str ())); } - peer->start (ACE_ENV_SINGLE_ARG_PARAMETER); + peer->start (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index 838516b3d64..d166573d437 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -55,7 +55,7 @@ public: virtual ~TAO_Notify_Tests_Activation_Manager (); /// Interface impl. - virtual void start (ACE_ENV_SINGLE_ARG_DECL) + virtual void start (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -96,9 +96,9 @@ public: // Returns 1 if the file could be opened for read. int ior_input_file (const ACE_TCHAR *file_name); - void write_ior (ACE_ENV_SINGLE_ARG_DECL); - void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL); - void signal_peer (ACE_ENV_SINGLE_ARG_DECL); + void write_ior (void); + void wait_for_start_signal (void); + void signal_peer (void); protected: /// Lock to serialize internal state. diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 5172ae18620..f3ce3c8d811 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -92,20 +92,17 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Application_Command::handle_init (void) { /// Fetch the root poa. PortableServer::POA_var root_poa; LOOKUP_MANAGER->resolve (root_poa); - ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa->the_POAManager (); /// Activate the root POA. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); TAO_Notify_Tests_Priority_Mapping* mapping = new TAO_Notify_Tests_Priority_Mapping (); @@ -113,7 +110,7 @@ TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void) { ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n")); @@ -124,7 +121,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE } void -TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Application_Command::handle_shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n")); @@ -136,7 +133,7 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_N } void -TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Application_Command::handle_dump_stats (void) { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n")); @@ -147,7 +144,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL } void -TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Application_Command::handle_run (void) { // Run the Consumers @@ -163,62 +160,54 @@ TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_US } void -TAO_Notify_Tests_Application_Command::handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Application_Command::handle_signal_peer (void) { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; LOOKUP_MANAGER->resolve (act_mgr); - act_mgr->signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER); + act_mgr->signal_peer (); } void -TAO_Notify_Tests_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Application_Command::handle_wait_to_start (void) { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; LOOKUP_MANAGER->resolve (act_mgr); - act_mgr->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + act_mgr->write_ior (); - act_mgr->wait_for_start_signal (ACE_ENV_SINGLE_ARG_PARAMETER); + act_mgr->wait_for_start_signal (); } void -TAO_Notify_Tests_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Application_Command::execute_i (void) { if (this->command_ == INIT) { - this->handle_init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_init (); } else if (this->command_ == RUN) { - this->handle_run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_run (); } else if (this->command_ == WAIT_FOR_EVENTS) { - this->handle_wait_for_completion (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_wait_for_completion (); } else if (this->command_ == SHUTDOWN) { - this->handle_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_shutdown (); } else if (this->command_ == DUMP_STATE) { - this->handle_dump_stats (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_dump_stats (); } else if (this->command_ == SIGNAL_PEER) { - this->handle_signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_signal_peer (); } else if (this->command_ == WAIT_TO_START) { - this->handle_wait_to_start (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_wait_to_start (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index ff267fc37a3..76481484705 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -43,7 +43,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Get the command name. virtual const char* get_name (void); @@ -70,13 +70,13 @@ protected: int dump_samples_; ///= Handlers - virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL); - void handle_run (ACE_ENV_SINGLE_ARG_DECL); - void handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL); - void handle_shutdown (ACE_ENV_SINGLE_ARG_DECL); - void handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL); - void handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL); - void handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL); + virtual void handle_init (void); + void handle_run (void); + void handle_wait_for_completion (void); + void handle_shutdown (void); + void handle_dump_stats (void); + void handle_signal_peer (void); + void handle_wait_to_start (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 4e63d4ba284..085a49bbcae 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -31,7 +31,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command) } void -TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Command::execute (void) { if (this->command_ == INVALID) { @@ -43,8 +43,7 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { - this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->execute_i (); } ACE_CATCHANY { @@ -55,5 +54,5 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL) } if (this->next_) - this->next_->execute (ACE_ENV_SINGLE_ARG_PARAMETER); + this->next_->execute (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 41f23995f0b..d4427da065a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -50,7 +50,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Implement command execution. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void execute_i (void) = 0; /// Return the name of this command. virtual const char* get_name (void)= 0; @@ -68,7 +68,7 @@ protected: private: /// Execute the command. - void execute (ACE_ENV_SINGLE_ARG_DECL); + void execute (void); /// Save the next command to exec. void next (TAO_Notify_Tests_Command* command); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index e95b8ed81b2..6d40e44cef1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -74,10 +74,10 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T } void -TAO_Notify_Tests_Command_Builder::execute (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Command_Builder::execute (void) { if (this->start_command_) - this->start_command_->execute (ACE_ENV_SINGLE_ARG_PARAMETER); + this->start_command_->execute (); } ACE_STATIC_SVC_DEFINE(TAO_Notify_Tests_Command_Builder, diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index 7ca63765dbe..f18b14e1230 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -53,7 +53,7 @@ public: void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); /// Execute the <start_command_>. - void execute (ACE_ENV_SINGLE_ARG_DECL); + void execute (void); protected: /// The starting command. each command executes the next one when done. diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 2965bc0094c..af36c757989 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -30,32 +30,28 @@ TAO_Notify_Tests_ConsumerAdmin_Command::name (void) } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void) { CosNotifyChannelAdmin::EventChannel_var ec; LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // create consumer admin CosNotifyChannelAdmin::ConsumerAdmin_var sa = ec->new_for_consumers (this->ifgop_, this->id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void) { CosNotifyChannelAdmin::ConsumerAdmin_var admin; LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Let the user see what we're subscribed for, ACE_DEBUG ((LM_DEBUG, "Calling ConsumerAdmin subscription_change : ")); @@ -74,23 +70,20 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG ACE_DEBUG ((LM_DEBUG, "\n")); admin->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void) { CosNotifyChannelAdmin::ConsumerAdmin_var admin; LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void) { //@@ TODO: } @@ -155,26 +148,22 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void) { if (this->command_ == CREATE) { - this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create (); } else if (this->command_ == SUBSCRIPTION) { - this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_subscriptions (); } else if (this->command_ == SET_QOS) { - this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_set_qos (); } else if (this->command_ == DUMP_STATE) { - this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_status (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index a94146e47bc..ce8a8c9e785 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -42,7 +42,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -80,10 +80,10 @@ protected: CosNotification::EventTypeSeq removed_; /// = Handlers - void handle_create (ACE_ENV_SINGLE_ARG_DECL); - void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL); - void handle_status (ACE_ENV_SINGLE_ARG_DECL); - void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL); + void handle_create (void); + void handle_subscriptions (void); + void handle_status (void); + void handle_set_qos (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index 9441287f68b..35f62570b7f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -33,7 +33,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ())); @@ -54,7 +53,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not , this->proxy_id_ , qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ())); @@ -87,7 +85,6 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotificati if (proxy_supplier != 0) { proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made.")); diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp index 502d535a91a..dc9a14014e2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp @@ -15,23 +15,19 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer () } void -TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Direct_Consumer::connect (void) { // Get the POA PortableServer::POA_var poa; LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // set the POA this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Activate the consumer with the default_POA_. CosNotifyComm::StructuredPushConsumer_var consumer_ref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); // Register the activated object. LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h index d27c57924c0..aedcf83e89a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h @@ -37,7 +37,7 @@ public: ~TAO_Notify_Tests_Direct_Consumer (); /// Connect using options parsed and set initial QoS. - virtual void connect (ACE_ENV_SINGLE_ARG_DECL); + virtual void connect (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp index a647893b1f7..5fdf0f3424d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp @@ -20,29 +20,24 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier () } void -TAO_Notify_Tests_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Direct_Supplier::connect (void) { // Get the POA PortableServer::POA_var poa; LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // set the POA this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Get hold of the reference. CosNotifyComm::StructuredPushSupplier_var supplier_ref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); // Register the activated object. LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the target object. LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -52,5 +47,4 @@ TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredE ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ())); this->target_object_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h index 999bf7463ec..ece4265d60a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h @@ -37,7 +37,7 @@ public: ~TAO_Notify_Tests_Direct_Supplier (); /// Connect using options parsed and set initial QoS. - virtual void connect (ACE_ENV_SINGLE_ARG_DECL); + virtual void connect (void); // Send one event. Bypass sending to the Notify and send directly to taget consumer. virtual void send_event (const CosNotification::StructuredEvent& event diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 8985aa6f772..460954ed447 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -95,8 +95,7 @@ TAO_Notify_Tests_Worker::svc (void) ACE_TRY { ACE_DEBUG ((LM_DEBUG, "Running Commands... \n")); - this->cmd_builder_->execute (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cmd_builder_->execute (); } ACE_CATCHANY { @@ -137,7 +136,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void) // just disabling it altogether. It doesn't provide much value, and // makes service startup needlessly more verbose. See bugzilla 2477 // for details. - + ACE_hthread_t current; ACE_Thread::self (current); @@ -156,8 +155,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void) { ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ())); - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY @@ -243,7 +241,6 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) command_line.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (this->parse_args (argc, argv) == -1) return -1; @@ -254,7 +251,6 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) check_supported_priorities (this->orb_.in()); LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->cmd_builder_ = ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder); @@ -272,7 +268,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL) } void -TAO_Notify_Tests_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_Driver::run (void) { // Task activation flags. long flags = diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 610e6b02e79..7e8ff3887cc 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -110,7 +110,7 @@ public: int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL); /// Execute the commands. - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); /// Shutdown virtual void shutdown (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 519fee9fc45..318b857fb67 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -88,7 +88,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void) { CosNotifyChannelAdmin::EventChannelFactory_var notify_factory; @@ -120,39 +120,33 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG LOOKUP_MANAGER->resolve (naming); notify_service->init_service (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Activate the factory notify_factory = notify_service->create (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Register with the Naming Service CosNaming::Name_var name = naming->to_name (TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER); - ACE_CHECK; naming->rebind (name.in (), notify_factory.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_EventChannel_Command::handle_create (void) { if (this->collocated_ == 1) { - this->create_collocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->create_collocated_ecf (); } CosNotifyChannelAdmin::EventChannelFactory_var ec_factory; LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties qos; CosNotification::AdminProperties admin; @@ -163,63 +157,53 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) admin, this->id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_EventChannel_Command::handle_destroy (void) { ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ())); CosNotifyChannelAdmin::EventChannel_var ec; LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->destroy (); } void -TAO_Notify_Tests_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void) { CosNotifyChannelAdmin::EventChannel_var ec; LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ec->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_EventChannel_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_EventChannel_Command::handle_status (void) { //@@ TODO: Implement } void -TAO_Notify_Tests_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_EventChannel_Command::execute_i (void) { if (this->command_ == CREATE) { - this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create (); } else if (this->command_ == DESTROY) { - this->handle_destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_destroy (); } else if (this->command_ == SET_QOS) { - this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_set_qos (); } else if (this->command_ == DUMP_STATE) { - this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_status (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 35a2baa4bb0..dc8163bb0d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -47,7 +47,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -82,13 +82,13 @@ protected: CORBA::Boolean collocated_; /// Helper method to create a collocated ECF. - void create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL); + void create_collocated_ecf (void); /// = Handlers - void handle_create (ACE_ENV_SINGLE_ARG_DECL); - void handle_destroy (ACE_ENV_SINGLE_ARG_DECL); - void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL); - void handle_status (ACE_ENV_SINGLE_ARG_DECL); + void handle_create (void); + void handle_destroy (void); + void handle_set_qos (void); + void handle_status (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 2bb7bb716b4..df44cc76328 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -98,44 +98,37 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void) { CosNotifyChannelAdmin::EventChannel_var ec; LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotifyFilter::FilterFactory_var ff = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec->default_filter_factory (); LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::handle_create_filter (void) { CosNotifyFilter::FilterFactory_var ff; LOOKUP_MANAGER->resolve (ff , this->factory_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotifyFilter::Filter_var filter = ff->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::handle_add_constraint (void) { CosNotifyFilter::Filter_var filter; LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotifyFilter::ConstraintExpSeq constraint_list (1); constraint_list.length (1); @@ -145,64 +138,53 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Adding constraint %s\n", this->constraint_.c_str ())); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::handle_add_filter (void) { CosNotifyFilter::Filter_var filter; LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotifyFilter::FilterAdmin_var filter_admin; LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void) { CosNotifyFilter::Filter_var filter; LOOKUP_MANAGER->resolve (filter, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - filter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + filter->destroy (); } void -TAO_Notify_Tests_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Filter_Command::execute_i (void) { if (this->command_ == CREATE_FACTORY) { - this->handle_create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create_filter_factory (); } else if (this->command_ == CREATE_FILTER) { - this->handle_create_filter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create_filter (); } else if (this->command_ == ADD_CONSTRAINT) { - this->handle_add_constraint (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_add_constraint (); } else if (this->command_ == ADD_FILTER) { - this->handle_add_filter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_add_filter (); } else if (this->command_ == DESTROY) { - this->handle_destroy_filter (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_destroy_filter (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 2678b6c4437..d3acf0efe73 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -42,7 +42,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -72,11 +72,11 @@ protected: ACE_CString constraint_; ///= Handlers - void handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL); - void handle_create_filter (ACE_ENV_SINGLE_ARG_DECL); - void handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL); - void handle_add_filter (ACE_ENV_SINGLE_ARG_DECL); - void handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL); + void handle_create_filter_factory (void); + void handle_create_filter (void); + void handle_add_constraint (void); + void handle_add_filter (void); + void handle_destroy_filter (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index 14ebdb482d8..409c493eea1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -24,7 +24,6 @@ TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) orb_ = CORBA::ORB::_duplicate (orb); this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service ACE_ENV_ARG_PARAMETER); } @@ -35,12 +34,10 @@ TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* ob CosNaming::Name_var name = this->naming_->to_name (obj_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; //@@ Warning: this is rebind.. this->naming_->rebind (name.in (), obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Registered %s with Naming Service\n", obj_name)); } @@ -106,7 +103,6 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha { CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (poa_object)) { @@ -116,14 +112,12 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha } poa = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->root_poa_ = poa; } else { poa = root_poa_->find_POA (poa_name, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -132,7 +126,6 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (naming_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -140,7 +133,6 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNaming::NamingContextExt::_duplicate (this->naming_.in ()); @@ -157,7 +149,6 @@ TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG CORBA::Object_var obj = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); return obj._retn (); } @@ -165,90 +156,72 @@ void TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (factory_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (channel_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (filter_factory_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ff = CosNotifyFilter::FilterFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (filter_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; filter = CosNotifyFilter::Filter::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL) { CORBA::Object_var object = this->resolve_object (filter_admin_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index cd6a689acfa..b0e96e70dbd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -22,9 +22,7 @@ Notify_Test_Client::~Notify_Test_Client () ACE_TRY_NEW_ENV { root_poa_->destroy(1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_->destroy(); } ACE_CATCH (CORBA::Exception, e) { @@ -37,13 +35,10 @@ int Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (status == 0) { - this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->resolve_naming_service (); + this->resolve_Notify_factory (); } return status; } @@ -64,7 +59,6 @@ Notify_Test_Client::init_ORB (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (this->parse_args (argc, argv) != 0) { @@ -74,7 +68,6 @@ Notify_Test_Client::init_ORB (int argc, CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object)) { @@ -84,25 +77,21 @@ Notify_Test_Client::init_ORB (int argc, } this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate (); return 0; } void -Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +Notify_Test_Client::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -111,11 +100,10 @@ Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Notify_Test_Client::resolve_Notify_factory (void) { CosNaming::Name name (1); name.length (1); @@ -124,31 +112,27 @@ Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; } int -Notify_Test_Client::ORB_run (ACE_ENV_SINGLE_ARG_DECL) +Notify_Test_Client::ORB_run (void) { while (! is_done()) { ACE_Time_Value tv(0, 10 * 1000); orb_->run(tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(-1); } ACE_DEBUG((LM_DEBUG, "\nWaiting for stray events...\n")); ACE_Time_Value tv(2); orb_->run(tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN(-1); return 0; } @@ -232,7 +216,6 @@ Notify_Test_Client::create_event_channel (const char* cname, initial_admin, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); naming_context_->rebind(name, ec.in()); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 39bbed208fe..83ac9f07880 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -43,7 +43,7 @@ public: virtual int parse_args (int argc, char* argv[]); // Allow the user to override this empty method - int ORB_run (ACE_ENV_SINGLE_ARG_DECL); + int ORB_run (void); // Call ORB::run to accept requests. void consumer_start (TAO_Notify_Tests_Peer*); @@ -80,10 +80,10 @@ protected: ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (void); // Try to get hold of a running naming service. - void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (void); // Try to resolve the Notify factory from the Naming service. // = Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 556d11fb0f0..6b6fbe1de6c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -35,9 +35,9 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void) template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR -TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void) { - return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->_this (); } template <class Peer_Traits> @@ -51,11 +51,9 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, PortableServer::ServantBase_var servant_var (this); ACE_TYPENAME Peer_Traits::VAR peer_var = - this->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->activate (); this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // save the proxy this->proxy_ = Proxy_Traits_INTERFACE::_duplicate (proxy); @@ -67,7 +65,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, LOOKUP_MANAGER->_register (this->proxy_.in (), this->proxy_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -79,32 +76,28 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ptr ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_var.in ())); this->connect (proxy_var.in (), this->proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void) { // Get the POA PortableServer::POA_var poa; LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // set the POA this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the admin ACE_TYPENAME Admin_Traits::VAR admin_var; @@ -112,18 +105,15 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL) LOOKUP_MANAGER->resolve (admin_var, this->admin_name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var = Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ext_var.in (), this->qos_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_var.in ())); @@ -132,7 +122,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL) this->connect (proxy_var.in (), this->proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } template <class Peer_Traits> @@ -143,19 +132,17 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos ( ) { this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void) { #if (TAO_HAS_MINIMUM_CORBA == 0) ACE_TRY { CORBA::Boolean not_exist = - this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->get_proxy ()->_non_existent (); if (not_exist == 1) { @@ -192,13 +179,13 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL) template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ())); ACE_TRY_EX(TRY1) { - this->disconnect_from_proxy (ACE_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_from_proxy (); ACE_TRY_CHECK_EX(TRY1); } ACE_CATCHANY @@ -211,7 +198,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_EX(TRY2) { - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); ACE_TRY_CHECK_EX(TRY2); } ACE_CATCHANY @@ -234,18 +221,16 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA ( template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /* TAO_Notify_Tests_Peer_T_CPP */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index eafdc02a172..33bf03cabcf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -60,29 +60,29 @@ public: void connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL); /// Connect using options parsed and set initial QoS. - virtual void connect (ACE_ENV_SINGLE_ARG_DECL); + virtual void connect (void); // Disconnect from the Peer. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Set Qos void set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL); /// Dump status - void status (ACE_ENV_SINGLE_ARG_DECL); + void status (void); // Accessor for <proxy_>. Proxy_Traits_PTR get_proxy (void); /// Deactivate the object. - void deactivate (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (void); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); protected: /// Activate this object in the default POA. - virtual Peer_Traits_PTR activate (ACE_ENV_SINGLE_ARG_DECL); + virtual Peer_Traits_PTR activate (void); ///= To be implemented by specializations. @@ -98,7 +98,7 @@ protected: ACE_ENV_ARG_DECL) = 0; /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) = 0; + virtual void disconnect_from_proxy (void) = 0; // = Data Members diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index a718deb73bf..3f8b6083cf4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -178,7 +178,6 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK; const CosNotification::PropertySeq& prop_seq = notification.header.variable_header; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index cfda2e788f8..32dc958d771 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -88,7 +88,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter) { ACE_DECLARE_NEW_CORBA_ENV; act_mgr->_register (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } consumer->init_state (arg_shifter); @@ -162,7 +161,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void) { ACE_DECLARE_NEW_CORBA_ENV; act_mgr->resolve (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); } if (consumer == 0) @@ -172,102 +170,90 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void) { this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void) { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); if (consumer == 0) return; - consumer->connect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->connect (); ACE_DEBUG ((LM_DEBUG, "Consumer %s is connected\n", this->name_.c_str ())); } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void) { TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer (); if (consumer == 0) return; consumer->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void) { TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer (); if (consumer == 0) return; - consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->disconnect (); } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void) { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); if (consumer == 0) return; - consumer->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->deactivate (); } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void) { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); if (consumer == 0) return; - consumer->status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + consumer->status (); } void -TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void) { if (this->command_ == CREATE) { - this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create (); } else if (this->command_ == SUBSCRIPTION) { - this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_subscriptions (); } else if (this->command_ == DISCONNECT) { - this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_disconnect (); } else if (this->command_ == DEACTIVATE) { - this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_deactivate (); } else if (this->command_ == DUMP_STATE) { - this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_status (); } else if (this->command_ == SET_QOS) { - this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_set_qos (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index d258c7e2e8a..6e2c3c5c7f5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -44,7 +44,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -83,12 +83,12 @@ protected: TAO_Notify_Tests_Periodic_Consumer* consumer (void); ///= Handlers - void handle_create (ACE_ENV_SINGLE_ARG_DECL); - void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL); - void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL); - void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL); - void handle_status (ACE_ENV_SINGLE_ARG_DECL); - void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL); + void handle_create (void); + void handle_subscriptions (void); + void handle_disconnect (void); + void handle_deactivate (void); + void handle_status (void); + void handle_set_qos (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index b2aea30f498..4dfd9eee2dc 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -178,19 +178,18 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier) } void -TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void) { int WARMUP_COUNT = 10; for (int i = 0; i < WARMUP_COUNT ; ++i) { this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier::send_prologue (void) { // populate event. // send the base time and max count. @@ -212,14 +211,12 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n")); this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier::handle_svc (void) { - this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->send_prologue (); ACE_hrtime_t before, after; TimeBase::TimeT time_t; @@ -254,7 +251,6 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL) this->name_.c_str (), i)); this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; after = ACE_OS::gethrtime (); @@ -309,8 +305,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void) ACE_TRY_NEW_ENV { // First, send warmup events. - this->send_warmup_events (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->send_warmup_events (); // Next, wait for other threads. this->barrier_->wait (); @@ -321,8 +316,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void) // now wait till the phase_ period expires. ACE_OS::sleep (ACE_Time_Value (0, phase_)); - this->handle_svc (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->handle_svc (); } ACE_CATCH (CORBA::UserException, ue) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 5bcdf57d34c..ffaf7e4eba6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -64,13 +64,13 @@ public: protected: /// svc method. - void handle_svc (ACE_ENV_SINGLE_ARG_DECL); + void handle_svc (void); /// Send a few events before the actual measurements. - void send_warmup_events (ACE_ENV_SINGLE_ARG_DECL); + void send_warmup_events (void); /// Send Prologue - void send_prologue (ACE_ENV_SINGLE_ARG_DECL); + void send_prologue (void); /// All tasks synch at this barrier. ACE_Barrier* barrier_; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 9cdfaccbb51..09eda2b3150 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -78,7 +78,6 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter) { ACE_DECLARE_NEW_CORBA_ENV; act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } supplier->init_state (arg_shifter); @@ -149,7 +148,6 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void) ACE_DECLARE_NEW_CORBA_ENV; act_mgr->resolve (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (supplier == 0) ACE_DEBUG ((LM_DEBUG, "Supplier %s not found by Lookup Manager\n", this->name_.c_str ())); @@ -158,64 +156,60 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void) { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) return; - supplier->connect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier->connect (); ACE_DEBUG ((LM_DEBUG, "Supplier %s is connected\n", this->name_.c_str ())); } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void) { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) return; supplier->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void) { TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier (); if (supplier == 0) return; - supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier->disconnect (); } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void) { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) return; - supplier->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier->deactivate (); } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void) { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) return; - supplier->status (ACE_ENV_SINGLE_ARG_PARAMETER); + supplier->status (); } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void) { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); @@ -226,36 +220,30 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_D } void -TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void) { if (this->command_ == CREATE) { - this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create (); } else if (this->command_ == OFFER) { - this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_offers (); } else if (this->command_ == DISCONNECT) { - this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_disconnect (); } else if (this->command_ == DEACTIVATE) { - this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_deactivate (); } else if (this->command_ == DUMP_STATE) { - this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_status (); } else if (this->command_ == SET_QOS) { - this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_set_qos (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 726d7cd0ddd..08398e4940d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -44,7 +44,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -83,12 +83,12 @@ protected: TAO_Notify_Tests_Periodic_Supplier* supplier (void); ///= Handlers - void handle_create (ACE_ENV_SINGLE_ARG_DECL); - void handle_offers (ACE_ENV_SINGLE_ARG_DECL); - void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL); - void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL); - void handle_status (ACE_ENV_SINGLE_ARG_DECL); - void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL); + void handle_create (void); + void handle_offers (void); + void handle_disconnect (void); + void handle_deactivate (void); + void handle_status (void); + void handle_set_qos (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index 4ab288212fb..8c9c1a6cf6c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -30,14 +30,14 @@ TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee } void -TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); - this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_supplier (); } void -TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index 5aae9203447..719a1ed3d4c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -77,10 +77,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = PushConsumer methods - virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index f5c3f4d94bd..d3b0465d9f6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -39,14 +39,14 @@ TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee } void -TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); - this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_consumer (); } void -TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h index edf2753e87d..1f60e770930 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h @@ -80,10 +80,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = PushSupplier method - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index 629639070b5..f8ed0f5d93f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -16,14 +16,12 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer () } void -TAO_Notify_Tests_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_Relay_Consumer::connect (void) { - TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + TAO_Notify_Tests_Direct_Consumer::connect (); // Resolve the destination object. LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -34,7 +32,6 @@ TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::S { // The Periodic Consumer will record the run statistics. //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER); - //ACE_CHECK; // Forward the event. if (CORBA::is_nil (this->destination_object_.in ())) diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h index 87fe1ecf44a..03892b7c54b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h @@ -37,7 +37,7 @@ public: ~TAO_Notify_Tests_Relay_Consumer (); /// Connect using options parsed and set initial QoS. - virtual void connect (ACE_ENV_SINGLE_ARG_DECL); + virtual void connect (void); void push_structured_event (const CosNotification::StructuredEvent &/*notification*/ ACE_ENV_ARG_DECL_NOT_USED) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index e63d3661671..47b6de9c601 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -31,14 +31,14 @@ TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ } void -TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); - this->proxy_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_sequence_push_supplier (); } void -TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index 7e4a4773b27..521a1020207 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -77,10 +77,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = SequencePushConsumer methods - virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_sequence_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index 76151253271..512708e0c73 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -41,14 +41,14 @@ TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ } void -TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); - this->proxy_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_sequence_push_consumer (); } void -TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h index dad8bd6d0eb..6cb47dc71be 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h @@ -81,10 +81,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = SequencePushSupplier method - virtual void disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_sequence_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index 2db62342778..e68019136bd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -31,14 +31,14 @@ TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR prox } void -TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); - this->proxy_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_structured_push_supplier (); } void -TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 43ee9ffec52..426bb654439 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -77,10 +77,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = StructuredPushConsumer methods - virtual void disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_structured_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index 289058864f1..787437534f4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -42,14 +42,14 @@ TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR prox } void -TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void) { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); - this->proxy_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_structured_push_consumer (); } void -TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { bool this_method_used_only_by_notify_service = false; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h index e1c11dc6a54..29df4959471 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h @@ -81,10 +81,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL); /// Disconnect from proxy. - virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_from_proxy (void); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 5adaa65c92c..f28b40c477f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -90,31 +90,27 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void) { CosNotifyChannelAdmin::EventChannel_var ec; LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // create supplier admin CosNotifyChannelAdmin::SupplierAdmin_var sa = ec->new_for_suppliers (this->ifgop_, this->id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void) { CosNotifyChannelAdmin::SupplierAdmin_var admin; LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Let the user see what we're subscribed for, ACE_DEBUG ((LM_DEBUG, "Calling SupplierAdmin offer_change : ")); @@ -133,47 +129,40 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "\n")); admin->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void) { } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void) { CosNotifyChannelAdmin::SupplierAdmin_var admin; LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void) { if (this->command_ == CREATE) { - this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_create (); } else if (this->command_ == OFFER) { - this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_offers (); } else if (this->command_ == SET_QOS) { - this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_set_qos (); } else if (this->command_ == DUMP_STATE) { - this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->handle_status (); } } diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index fbed3172551..486e399b201 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -42,7 +42,7 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL); + virtual void execute_i (void); /// Name of object virtual const char* get_name (void); @@ -79,10 +79,10 @@ protected: CosNotification::EventTypeSeq removed_; /// = Handlers - void handle_create (ACE_ENV_SINGLE_ARG_DECL); - void handle_offers (ACE_ENV_SINGLE_ARG_DECL); - void handle_status (ACE_ENV_SINGLE_ARG_DECL); - void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL); + void handle_create (void); + void handle_offers (void); + void handle_status (void); + void handle_set_qos (void); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 3641ca65f32..01f1ee5d10b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -33,7 +33,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); @@ -54,7 +53,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not , this->proxy_id_ , qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ()); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); @@ -85,7 +83,6 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::Eve ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy (); proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } template <class Supplier_Traits> void diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp index 4abebdab3f4..8ba1324e1fd 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp @@ -30,20 +30,17 @@ Notify_Sequence_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::SequencePushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CosNotification::QoSProperties properties(1); properties.length(1); @@ -53,11 +50,9 @@ Notify_Sequence_Push_Consumer::_connect ( proxy_->set_qos(properties); proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // give ownership to POA - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp index 271bf5fbeeb..980db3ea5f5 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp @@ -31,27 +31,22 @@ Notify_Structured_Push_Consumer::_connect ( ACE_THROW_SPEC ((CORBA::SystemException)) { CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->proxy_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow ( proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp index 8d284b588a5..6eb34323d53 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp @@ -89,19 +89,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (filter) { ACE_DEBUG((LM_DEBUG, "\nConsumer filter enabled.\n")); CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ec->default_filter_factory (); CosNotifyFilter::Filter_var filter = ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); CosNotifyFilter::ConstraintExpSeq constraint_list (1); constraint_list.length (1); @@ -111,10 +108,8 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec CORBA::string_dup ("type == 'even'"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); } return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ()); @@ -140,10 +135,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -159,7 +152,6 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { @@ -173,15 +165,12 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) { @@ -193,24 +182,19 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->go (); - client.ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.ORB_run(); ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } } } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 7b7df800ca5..f7131315692 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -40,13 +40,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -153,7 +152,6 @@ SendEvents (int id ACE_ENV_ARG_DECL) ACE_TRY_NEW_ENV { supplier_1->send_events(events ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -173,10 +171,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -193,24 +189,20 @@ int main (int argc, char* argv[]) Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -231,7 +223,6 @@ int main (int argc, char* argv[]) if (!CORBA::is_nil (admin.in ())) { create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -239,7 +230,6 @@ int main (int argc, char* argv[]) for (int i = 0; i < max_events; ++i) { SendEvents (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", (max_events*amount))); @@ -247,8 +237,7 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp index a45be86190f..404a51ced9f 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp @@ -87,19 +87,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (filter) { // Filter Section CosNotifyFilter::FilterFactory_var ffact = - ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ec->default_filter_factory (); // One Filter CosNotifyFilter::Filter_var filter = ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); CosNotifyFilter::ConstraintExpSeq constraint_list (1); constraint_list.length (1); @@ -109,10 +106,8 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec CORBA::string_dup ("type == 'even'"); filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // End One Filter } @@ -139,10 +134,8 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer->_connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -158,7 +151,6 @@ int main (int argc, char* argv[]) Consumer_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { @@ -172,15 +164,12 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (sig.in ())) { @@ -192,23 +181,18 @@ int main (int argc, char* argv[]) CosNotifyChannelAdmin::ConsumerAdmin_var admin = create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!CORBA::is_nil (admin.in ())) { create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Tell the supplier to go - sig->go (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + sig->go (); + client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER ); - ACE_TRY_CHECK; ACE_DEBUG((LM_DEBUG, "Consumer done.\n")); - sig->done (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig->done (); } } } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index f89028a58c1..48dfb565431 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -39,13 +39,13 @@ public: { } - void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void go (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = true; } - void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void done (void) ACE_THROW_SPEC ((CORBA::SystemException)) { started_ = false; @@ -121,7 +121,6 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ()); } @@ -148,7 +147,6 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED) ACE_TRY_NEW_ENV { supplier_1->send_event(event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, e) { @@ -168,10 +166,8 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, CORBA::NO_MEMORY ()); supplier_1->init (poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1->connect (admin ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -187,24 +183,20 @@ int main (int argc, char* argv[]) { Supplier_Client client; status = client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (status == 0) { CosNotifyChannelAdmin::EventChannel_var ec = client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_ptr orb = client.orb (); sig_impl.reset( new sig_i( orb ) ); - sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sig_var sig = sig_impl->_this (); CORBA::String_var ior = orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -225,7 +217,6 @@ int main (int argc, char* argv[]) if (!CORBA::is_nil (admin.in ())) { create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; sig_impl->wait_for_startup(); @@ -233,7 +224,6 @@ int main (int argc, char* argv[]) for (int i = 0; i < max_events; ++i) { SendEvent (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events)); @@ -241,8 +231,7 @@ int main (int argc, char* argv[]) ACE_OS::unlink (ior_output_file); - ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec->destroy(); } } } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index b68b1bcbed4..cf6a605897a 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -82,8 +82,7 @@ RedGreen_Test::destroy_ec () // the EC is still around. So, trap exceptions. ACE_TRY_NEW_ENV { - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->ec_->destroy (); } ACE_CATCH (CORBA::COMM_FAILURE, ex) { @@ -116,40 +115,29 @@ RedGreen_Test::init (int argc, this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->resolve_naming_service (); + this->resolve_Notify_factory (); + this->create_EC (); + this->create_supplieradmin (); + this->create_consumeradmin (); + this->create_consumers (); + this->create_suppliers (); } void -RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::run (void) { ACE_TRY_NEW_ENV { - this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->send_events (); while (! consumer_is_done) { ACE_Time_Value tv(0, 10 * 1000); this->orb_->run(tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -157,7 +145,6 @@ RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; worker_.thr_mgr ()->wait (); } @@ -178,12 +165,10 @@ RedGreen_Test::init_ORB (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (poa_object)) { @@ -194,14 +179,11 @@ RedGreen_Test::init_ORB (int argc, this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); worker_.orb (this->orb_.in ()); @@ -214,12 +196,11 @@ RedGreen_Test::init_ORB (int argc, } void -RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -230,11 +211,10 @@ RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::resolve_Notify_factory (void) { CosNaming::Name name (1); name.length (1); @@ -243,18 +223,16 @@ RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; } void -RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -262,13 +240,12 @@ RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_supplieradmin (void) { CosNotifyChannelAdmin::AdminID adminid; @@ -276,13 +253,12 @@ RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_consumeradmin (void) { CosNotifyChannelAdmin::AdminID adminid; @@ -290,39 +266,35 @@ RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -RedGreen_Test::create_consumers (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_consumers (void) { ACE_NEW (this->normal_consumer_, RedGreen_Test_StructuredPushConsumer (this)); this->normal_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW (this->slow_consumer_, SlowConsumer (this)); this->slow_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -RedGreen_Test::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::create_suppliers (void) { ACE_NEW (this->supplier_, RedGreen_Test_StructuredPushSupplier ()); this->supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test::send_events (void) { // Setup the Consumer 1 to receive //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN". @@ -339,7 +311,6 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL) removed_1 ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED" CosNotification::EventTypeSeq added_2(1); @@ -355,7 +326,6 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL) removed_2 ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; // Create the events - one of each type @@ -388,11 +358,9 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL) { this->supplier_->send_event (red_event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->supplier_->send_event (green_event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -478,8 +446,7 @@ RedGreen_Test_StructuredPushConsumer::connect ( { // Activate the consumer with the default_POA_. CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier ( @@ -487,7 +454,6 @@ RedGreen_Test_StructuredPushConsumer::connect ( proxy_supplier_id_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -497,21 +463,18 @@ RedGreen_Test_StructuredPushConsumer::connect ( proxysupplier.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -RedGreen_Test_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test_StructuredPushConsumer::disconnect (void) { this->proxy_supplier_-> - disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + disconnect_structured_push_supplier (); } void @@ -650,8 +613,7 @@ RedGreen_Test_StructuredPushSupplier::connect ( ) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = supplier_admin->obtain_notification_push_consumer ( @@ -659,7 +621,6 @@ RedGreen_Test_StructuredPushSupplier::connect ( proxy_consumer_id_ ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); @@ -669,17 +630,15 @@ RedGreen_Test_StructuredPushSupplier::connect ( proxyconsumer.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -RedGreen_Test_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +RedGreen_Test_StructuredPushSupplier::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -718,13 +677,11 @@ RedGreen_Test_StructuredPushSupplier::send_event ( // any event.filterable_data[0].value <<= latency_base; proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - g_throughput_start_, end - start); - ACE_CHECK; } void @@ -759,8 +716,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 480a55ee0b7..3932834dedc 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -79,7 +79,7 @@ class RedGreen_Test ACE_ENV_ARG_DECL); // Initialize the Client. - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); // Run the demo. void done (void); @@ -98,28 +98,28 @@ class RedGreen_Test ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (void); // Try to get hold of a running naming service. - void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (void); // Try to resolve the Notify factory from the Naming service. - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create an EC. - void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(void); // Create the Supplier Admin. - void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (void); // Create the Consumer Admin. - void create_consumers (ACE_ENV_SINGLE_ARG_DECL); + void create_consumers (void); // Create and initialize the consumers. - void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); + void create_suppliers (void); // create and initialize the suppliers. - void send_events (ACE_ENV_SINGLE_ARG_DECL); + void send_events (void); // send the events. // = Data Members. @@ -180,7 +180,7 @@ class RedGreen_Test_StructuredPushConsumer // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect (void); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier ( @@ -276,7 +276,7 @@ class RedGreen_Test_StructuredPushSupplier // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); // Disconnect from the supplier. virtual void send_event (CosNotification::StructuredEvent& event diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 25f07f3583e..e5c431eb157 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -16,10 +16,8 @@ main (int argc, char *argv []) { client.init (argc, argv ACE_ENV_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; - client.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.run (); client.destroy_ec (); } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 020b750ffa5..01b0fbcb6b0 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -176,7 +176,6 @@ Throughput_StructuredPushSupplier::svc (void) this->proxy_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - this->throughput_start_, @@ -226,18 +225,15 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) Notify_Test_Client::init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (manager_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Any sync_scope; sync_scope <<= Messaging::SYNC_WITH_TARGET; @@ -248,11 +244,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #else ACE_DEBUG ((LM_DEBUG, "CORBA Messaging disabled in this configuration," @@ -269,20 +263,17 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) } // Create all participents ... - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -304,11 +295,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) -1); consumers_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumers_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } for (i = 0; i < this->supplier_count_; ++i) @@ -320,10 +309,8 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) root_poa_.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (-1); suppliers_[i]->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } return 0; @@ -424,7 +411,7 @@ Notify_Throughput::parse_args(int argc, char *argv[]) } void -Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Notify_Throughput::create_EC (void) { if (this->collocated_ec_ == 1) { @@ -440,16 +427,13 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->notify_factory_ = notify_service->create (this->root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ())); } else { - this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->resolve_naming_service (); + this->resolve_Notify_factory (); } // A channel name was specified, use that to resolve the service. @@ -462,12 +446,10 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->ec_ = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -477,14 +459,13 @@ else initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) +Notify_Throughput::run_test (void) { ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ," @@ -509,7 +490,6 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) suppliers_[i]-> TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (suppliers_[i]->ACE_Task_Base::activate (THR_NEW_LWP | THR_JOINABLE) != 0) { @@ -532,8 +512,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) if (this->ec_name_.length () == 0) // we are not using a global EC { // Destroy the ec. - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ec_->destroy (); } // Signal the workers. @@ -604,10 +583,8 @@ main (int argc, char* argv[]) { events.init (argc, argv ACE_ENV_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); ACE_DEBUG ((LM_DEBUG, "Waiting for threads to exit...\n")); ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 802054bd6cf..fe31196fad3 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -144,7 +144,7 @@ public: int init (int argc, char *argv [] ACE_ENV_ARG_DECL); // initialization. - void run_test (ACE_ENV_SINGLE_ARG_DECL); + void run_test (void); // Run the test. void peer_done (void); @@ -155,7 +155,7 @@ public: Worker worker_; protected: - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create participants. CORBA::Boolean collocated_ec_; |