diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Admin.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Factory.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.cpp | 7 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.h | 3 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Service.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h | 5 |
9 files changed, 43 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index a0b9c439dd0..81e3e24479e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -32,10 +32,12 @@ class TAO_NS_EventChannel; * @brief * */ + class TAO_Notify_Export TAO_NS_Admin : public virtual TAO_NS_Container_T <TAO_NS_Proxy, TAO_NS_Admin, TAO_NS_EventChannel> { - typedef ACE_Unbounded_Set <TAO_NS_Object_Id> TAO_NS_Object_Id_Seq; public: + typedef ACE_Unbounded_Set <TAO_NS_Object_Id> TAO_NS_Object_Id_Seq; + enum ADMIN_TYPE { CONSUMER_ADMIN, diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 34084a7aaee..2cd508f45f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -39,12 +39,16 @@ class TAO_NS_EventChannel; * @brief Implementation of CosNotifyChannelAdmin::EventChannelFactory * */ + + class TAO_Notify_Export TAO_NS_EventChannelFactory : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory, public TAO_NS_Container_T <TAO_NS_EventChannel, TAO_NS_EventChannelFactory, TAO_NS_Notify_Service>, public TAO_NS_Destroy_Callback { friend class TAO_NS_Builder; + +public: typedef TAO_NS_Container_T <TAO_NS_EventChannel, TAO_NS_EventChannelFactory, TAO_NS_Notify_Service> inherited; typedef ACE_Unbounded_Set <TAO_NS_Object_Id> TAO_NS_Object_Id_Seq; -public: + /// Constuctor TAO_NS_EventChannelFactory (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Factory.cpp index b56200c5ed7..db01c5f1d3e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.cpp @@ -268,7 +268,7 @@ template class TAO_ESF_Proxy_Collection<TAO_NS_Supplier>; template class TAO_ESF_Proxy_Collection<TAO_NS_Peer>; template class ACE_Unbounded_Set<int>; -template class ACE_Unbounded_Set<TAO_NS_EventType>; +//template class ACE_Unbounded_Set<TAO_NS_EventType>; template class ACE_Unbounded_Set<TAO_NS_ProxySupplier *>; template class ACE_Unbounded_Set_Const_Iterator<int>; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.cpp index b70ce05d6e7..e9fcf835f92 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.cpp @@ -36,9 +36,16 @@ TAO_NS_Pending_Worker_T<PEER>::~TAO_NS_Pending_Worker_T () { } +template <class PEER> int +TAO_NS_Pending_Worker_T<PEER>::init (int argc, char **argv) +{ + return this->ACE_Task<ACE_SYNCH>::init (argc, argv); +} + template <class PEER> void TAO_NS_Pending_Worker_T<PEER>::init (TAO_NS_Dispatch_Observer_T<PEER>* dispatch_observer, ACE_Time_Value& update_period ACE_ENV_ARG_DECL) { + this->dispatch_observer_ = dispatch_observer; this->update_period_ = update_period; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.h index 365b66c0b27..edd86b221c0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Pending_Worker_T.h @@ -57,6 +57,9 @@ public: /// Destructor ~TAO_NS_Pending_Worker_T (); + /// Call the base class init + int init (int argc, char **argv); + /// Init void init (TAO_NS_Dispatch_Observer_T<PEER>* dispatch_observer, ACE_Time_Value& update_period ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index d5830fdb6da..7ed0768766f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -85,7 +85,9 @@ TAO_NS_SequencePushConsumer::qos_changed (TAO_NS_QoSProperties& qos_properties) if (this->cancel_timer (reactor) != 1) // Cancel existing timer. return; - if (this->pacing_interval_.value () != ACE_Time_Value::zero) + ///Yamuna: Added the following so the comparison works + ACE_Time_Value pacing_interval (this->pacing_interval_.value ()); + if (pacing_interval != ACE_Time_Value::zero) this->schedule_timer (reactor); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 37575cef1a7..a22d922f87e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -33,6 +33,10 @@ class TAO_Notify_Export TAO_NS_Service : public ACE_Service_Object { public: + + /// Call the base class init + int init (int argc, char **argv); + /// Init the service. virtual void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index 484d0167d73..fc4a5bd9cb3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -23,6 +23,18 @@ TAO_NS_ThreadPool_Task::~TAO_NS_ThreadPool_Task () delete this->buffering_strategy_; } +int +TAO_NS_ThreadPool_Task::init (int argc, char **argv) +{ + return this->ACE_Task<ACE_SYNCH>::init (argc, argv); +} + +void +TAO_NS_ThreadPool_Task::init (TAO_NS_AdminProperties& admin_properties) +{ + TAO_NS_Worker_Task::init (admin_properties); +} + void TAO_NS_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties& admin_properties ACE_ENV_ARG_DECL) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index cb205b6d8ba..19f6c97fa96 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -43,6 +43,11 @@ public: /// Destructor ~TAO_NS_ThreadPool_Task (); + /// Call the base class init + virtual int init (int argc, char **argv); + + virtual void init(TAO_NS_AdminProperties&); + /// Activate the threadpool void init (const NotifyExt::ThreadPoolParams& tp_params, TAO_NS_AdminProperties& admin_properties ACE_ENV_ARG_DECL); |