diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 9aa562b6060..78ce792d737 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -5,7 +5,6 @@ #include "EC_ProxyPushSupplier_Set.h" #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" -#include "EC_Scheduling_Strategy.h" #include "EC_QOS_Info.h" #include "orbsvcs/Event_Service_Constants.h" @@ -17,13 +16,10 @@ ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$") TAO_EC_Per_Supplier_Filter:: TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel* ec) - : event_channel_ (ec), - refcnt_ (1) + : event_channel_ (ec) { this->supplier_set_ = this->event_channel_->create_proxy_push_supplier_set (); - this->supplier_set_->busy_hwm (this->event_channel_->busy_hwm ()); - this->supplier_set_->max_write_delay (this->event_channel_->max_write_delay ()); } TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void) @@ -55,7 +51,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier, return; const RtecEventChannelAdmin::SupplierQOS& pub = - this->consumer_->publications_i (); + this->consumer_->publications (); for (CORBA::ULong j = 0; j < pub.publications.length (); ++j) { @@ -82,17 +78,9 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier, } void -TAO_EC_Per_Supplier_Filter::shutdown (CORBA::Environment &ACE_TRY_ENV) -{ - this->supplier_set_->shutdown (ACE_TRY_ENV); -} - -void TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, CORBA::Environment &ACE_TRY_ENV) { - TAO_EC_Scheduling_Strategy* scheduling_strategy = - this->event_channel_->scheduling_strategy (); for (CORBA::ULong j = 0; j < event.length (); ++j) { const RtecEventComm::Event& e = event[j]; @@ -100,13 +88,6 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, ACE_const_cast(RtecEventComm::Event*, &e); RtecEventComm::EventSet single_event (1, 1, buffer, 0); - TAO_EC_QOS_Info event_info; - scheduling_strategy->init_event_qos (e.header, - this->consumer_, - event_info, - ACE_TRY_ENV); - ACE_CHECK; - ACE_GUARD_THROW_EX (TAO_EC_ProxyPushSupplier_Set::Busy_Lock, ace_mon, this->supplier_set_->busy_lock (), RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); @@ -120,7 +101,7 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, i != end; ++i) { - TAO_EC_QOS_Info qos_info = event_info; + TAO_EC_QOS_Info qos_info; (*i)->filter (single_event, qos_info, ACE_TRY_ENV); ACE_CHECK; @@ -128,25 +109,6 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, } } -CORBA::ULong -TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) -{ - this->refcnt_++; - return this->refcnt_; -} - -CORBA::ULong -TAO_EC_Per_Supplier_Filter::_decr_refcnt (void) -{ - this->refcnt_--; - if (this->refcnt_ == 0) - { - this->event_channel_->supplier_filter_builder ()->destroy (this); - return 0; - } - return this->refcnt_; -} - // **************************************************************** TAO_EC_SupplierFiltering* |