summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp')
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp95
1 files changed, 27 insertions, 68 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a7a0e96183f..b677c11d0db 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -34,28 +34,19 @@ void
Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
{
init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
- resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
- create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ resolve_naming_service ();
+ resolve_Notify_factory ();
+ create_EC ();
+ create_supplieradmin ();
+ create_consumeradmin ();
+ create_consumers ();
+ create_suppliers ();
}
void
-Subscribe::run (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::run (void)
{
- this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ this->send_events ();
if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb.
{ // if we still need to wait for events, run the orb.
@@ -80,12 +71,10 @@ Subscribe::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))
{
@@ -95,23 +84,19 @@ Subscribe::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 ();
}
void
-Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::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 ()))
@@ -119,11 +104,10 @@ Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_Notify_factory (void)
{
CosNaming::Name name (1);
name.length (1);
@@ -132,16 +116,14 @@ Subscribe::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
-Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_EC (void)
{
CosNotifyChannelAdmin::ChannelID id;
@@ -149,65 +131,58 @@ Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
initial_admin_,
id
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
void
-Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_supplieradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
supplier_admin_ =
ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
}
void
-Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe:: create_consumeradmin (void)
{
CosNotifyChannelAdmin::AdminID adminid;
consumer_admin_ =
ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
}
void
-Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_consumers (void)
{
consumer_1_ = new Subscribe_StructuredPushConsumer (this);
consumer_1_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
consumer_2_ = new Subscribe_StructuredPushConsumer (this);
consumer_2_->connect (this->consumer_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_suppliers (void)
{
supplier_1_ = new Subscribe_StructuredPushSupplier ();
supplier_1_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_2_ = new Subscribe_StructuredPushSupplier ();
supplier_2_->connect (this->supplier_admin_.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
-Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::send_events (void)
{
// Setup the CA to receive event_type : "domain_A", "Type_a"
CosNotification::EventTypeSeq added(1);
@@ -218,7 +193,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
added[0].type_name = CORBA::string_dup (TYPE_A);
this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
CosNotification::EventTypeSeq added_1(1);
@@ -231,7 +205,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
CosNotification::EventTypeSeq added_2(1);
@@ -244,7 +217,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
// Create the events - one of each type
// Event 1
@@ -284,11 +256,8 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
for (int i = 0; i < 1; ++i)
{
supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
}
@@ -309,12 +278,10 @@ Subscribe_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 (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -322,21 +289,18 @@ Subscribe_StructuredPushConsumer::connect
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::
_narrow (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
-Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushConsumer::disconnect (void)
{
this->proxy_supplier_->
- disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ disconnect_structured_push_supplier();
}
void
@@ -376,7 +340,7 @@ Subscribe_StructuredPushConsumer::push_structured_event
void
Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
@@ -406,33 +370,29 @@ Subscribe_StructuredPushSupplier::connect
ACE_ENV_ARG_DECL)
{
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_consumer_id_ ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
// narrow
this->proxy_consumer_ =
CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (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
-Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushSupplier::disconnect (void)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->proxy_consumer_->disconnect_structured_push_consumer();
}
void
@@ -456,12 +416,11 @@ Subscribe_StructuredPushSupplier::send_event
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
}
void
Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
- (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ (void)
ACE_THROW_SPEC ((
CORBA::SystemException
))
View Lorry Controller Status