diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 31dc9458716..62f0d7a8402 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -13,7 +13,9 @@ #include "tao/Timeprobe.h" -ACE_RCSID(Event, Dispatching_Modules, "$Id$") +ACE_RCSID (Event, + Dispatching_Modules, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) @@ -150,11 +152,11 @@ int ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request, u_long &command_action) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Forward the request. - up_->push (request, ACE_TRY_ENV); + up_->push (request TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -238,10 +240,10 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) } void -ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { - down_->connected (consumer, ACE_TRY_ENV); + down_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; // This code does dynamic allocation of channel dispatch threads. @@ -253,7 +255,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, // We have to tell the lower portions of the channel about the // consumer first. This is so that any changes to the consumer's // qos will take effect when we get the dispatch priority. - down_->connected (consumer, ACE_TRY_ENV); + down_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::OS_Priority priority = @@ -335,8 +337,8 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer) // @@ This method could have a bypass optimization. // <request> has been dynamically allocated by the filtering module. void -ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE); @@ -352,15 +354,15 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, (request->rt_info (), thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (request->rt_info (), thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #endif ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED); ACE_CHECK; @@ -617,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY {// @@ TODO: Handle exceptions... #if 1 @@ -631,8 +633,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, RtecScheduler::VERY_HIGH_CRITICALITY, @@ -643,8 +645,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -683,8 +685,8 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel) } void -ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &) +ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED) { // If it's a request to forward an event, it needs a reference to us // to call dispatch_event. @@ -725,11 +727,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, // Store the priority of the task currently running. channel_->rtu_manager ()->priority (request->priority ()); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Forward the request. - up_->push (request, ACE_TRY_ENV); + up_->push (request TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -756,11 +758,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, } void -ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL) { // First enqueue the message in the proper queue. - ACE_ES_Priority_Dispatching::push (request, ACE_TRY_ENV); + ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER); ACE_CHECK; // If the current event is higher priority (lower value) than the |