diff options
Diffstat (limited to 'TAO/tao/Object_Adapter.h')
| -rw-r--r-- | TAO/tao/Object_Adapter.h | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h index f41875430d4..3024bc64b44 100644 --- a/TAO/tao/Object_Adapter.h +++ b/TAO/tao/Object_Adapter.h @@ -19,7 +19,6 @@ #include "tao/Key_Adapters.h" #include "tao/Server_Strategy_Factory.h" -#include "tao/poa_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -83,10 +82,6 @@ public: ACE_Lock &lock (void); - ACE_SYNCH_MUTEX &thread_lock (void); - - ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void); - static CORBA::ULong transient_poa_name_size (void); protected: @@ -128,11 +123,6 @@ protected: int unbind_persistent_poa (const poa_name &folded_name, const poa_name &system_name); - static ACE_Lock *create_lock (int enable_locking, - ACE_SYNCH_MUTEX &thread_lock); - -public: - class Hint_Strategy { // = TITLE @@ -225,8 +215,6 @@ public: }; -protected: - Hint_Strategy *hint_strategy_; typedef ACE_Map< @@ -286,23 +274,8 @@ protected: TAO_ORB_Core &orb_core_; - int enable_locking_; - - ACE_SYNCH_MUTEX thread_lock_; - ACE_Lock *lock_; - ACE_Reverse_Lock<ACE_Lock> reverse_lock_; - - ACE_SYNCH_CONDITION non_servant_upcall_condition_; - // Condition variable for waiting on non-servant upcalls to end. - - CORBA::Boolean non_servant_upcall_in_progress_; - // Flag for knowing when an non-servant upcall is in progress. - - ACE_thread_t non_servant_upcall_thread_; - // Id of thread making the non-servant upcall. - public: class poa_name_iterator @@ -352,90 +325,6 @@ public: const poa_name &folded_name_; }; - class Non_Servant_Upcall - { - // = TITLE - // This class helps us with a recursive thread lock without - // using a recursive thread lock. Non_Servant_Upcall has a - // magic constructor and destructor. We unlock the - // Object_Adapter lock for the duration of the non-servant - // (i.e., adapter activator and servant activator) upcalls; - // reacquiring once the upcalls complete. Even though we are - // releasing the lock, other threads will not be able to make - // progress since - // <Object_Adapter::non_servant_upcall_in_progress_> has been - // set. - public: - - Non_Servant_Upcall (TAO_Object_Adapter &object_adapter); - // Constructor. - - ~Non_Servant_Upcall (void); - // Destructor. - - protected: - - TAO_Object_Adapter &object_adapter_; - }; - - friend class Non_Servant_Upcall; - - class Outstanding_Requests - { - // = TITLE - // This class helps us by increasing - // <POA::outstanding_requests_> for the duration of the - // servant upcall. Outstanding_Requests has a magic - // constructor and destructor. We increment - // <POA::outstanding_requests_> in the constructor. We - // decrement <POA::outstanding_requests_> in the destructor. - // Note that the lock is released after - // <POA::outstanding_requests_> is increased and - // <POA::outstanding_requests_> is decreased after the lock - // has been reacquired. - public: - - Outstanding_Requests (TAO_POA &poa, - TAO_Object_Adapter &object_adapter); - // Constructor. - - ~Outstanding_Requests (void); - // Destructor. - - protected: - - TAO_POA &poa_; - TAO_Object_Adapter &object_adapter_; - }; - - friend class Outstanding_Requests; - - class Single_Threaded_POA_Lock - { - // = TITLE - // This class helps us by locking servants in a single - // threaded POA for the duration of the upcall. - // Single_Threaded_POA_Lock has a magic constructor and - // destructor. We acquire the servant lock in the - // constructor. We release the servant lock in the - // destructor. - public: - - Single_Threaded_POA_Lock (TAO_POA &poa, - PortableServer::Servant servant); - // Constructor. - - ~Single_Threaded_POA_Lock (void); - // Destructor. - - protected: - - TAO_POA &poa_; - PortableServer::Servant servant_; - }; - - friend class Single_Threaded_POA_Lock; - }; //////////////////////////////////////////////////////////////////////////////// |