From a1ac50c4ed7b6b0b74d99daf734cc236f140332f Mon Sep 17 00:00:00 2001 From: pradeep Date: Fri, 25 Apr 2003 19:04:43 +0000 Subject: *** empty log message *** --- .../orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp | 8 ++++---- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h | 2 +- .../orbsvcs/Notify/Method_Request_Dispatch_T.inl | 3 ++- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl | 4 ++-- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl | 2 ++ TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp | 8 ++++---- TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp | 1 - .../Notify/Sequence/SequenceProxyPushConsumer.cpp | 2 +- .../Structured/RT_StructuredProxyPushSupplier.cpp | 4 ++-- .../Notify/Structured/StructuredProxyPushConsumer.cpp | 17 +---------------- .../Notify/Structured/StructuredPushConsumer.cpp | 3 --- 19 files changed, 27 insertions(+), 43 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 8290ea2ed97..ae3ae49ae8f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Notify, TAO_NS_CosEC_ProxyPushConsumer, "$id$") #include "tao/debug.h" #include "../AdminProperties.h" -#include "../Method_request_Lookup.h" +#include "../Method_Request_Lookup.h" #include "../Worker_Task.h" #include "AnyEvent.h" #include "PushSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 4f08b4e0551..f2d774756b8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Notify, TAO_NS_ProxyPushConsumer, "$id$") #include "tao/debug.h" #include "../AdminProperties.h" -#include "../Method_request_Lookup.h" +#include "../Method_Request_Lookup.h" #include "../Worker_Task.h" #include "AnyEvent.h" #include "PushSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index d9b87c8befa..f5b1f5318d0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -30,7 +30,7 @@ TAO_NS_Consumer::proxy (void) } void -TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL) { if (this->is_suspended_ == 1) return; // Do nothing if we're suspended. @@ -45,15 +45,15 @@ TAO_NS_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) TAO_NS_ProxySupplier* proxy_supplier = this->proxy_supplier (); - TAO_NS_Event_var event; + TAO_NS_Event_var event; while (!event_collection_copy.is_empty ()) { if (event_collection_copy.dequeue_head (event) == 0) { - proxy_supplier->push_no_filtering (event); + proxy_supplier->push_no_filtering (event ACE_ENV_ARG_PARAMETER); } - } + } } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 9f7502f78ea..d6752467d7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -53,7 +53,7 @@ TAO_NS_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_NS_Method_Request* request; TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (0); TAO_NS_Event_Copy_var event_var (event_copy); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h index d7166fadf58..48a5582db50 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.h @@ -35,7 +35,7 @@ public: TAO_NS_Method_Request_Dispatch_T (EVENT_PARAM event, PROXY_PARAM proxy, CORBA::Boolean filtering); /// Destructor - ~TAO_NS_Method_Request_Dispatch_T (); + virtual ~TAO_NS_Method_Request_Dispatch_T (); /// Execute the dispatch operation. int execute_i (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl index d1e6b8fb512..0ca8a208db9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch_T.inl @@ -1,5 +1,6 @@ // $Id$ +#include "Admin.h" template ACE_INLINE int TAO_NS_Method_Request_Dispatch_T::execute_i (ACE_ENV_SINGLE_ARG_DECL) @@ -17,7 +18,7 @@ TAO_NS_Method_Request_Dispatch_T::execut ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",this->proxy_supplier_ , val)); + ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val)); // Filter failed - do nothing. if (val == 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 618adc93eb4..51e6f7a4726 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -55,7 +55,7 @@ TAO_NS_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO_NS_Method_Request* request; TAO_NS_Event* event_copy = this->event_->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (0); TAO_NS_Event_Copy_var event_var (event_copy); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index a713392a392..607f1d09c0c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -36,7 +36,7 @@ public: TAO_NS_Method_Request_Lookup_T (EVENT_PARAM event, PROXY_PARAM proxy); /// Destructor - ~TAO_NS_Method_Request_Lookup_T (); + virtual ~TAO_NS_Method_Request_Lookup_T (); /// Execute the dispatch operation. int execute_i (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl index dd8b76324c6..1af1a467b7b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.inl @@ -10,13 +10,13 @@ TAO_NS_Method_Request_Lookup_T::execute_ TAO_NS_Admin* parent = this->proxy_consumer_->supplier_admin (); - CORBA::Boolean val = this->proxy_consumer_->check_filters ((EVENT)this->event_, + CORBA::Boolean val = this->proxy_consumer_->check_filters (this->event_, parent->filter_admin (), parent->filter_operator () ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 1) - ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",this->proxy_consumer_ , val)); + ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val)); // Filter failed - do nothing. if (val == 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 58284285aac..4285f7d22fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -40,7 +40,7 @@ TAO_NS_Method_Request_Updates_No_Copy::~TAO_NS_Method_Request_Updates_No_Copy () } TAO_NS_Method_Request* -TAO_NS_Method_Request_Updates_No_Copy::copy (void) +TAO_NS_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_NS_Method_Request* request; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h index c2629eee5c1..9ff84646784 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h @@ -75,7 +75,7 @@ public: ~TAO_NS_Method_Request_Updates_No_Copy (); /// Create a copy of this object. - TAO_NS_Method_Request* copy (void); + virtual TAO_NS_Method_Request* copy (ACE_ENV_SINGLE_ARG_DECL); /// Execute the Request virtual int execute (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index c2297083ba9..ae64d1eb0a4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -35,7 +35,7 @@ public: TAO_NS_Method_Request_Updates_T (SEQ_PARAM added, SEQ_PARAM removed, PROXY_PARAM proxy); /// Destructor - ~TAO_NS_Method_Request_Updates_T (); + virtual ~TAO_NS_Method_Request_Updates_T (); /// Execute the Request int execute_i (ACE_ENV_SINGLE_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 132489ae250..a78679f4b9a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -1,5 +1,7 @@ // $Id$ +#include "Peer.h" + template ACE_INLINE int TAO_NS_Method_Request_Updates_T::execute_i (ACE_ENV_SINGLE_ARG_DECL) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index c8ba03e66ab..895d44fdb6c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -40,7 +40,7 @@ TAO_NS_ProxySupplier_T::admin_types_changed (const CosNotification } template void -TAO_NS_ProxySupplier_T::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL_NOT_USED) +TAO_NS_ProxySupplier_T::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -49,7 +49,7 @@ TAO_NS_ProxySupplier_T::forward_structured (const CosNotification: TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 1); - this->worker_task ()->execute (request ACE_ENV_ARG_DECL); + this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER); } template void @@ -62,11 +62,11 @@ TAO_NS_ProxySupplier_T::forward_structured_no_filtering (const Cos TAO_NS_Method_Request_Dispatch_No_Copy request (&event, this, 0); - this->worker_task ()->execute (request ACE_ENV_ARG_DECL); + this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER); } template void -TAO_NS_ProxySupplier_T::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL_NOT_USED) +TAO_NS_ProxySupplier_T::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index 3355a84b4be..a655b8745da 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -42,7 +42,6 @@ TAO_NS_Reactive_Task::shutdown (void) void TAO_NS_Reactive_Task::execute (TAO_NS_Method_Request_No_Copy& method_request ACE_ENV_ARG_DECL) { - ACE_DECLARE_NEW_CORBA_ENV; method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 83a40e6fb20..4b95bd7ee25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -98,7 +98,7 @@ TAO_NS_SequenceProxyPushConsumer::push_structured_events (const CosNotification: TAO_NS_Method_Request_Lookup_No_Copy request (&event, this); - this->worker_task ()->execute (request ACE_ENV_ARG_DECL); + this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index 04483e66f96..991d872ed41 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -34,7 +34,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant void TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL) { - ACE_TRY_NEW_ENV + ACE_TRY { event->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -53,7 +53,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_A void TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL) { - ACE_TRY_NEW_ENV + ACE_TRY { event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 77a0edd3e85..2d80fd27dae 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -16,7 +16,6 @@ ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$") #include "../AdminProperties.h" #include "../Method_Request_Lookup.h" #include "../Worker_Task.h" -#include "c:/Program Files/Rational/Quantify/pure.h" TAO_NS_StructuredProxyPushConsumer::TAO_NS_StructuredProxyPushConsumer (void) { @@ -83,18 +82,6 @@ TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification , CosEventComm::Disconnected )) { - static int quantify_started = 0; - - if (!quantify_started) - { - // Reset Quantify data recording; whatever happened in the past - // is not relevant to this test. - QuantifyClearData (); - quantify_started = 1; - } - - QuantifyStartRecordingData (); - // Check if we should proceed at all. if (this->admin_properties_->reject_new_events () == 1 && this->admin_properties_->queue_full ()) @@ -109,9 +96,7 @@ TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification TAO_NS_Method_Request_Lookup_No_Copy request (&event, this); - this->worker_task ()->execute (request ACE_ENV_ARG_DECL); - - QuantifyStopRecordingData (); + this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 2ac77c83b02..7a9aff05883 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -2,7 +2,6 @@ #include "StructuredPushConsumer.h" #include "ace/Refcounted_Auto_Ptr.h" #include "../Event.h" -#include "c:/Program Files/Rational/Quantify/pure.h" #if ! defined (__ACE_INLINE__) #include "StructuredPushConsumer.inl" @@ -60,7 +59,5 @@ TAO_NS_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL) void TAO_NS_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) { - QuantifyStopRecordingData (); this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - QuantifyStartRecordingData (); } -- cgit v1.2.1