summaryrefslogtreecommitdiff
path: root/CIAO/ciaosvcs/Events/CIAO_RTEC
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/ciaosvcs/Events/CIAO_RTEC')
-rw-r--r--CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp115
-rw-r--r--CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h71
-rw-r--r--CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp3
-rw-r--r--CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h3
4 files changed, 72 insertions, 120 deletions
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index b96b5230a96..1ef5b1ad889 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -71,8 +71,7 @@ namespace CIAO
// to multiple event suppliers.
void
RTEventService::connect_event_supplier (
- Supplier_Config_ptr supplier_config
- ACE_ENV_ARG_DECL)
+ Supplier_Config_ptr supplier_config)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -82,12 +81,11 @@ namespace CIAO
}
RTEvent_Supplier_Config_ptr rt_config =
- RTEvent_Supplier_Config::_narrow (supplier_config
- ACE_ENV_ARG_PARAMETER);
+ RTEvent_Supplier_Config::_narrow (supplier_config);
if (CORBA::is_nil (rt_config))
{
- ACE_THROW (CORBA::BAD_PARAM ());
+ throw CORBA::BAD_PARAM ();
}
// Get a proxy push consumer from the EventChannel.
@@ -116,8 +114,7 @@ namespace CIAO
1);
proxy_push_consumer->connect_push_supplier (push_supplier.in (),
- supplier_qos.get_SupplierQOS ()
- ACE_ENV_ARG_PARAMETER);
+ supplier_qos.get_SupplierQOS ());
this->proxy_consumer_map_.bind (
@@ -127,8 +124,7 @@ namespace CIAO
void
RTEventService::connect_event_consumer (
- Consumer_Config_ptr consumer_config
- ACE_ENV_ARG_DECL)
+ Consumer_Config_ptr consumer_config)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -138,12 +134,11 @@ namespace CIAO
}
RTEvent_Consumer_Config_ptr rt_config =
- RTEvent_Consumer_Config::_narrow (consumer_config
- ACE_ENV_ARG_PARAMETER);
+ RTEvent_Consumer_Config::_narrow (consumer_config);
if (CORBA::is_nil (rt_config))
{
- ACE_THROW (CORBA::BAD_PARAM ());
+ throw CORBA::BAD_PARAM ();
}
Components::EventConsumerBase_var consumer =
@@ -187,7 +182,7 @@ namespace CIAO
proxy_supplier->connect_push_consumer (push_consumer.in (),
qos.in ()
//qos_factory.get_ConsumerQOS ()
- ACE_ENV_ARG_PARAMETER);
+ );
ACE_CString consumer_id =
consumer_config->consumer_id ();
@@ -197,8 +192,7 @@ namespace CIAO
void
RTEventService::disconnect_event_supplier (
- const char * connection_id
- ACE_ENV_ARG_DECL)
+ const char * connection_id)
ACE_THROW_SPEC ((
CORBA::SystemException,
Components::InvalidConnection))
@@ -209,14 +203,12 @@ namespace CIAO
this->proxy_consumer_map_.unbind (connection_id, proxy_consumer);
- proxy_consumer->disconnect_push_consumer (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ proxy_consumer->disconnect_push_consumer ();
}
void
RTEventService::disconnect_event_consumer (
- const char * connection_id
- ACE_ENV_ARG_DECL)
+ const char * connection_id)
ACE_THROW_SPEC ((
CORBA::SystemException,
Components::InvalidConnection))
@@ -225,14 +217,12 @@ namespace CIAO
this->proxy_supplier_map_.unbind (connection_id, proxy_supplier);
- proxy_supplier->disconnect_push_supplier (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ proxy_supplier->disconnect_push_supplier ();
}
void
RTEventService::push_event (
- Components::EventBase * ev
- ACE_ENV_ARG_DECL)
+ Components::EventBase * ev)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -247,8 +237,7 @@ namespace CIAO
RTEventService::ciao_push_event (
Components::EventBase * ev,
const char * source_id,
- CORBA::TypeCode_ptr tc
- ACE_ENV_ARG_DECL)
+ CORBA::TypeCode_ptr tc)
ACE_THROW_SPEC ((
CORBA::SystemException,
Components::BadEventType))
@@ -291,10 +280,10 @@ namespace CIAO
ACE_DEBUG ((LM_DEBUG,
"CIAO (%P|%t) - RTEventService::ciao_push_event, "
"Error in finding the proxy consumer object.\n"));
- ACE_THROW (Components::BadEventType ());
+ throw Components::BadEventType ();
}
- proxy_consumer->push (events ACE_ENV_ARG_PARAMETER);
+ proxy_consumer->push (events);
}
void
@@ -333,8 +322,7 @@ namespace CIAO
RTEventService::create_addr_serv (
const char * name,
::CORBA::UShort port,
- const char * address
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char * address)
ACE_THROW_SPEC ((
::CORBA::SystemException))
{
@@ -381,8 +369,7 @@ namespace CIAO
::CORBA::Boolean
RTEventService::create_sender (
- const char * addr_serv_id
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char * addr_serv_id)
ACE_THROW_SPEC ((
::CORBA::SystemException))
{
@@ -405,8 +392,7 @@ namespace CIAO
TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
sender->init (this->rt_event_channel_.in (),
addr_srv.in (),
- endpoint
- ACE_ENV_ARG_PARAMETER);
+ endpoint);
// Setup the subscription and connect to the EC
ACE_ConsumerQOS_Factory cons_qos_fact;
@@ -423,8 +409,7 @@ namespace CIAO
RTEventService::create_receiver (
const char * addr_serv_id,
::CORBA::Boolean is_multicast,
- ::CORBA::UShort listen_port
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ ::CORBA::UShort listen_port)
ACE_THROW_SPEC ((
::CORBA::SystemException))
{
@@ -504,7 +489,7 @@ namespace CIAO
::RtecEventChannelAdmin::EventChannel_ptr
- RTEventService::tao_rt_event_channel (void)
+ RTEventService::tao_rt_event_channel ()
ACE_THROW_SPEC ((::CORBA::SystemException))
{
return this->rt_event_channel_.in ();
@@ -561,7 +546,7 @@ namespace CIAO
ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized
Components::EventBase * ev = 0;
- ACE_TRY
+ try
{
TAO::Unknown_IDL_Type *unk =
dynamic_cast<TAO::Unknown_IDL_Type *> (events[i].data.any_value.impl ());
@@ -570,8 +555,7 @@ namespace CIAO
if (for_reading >> ev)
{
ev->_add_ref ();
- this->event_consumer_->push_event (ev
- ACE_ENV_ARG_PARAMETER);
+ this->event_consumer_->push_event (ev);
}
else
{
@@ -579,14 +563,12 @@ namespace CIAO
"failed to extract event\n"));
}
}
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
{
ACE_ERROR ((LM_ERROR,
"CORBA EXCEPTION caught\n"));
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "RTEventServiceConsumer_impl::push()\n");
+ ex._tao_print_exception ("RTEventServiceConsumer_impl::push()\n");
}
- ACE_ENDTRY;
}
}
@@ -627,8 +609,7 @@ namespace CIAO
void
RTEvent_Supplier_Config_impl::supplier_id (
- const char * supplier_id
- ACE_ENV_ARG_DECL)
+ const char * supplier_id)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -660,8 +641,7 @@ namespace CIAO
}
CONNECTION_ID
- RTEvent_Supplier_Config_impl::supplier_id (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Supplier_Config_impl::supplier_id ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -669,8 +649,7 @@ namespace CIAO
}
EventServiceType
- RTEvent_Supplier_Config_impl::service_type (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Supplier_Config_impl::service_type ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -678,8 +657,7 @@ namespace CIAO
}
RtecEventChannelAdmin::SupplierQOS *
- RTEvent_Supplier_Config_impl::rt_event_qos (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Supplier_Config_impl::rt_event_qos ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -691,8 +669,7 @@ namespace CIAO
}
void
- RTEvent_Supplier_Config_impl::destroy (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Supplier_Config_impl::destroy ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -719,7 +696,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::start_conjunction_group (
- CORBA::Long size ACE_ENV_ARG_DECL)
+ CORBA::Long size)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -731,8 +708,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::start_disjunction_group (
- CORBA::Long size
- ACE_ENV_ARG_DECL)
+ CORBA::Long size)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -745,8 +721,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::insert_source (
- const char * source_id
- ACE_ENV_ARG_DECL)
+ const char * source_id)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -761,8 +736,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::insert_type (
- ::CORBA::Long event_type
- ACE_ENV_ARG_DECL)
+ ::CORBA::Long event_type)
ACE_THROW_SPEC ((::CORBA::SystemException))
{
if (event_type == 0L)
@@ -774,8 +748,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::consumer_id (
- const char * consumer_id
- ACE_ENV_ARG_DECL)
+ const char * consumer_id)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -792,8 +765,7 @@ namespace CIAO
void
RTEvent_Consumer_Config_impl::consumer (
- Components::EventConsumerBase_ptr consumer
- ACE_ENV_ARG_DECL)
+ Components::EventConsumerBase_ptr consumer)
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -801,8 +773,7 @@ namespace CIAO
}
CONNECTION_ID
- RTEvent_Consumer_Config_impl::consumer_id (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Consumer_Config_impl::consumer_id ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -811,8 +782,7 @@ namespace CIAO
EventServiceType
- RTEvent_Consumer_Config_impl::service_type (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Consumer_Config_impl::service_type ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -820,8 +790,7 @@ namespace CIAO
}
Components::EventConsumerBase_ptr
- RTEvent_Consumer_Config_impl::consumer (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Consumer_Config_impl::consumer ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -834,8 +803,7 @@ namespace CIAO
}
RtecEventChannelAdmin::ConsumerQOS *
- RTEvent_Consumer_Config_impl::rt_event_qos (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Consumer_Config_impl::rt_event_qos ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
@@ -848,8 +816,7 @@ namespace CIAO
}
void
- RTEvent_Consumer_Config_impl::destroy (
- ACE_ENV_SINGLE_ARG_DECL)
+ RTEvent_Consumer_Config_impl::destroy ()
ACE_THROW_SPEC ((
CORBA::SystemException))
{
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
index a5b0d3741d9..7737643b0a4 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
@@ -69,43 +69,37 @@ namespace CIAO
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void connect_event_supplier (
- CIAO::Supplier_Config_ptr supplier_config
- ACE_ENV_ARG_DECL)
+ CIAO::Supplier_Config_ptr supplier_config)
ACE_THROW_SPEC ((
CORBA::SystemException));
virtual void connect_event_consumer (
- CIAO::Consumer_Config_ptr consumer_config
- ACE_ENV_ARG_DECL)
+ CIAO::Consumer_Config_ptr consumer_config)
ACE_THROW_SPEC ((
CORBA::SystemException));
virtual void
disconnect_event_supplier (
- const char * consumer_id
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char * consumer_id)
ACE_THROW_SPEC ((
CORBA::SystemException,
Components::InvalidConnection));
virtual void disconnect_event_consumer (
- const char * connection_id
- ACE_ENV_ARG_DECL)
+ const char * connection_id)
ACE_THROW_SPEC ((
CORBA::SystemException,
Components::InvalidConnection));
virtual void push_event (
- Components::EventBase * ev
- ACE_ENV_ARG_DECL)
+ Components::EventBase * ev)
ACE_THROW_SPEC ((
CORBA::SystemException));
virtual void ciao_push_event (
Components::EventBase * evt,
const char * source_id,
- CORBA::TypeCode_ptr tc
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ CORBA::TypeCode_ptr tc)
ACE_THROW_SPEC ((
::CORBA::SystemException,
::Components::BadEventType));
@@ -113,27 +107,23 @@ namespace CIAO
virtual ::CORBA::Boolean create_addr_serv (
const char * name,
::CORBA::UShort port,
- const char * address
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char * address)
ACE_THROW_SPEC ((
::CORBA::SystemException));
virtual ::CORBA::Boolean create_sender (
- const char * addr_serv_id
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char * addr_serv_id)
ACE_THROW_SPEC ((
::CORBA::SystemException));
virtual ::CORBA::Boolean create_receiver (
const char * addr_serv_id,
::CORBA::Boolean is_multicast,
- ::CORBA::UShort listen_port
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ ::CORBA::UShort listen_port)
ACE_THROW_SPEC ((
::CORBA::SystemException));
virtual ::RtecEventChannelAdmin::EventChannel_ptr tao_rt_event_channel (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((::CORBA::SystemException));
@@ -208,8 +198,7 @@ namespace CIAO
RTEventServiceSupplier_impl (
PortableServer::POA_ptr poa);
- virtual void disconnect_push_supplier (
- ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_supplier ()
ACE_THROW_SPEC ((
CORBA::SystemException));
@@ -237,8 +226,7 @@ namespace CIAO
ACE_THROW_SPEC ((
CORBA::SystemException));
- virtual void disconnect_push_consumer (
- ACE_ENV_SINGLE_ARG_DECL)
+ virtual void disconnect_push_consumer ()
ACE_THROW_SPEC ((
CORBA::SystemException));
@@ -267,47 +255,46 @@ namespace CIAO
virtual ~RTEvent_Consumer_Config_impl (void);
- virtual void start_conjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
+ virtual void start_conjunction_group (CORBA::Long size)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void start_disjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
+ virtual void start_disjunction_group (CORBA::Long size)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void insert_source (const char * source_id ACE_ENV_ARG_DECL)
+ virtual void insert_source (const char * source_id)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void insert_type (::CORBA::Long event_type
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ virtual void insert_type (::CORBA::Long event_type)
ACE_THROW_SPEC ((::CORBA::SystemException));
- virtual void consumer_id (const char * consumer_id ACE_ENV_ARG_DECL)
+ virtual void consumer_id (const char * consumer_id)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CONNECTION_ID consumer_id (void)
+ virtual CONNECTION_ID consumer_id ()
ACE_THROW_SPEC ((CORBA::SystemException));
- //virtual void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+ //virtual void supplier_id (const char * supplier_id)
// ACE_THROW_SPEC ((CORBA::SystemException));
- //virtual CONNECTION_ID supplier_id (void)
+ //virtual CONNECTION_ID supplier_id ()
// ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL)
+ virtual void consumer (Components::EventConsumerBase_ptr consumer)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual Components::EventConsumerBase_ptr consumer (void)
+ virtual Components::EventConsumerBase_ptr consumer ()
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual EventServiceType service_type (void)
+ virtual EventServiceType service_type ()
ACE_THROW_SPEC ((CORBA::SystemException));
//@@ (GD) There should be a place where the deployment tool could
// set up the rt_event_qos properties for Consumer Config.
- virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos (void)
+ virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos ()
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (void)
+ virtual void destroy ()
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -339,22 +326,22 @@ namespace CIAO
virtual ~RTEvent_Supplier_Config_impl (void);
- void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+ void supplier_id (const char * supplier_id)
ACE_THROW_SPEC ((CORBA::SystemException));
- CONNECTION_ID supplier_id (void)
+ CONNECTION_ID supplier_id ()
ACE_THROW_SPEC ((CORBA::SystemException));
- EventServiceType service_type (void)
+ EventServiceType service_type ()
ACE_THROW_SPEC ((CORBA::SystemException));
//@@ (GD) There should be a place where the deployment tool could
// set up the rt_event_qos properties for Supplier Config.
- RtecEventChannelAdmin::SupplierQOS * rt_event_qos (void)
+ RtecEventChannelAdmin::SupplierQOS * rt_event_qos ()
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void destroy (void)
+ virtual void destroy ()
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
index d04a8528e9a..cdce7218291 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
@@ -23,8 +23,7 @@ SimpleAddressServer::get_addr (const RtecEventComm::EventHeader&,
/*
void
SimpleAddressServer::get_ip_address (const RtecEventComm::EventHeader&,
- RtecUDPAdmin::UDP_IP_Address_out address
- ACE_ENV_ARG_DECL)
+ RtecUDPAdmin::UDP_IP_Address_out address)
throw (CORBA::SystemException) {
address = new RtecUDPAdmin::UDP_IP_Address;
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
index 9e149226d53..5a69d3171dc 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
@@ -28,8 +28,7 @@ public:
/*
virtual void get_ip_address (const RtecEventComm::EventHeader& header,
- RtecUDPAdmin::UDP_IP_Address_out address
- ACE_ENV_ARG_DECL)
+ RtecUDPAdmin::UDP_IP_Address_out address)
throw (CORBA::SystemException);
*/
private:
View Lorry Controller Status