diff options
Diffstat (limited to 'TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp | 167 |
1 files changed, 65 insertions, 102 deletions
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp index 5cde9839a46..17358a94bb1 100644 --- a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp +++ b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp @@ -18,7 +18,9 @@ main (int argc, char *argv []) } CosEC_Basic::CosEC_Basic (void) - : ec_impl_ (0) + : ec_impl_ (0, + ACE_DEFAULT_EVENT_CHANNEL_TYPE, + &module_factory_) { // No-Op. } @@ -31,20 +33,17 @@ CosEC_Basic::~CosEC_Basic (void) int CosEC_Basic::init_ORB (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { this->orb_ = CORBA::ORB_init (argc, argv, "", - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - + TAO_TRY_ENV); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -52,44 +51,39 @@ CosEC_Basic::init_ORB (int argc, char *argv []) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); - ACE_TRY_CHECK; + root_poa->the_POAManager (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); - poa_manager->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; + poa_manager->activate (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); return 0; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in CosEC_Basic::init_ORB"); + TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_ORB"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - ACE_NOTREACHED (return 0;) + TAO_ENDTRY; } int CosEC_Basic::init_RtEC (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { this->scheduler_ = - this->scheduler_impl_._this (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->scheduler_impl_._this (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); CORBA::String_var str = this->orb_->object_to_string (this->scheduler_.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); ACE_DEBUG ((LM_DEBUG, "EC_Basic: The (local) scheduler IOR is <%s>\n", @@ -98,55 +92,46 @@ CosEC_Basic::init_RtEC (void) if (ACE_Scheduler_Factory::server (this->scheduler_.in ()) == -1) return -1; - ACE_NEW_RETURN(this->ec_impl_, ACE_EventChannel (0, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - &module_factory_), -1); - this->rtec_ = this->ec_impl_->_this (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->rtec_ = this->ec_impl_._this (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); str = this->orb_->object_to_string (this->rtec_.in (), - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); ACE_DEBUG ((LM_DEBUG, "EC_Basic: The RTEC IOR is <%s>\n", str.in ())); - this->ec_impl_->activate (); + this->ec_impl_.activate (); return 0; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in CosEC_Basic::init_RtEC"); + TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_RtEC"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - ACE_NOTREACHED (return 0;) + TAO_ENDTRY; } int CosEC_Basic::init_CosEC (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { // Setup the QOS params.. this->supplier_qos_.insert (1, ACE_ES_EVENT_ANY, this->scheduler_->create ("supplier", - ACE_TRY_ENV), + TAO_TRY_ENV), 1); - ACE_TRY_CHECK; this->consumer_qos_.start_disjunction_group (); this->consumer_qos_.insert_source (1, this->scheduler_->create ("consumer", - ACE_TRY_ENV)); - ACE_TRY_CHECK; + TAO_TRY_ENV)); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); const RtecEventChannelAdmin::ConsumerQOS &consumerqos = this->consumer_qos_.get_ConsumerQOS (); @@ -156,34 +141,30 @@ CosEC_Basic::init_CosEC (void) if (this->ec_i_.init (consumerqos, supplierqos, - this->rtec_.in (), - ACE_TRY_ENV) != 0) + this->rtec_, + TAO_TRY_ENV) != 0) return -1; - ACE_TRY_CHECK; + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); - this->cos_ec_ = this->ec_i_._this (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->cos_ec_ = this->ec_i_._this (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1); return 0; } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in CosEC_Basic::init_CosEC"); + TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_CosEC"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); - - ACE_NOTREACHED (return 0;) + TAO_ENDTRY; } int CosEC_Basic::init (int argc, char *argv []) { - if (init_ORB (argc, argv) == -1 - || init_RtEC () == -1 + if (init_ORB (argc, argv) == -1 + || init_RtEC () == -1 || init_CosEC () == -1) return -1; else @@ -193,35 +174,25 @@ CosEC_Basic::init (int argc, char *argv []) void CosEC_Basic::shutdown (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { - this->supplier_.close (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->supplier_.close (TAO_TRY_ENV); + this->consumer_.close (TAO_TRY_ENV); - this->consumer_.close (ACE_TRY_ENV); - ACE_TRY_CHECK; - - this->cos_ec_->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; - - this->ec_impl_->shutdown (); - delete this->ec_impl_; + this->cos_ec_->destroy (TAO_TRY_ENV); + this->ec_impl_.shutdown (); } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in CosEC_Basic::shutdown"); + TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::finish"); } - ACE_ENDTRY; - ACE_CHECK; + TAO_ENDTRY; } void CosEC_Basic::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + TAO_TRY { // Create an Any type to pass to the Cos EC. CORBA_Any cany; @@ -230,34 +201,26 @@ CosEC_Basic::run (void) cany >>= any; this->consumer_.open (this->cos_ec_, - this->orb_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV); - this->consumer_.connect (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->consumer_.connect (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV); this->supplier_.open (this->cos_ec_, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV); - this->supplier_.connect (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->supplier_.connect (TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV); this->supplier_.send_event (any, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV); } - ACE_CATCHANY + TAO_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "exception in CosEC_Basic::runtest\n"); + TAO_TRY_ENV.print_exception ("exception in CosEC_Basic::runtest\n"); } - ACE_ENDTRY; - ACE_CHECK; - - this->orb_->run (); - // wait here. - // When the consumer gets the event we pushed, it will shutdown the ORB. - // We will return from <run> then. + TAO_ENDTRY; } |