diff options
29 files changed, 62 insertions, 543 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 612913b119e..299285dc430 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,37 @@ +Mon Mar 7 09:32:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Client_Strategy_Factory.h: + * tao/Client_Strategy_Factory.cpp: + * tao/ORB_Core.h: + * tao/PortableServer/Non_Servant_Upcall.cpp: + * tao/PortableServer/Object_Adapter.h: + * tao/PortableServer/Object_Adapter.inl: + * tao/PortableServer/Object_Adapter.cpp: + * tao/PortableServer/Root_POA.h: + * tao/PortableServer/Root_POA.inl: + * tao/PortableServer/Root_POA.cpp: + * tao/PortableServer/ServantRetentionStrategyRetain.cpp: + * tao/PortableServer/Servant_Upcall.cpp: + * tao/Resource_Factory.h: + * tao/Resource_Factory.cpp: + * tao/Server_Strategy_Factory.h: + * tao/Server_Strategy_Factory.cpp: + * tao/Stub.cpp: + * tao/Transport_Mux_Strategy.h: + * tao/default_client.h: + * tao/default_client.cpp: + * tao/default_resource.h: + * tao/default_resource.cpp: + * tao/default_server.h: + * tao/default_server.cpp: + * tao/tao.mpc: + Reapplied the changes reverted on Mon Feb 14 10:44:30 + + * tao/Configurable_Refcount.h: + * tao/Configurable_Refcount.inl: + * tao/Configurable_Refcount.cpp: + Removed these files. + Mon Mar 7 09:10:25 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp: diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp index aae2ca94ca0..f8c25ad3e2e 100644 --- a/TAO/tao/Client_Strategy_Factory.cpp +++ b/TAO/tao/Client_Strategy_Factory.cpp @@ -9,18 +9,6 @@ TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void) { } -ACE_Lock * -TAO_Client_Strategy_Factory::create_profile_lock (void) -{ - return 0; -} - -TAO_Configurable_Refcount -TAO_Client_Strategy_Factory::create_profile_refcount (void) -{ - return TAO_Configurable_Refcount (TAO_Configurable_Refcount::TAO_NULL_LOCK); -} - TAO_Transport_Mux_Strategy * TAO_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *) { diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 69ce9e9d325..9cfaacfac72 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -23,7 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "tao/Versioned_Namespace.h" -#include "tao/Configurable_Refcount.h" #include "ace/Service_Object.h" @@ -52,14 +51,6 @@ public: /// Destructor virtual ~TAO_Client_Strategy_Factory (void); - /** - * Create the lock for the stub and the profile - */ - virtual ACE_Lock* create_profile_lock (void); - - /// Create the refcount for the profile - virtual TAO_Configurable_Refcount create_profile_refcount (void); - /// Create the correct client request muxing strategy. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); diff --git a/TAO/tao/Configurable_Refcount.cpp b/TAO/tao/Configurable_Refcount.cpp deleted file mode 100644 index 26c0753d175..00000000000 --- a/TAO/tao/Configurable_Refcount.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Configurable_Refcount.h" - -#if !defined (__ACE_INLINE__) -# include "Configurable_Refcount.inl" -#endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Configurable_Refcount.h b/TAO/tao/Configurable_Refcount.h deleted file mode 100644 index e73d1f22cc5..00000000000 --- a/TAO/tao/Configurable_Refcount.h +++ /dev/null @@ -1,69 +0,0 @@ -// This may look like C, but it's really -// -*- C++ -*- - -//============================================================================= -/** - * @file Configurable_Refcount.h - * - * $Id$ - * - * Definition for a synchronised refcountable interface. - * - * @author Fred Kuhns <fredk@cs.wustl.edu> - */ -//============================================================================= - -#ifndef TAO_CONFIGURABLE_REFCOUNT_H -#define TAO_CONFIGURABLE_REFCOUNT_H - -#include /**/ "ace/pre.h" -#include "ace/Atomic_Op.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Null_Mutex.h" -#include /**/ "tao/TAO_Export.h" -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Configurable_Refcount - * - * @brief Definition for a synchronised refcountable interface. - */ -class TAO_Export TAO_Configurable_Refcount -{ -public: - enum Lock_Type - { - TAO_NULL_LOCK, - TAO_THREAD_LOCK - }; - - TAO_Configurable_Refcount (Lock_Type type = TAO_THREAD_LOCK, - unsigned long value = 1); - - unsigned long increment (void); - unsigned long decrement (void); - - unsigned long value (void) const; - -private: - Lock_Type type_; - ACE_Atomic_Op<ACE_SYNCH_NULL_MUTEX, unsigned long> null_refcount_; - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> mutex_refcount_; -}; - - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "Configurable_Refcount.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CONFIGURABLE_REFCOUNT */ diff --git a/TAO/tao/Configurable_Refcount.inl b/TAO/tao/Configurable_Refcount.inl deleted file mode 100644 index c885976bbc6..00000000000 --- a/TAO/tao/Configurable_Refcount.inl +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- -//$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO_Configurable_Refcount::TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::Lock_Type type, - unsigned long value) - : type_ (type), - null_refcount_ (value), - mutex_refcount_ (value) -{ -} - -ACE_INLINE unsigned long -TAO_Configurable_Refcount::increment (void) -{ - switch(this->type_) - { - case TAO_NULL_LOCK: - return this->null_refcount_++; - case TAO_THREAD_LOCK: - default: - return this->mutex_refcount_++; - } -} - -ACE_INLINE unsigned long -TAO_Configurable_Refcount::decrement (void) -{ - switch(this->type_) - { - case TAO_NULL_LOCK: - return --this->null_refcount_; - case TAO_THREAD_LOCK: - default: - return --this->mutex_refcount_; - } -} - -ACE_INLINE unsigned long -TAO_Configurable_Refcount::value (void) const -{ - switch(this->type_) - { - case TAO_NULL_LOCK: - return this->null_refcount_.value (); - case TAO_THREAD_LOCK: - default: - return this->mutex_refcount_.value (); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index a1cdaa60e22..136d43e24d8 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -821,7 +821,7 @@ public: TAO_Valuetype_Adapter *valuetype_adapter (void); #if !defined(CORBA_E_MICRO) - // Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) + /// Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) CORBA::ValueFactory register_value_factory ( const char *repository_id, CORBA::ValueFactory factory); @@ -862,7 +862,7 @@ public: /// gets called at initialization. void request_dispatcher (TAO_Request_Dispatcher *rd); - /// Call the libraries to handover the validators if they havent + /// Call the libraries to handover the validators if they haven't /// registered yet with the list of validators. void load_policy_validators (TAO_Policy_Validator &validator); @@ -919,7 +919,7 @@ protected: ~TAO_ORB_Core (void); /// Initialize the guts of the ORB Core. It is intended that this be - /// called by <CORBA::ORB_init>. + /// called by CORBA::ORB_init(). int init (int &argc, char *argv[]); /// Final termination hook, typically called by CORBA::ORB's diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index 1702524039e..0c99cbe2881 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -78,10 +78,8 @@ namespace TAO } } - // If locking is enabled. - if (this->object_adapter_.enable_locking_) - // Wakeup all waiting threads. - this->object_adapter_.non_servant_upcall_condition_.broadcast (); + // Wakeup all waiting threads. + this->object_adapter_.non_servant_upcall_condition_.broadcast (); } } } diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 7e487f8bd2c..8686ad9979d 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -143,10 +143,8 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ persistent_poa_name_map_ (0), transient_poa_map_ (0), orb_core_ (orb_core), - enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()), thread_lock_ (), - lock_ (TAO_Object_Adapter::create_lock (enable_locking_, - thread_lock_)), + lock_ (TAO_Object_Adapter::create_lock (thread_lock_)), reverse_lock_ (*lock_), non_servant_upcall_condition_ (thread_lock_), non_servant_upcall_in_progress_ (0), @@ -310,26 +308,11 @@ TAO_Object_Adapter::~TAO_Object_Adapter (void) /* static */ ACE_Lock * -TAO_Object_Adapter::create_lock (int enable_locking, - TAO_SYNCH_MUTEX &thread_lock) +TAO_Object_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock) { -#if defined (ACE_HAS_THREADS) - if (enable_locking) - { - ACE_Lock *the_lock = 0; - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock), - 0); - return the_lock; - } -#else - ACE_UNUSED_ARG (enable_locking); - ACE_UNUSED_ARG (thread_lock); -#endif /* ACE_HAS_THREADS */ - ACE_Lock *the_lock = 0; ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (), + ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock), 0); return the_lock; } @@ -895,7 +878,7 @@ TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub) // proxy broker if required. stub->is_collocated (true); - // Return 0 (success) iff we found a servant. + // Return 0 (success) if we found a servant. return ! sb; } @@ -1172,8 +1155,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of // course, the thread making the non-servant upcall is this thread. - while (this->enable_locking_ && - this->non_servant_upcall_in_progress_ && + while (this->non_servant_upcall_in_progress_ && ! ACE_OS::thr_equal (this->non_servant_upcall_thread_, ACE_OS::thr_self ())) { diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 95e81dd97c0..f1ba04ddbdd 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -138,8 +138,6 @@ public: /// Return the validator. TAO_Policy_Validator &validator (void); - int enable_locking() const; - /// Return the set of default policies. TAO_POA_Policy_Set &default_poa_policies (void); @@ -149,8 +147,7 @@ public: void servant_dispatcher (TAO_Servant_Dispatcher *dispatcher); /// Initialize the default set of POA policies. - void init_default_policies (TAO_POA_Policy_Set &policies - ); + void init_default_policies (TAO_POA_Policy_Set &policies); // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation @@ -201,8 +198,7 @@ protected: int unbind_persistent_poa (const poa_name &folded_name, const poa_name &system_name); - static ACE_Lock *create_lock (int enable_locking, - TAO_SYNCH_MUTEX &thread_lock); + static ACE_Lock *create_lock (TAO_SYNCH_MUTEX &thread_lock); virtual void do_dispatch (TAO_ServerRequest& req, TAO::Portable_Server::Servant_Upcall& upcall); @@ -379,8 +375,6 @@ protected: TAO_ORB_Core &orb_core_; - int enable_locking_; - TAO_SYNCH_MUTEX thread_lock_; ACE_Lock *lock_; diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 2d4414b1b93..ed4707efc3c 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -13,12 +13,6 @@ TAO_Object_Adapter::validator (void) return this->default_validator_; } -ACE_INLINE int -TAO_Object_Adapter::enable_locking (void) const -{ - return this->enable_locking_; -} - ACE_INLINE TAO_POA_Policy_Set & TAO_Object_Adapter::default_poa_policies (void) { diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 6855aa5d894..4b72c25a4cd 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -1197,13 +1197,12 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, void TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion) { - while (this->object_adapter ().enable_locking_ && - wait_for_completion && + while (wait_for_completion && this->outstanding_requests_ > 0) { - this->wait_for_completion_pending_ = 1; + this->wait_for_completion_pending_ = true; - int result = this->outstanding_requests_condition_.wait (); + int const result = this->outstanding_requests_condition_.wait (); if (result == -1) { throw ::CORBA::OBJ_ADAPTER (); diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index a9c1a911550..ee14f22a65d 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -675,8 +675,6 @@ protected: static CORBA::ULong root_key_type_length (void); - void outstanding_requests (CORBA::ULong new_outstanding_requests); - CORBA::ULong increment_outstanding_requests (void); CORBA::ULong decrement_outstanding_requests (void); diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index d9da3792237..8a7338e4908 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -185,12 +185,6 @@ TAO_Root_POA::outstanding_requests (void) const return this->outstanding_requests_; } -ACE_INLINE void -TAO_Root_POA::outstanding_requests (CORBA::ULong new_outstanding_requests) -{ - this->outstanding_requests_ = new_outstanding_requests; -} - ACE_INLINE CORBA::ULong TAO_Root_POA::increment_outstanding_requests (void) { diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index ae04c2ae17c..503131137db 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -375,8 +375,7 @@ namespace TAO ++this->waiting_servant_deactivation_; - if (this->poa_->object_adapter ().enable_locking ()) - this->poa_->servant_deactivation_condition ().wait (); + this->poa_->servant_deactivation_condition ().wait (); --this->waiting_servant_deactivation_; @@ -423,8 +422,7 @@ namespace TAO ++this->waiting_servant_deactivation_; - if (this->poa_->object_adapter ().enable_locking ()) - this->poa_->servant_deactivation_condition ().wait (); + this->poa_->servant_deactivation_condition ().wait (); --this->waiting_servant_deactivation_; diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 0e6b76a9ace..5b3383148c2 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -361,8 +361,7 @@ namespace TAO // Ignore errors from servant cleanup .... } - if (this->poa_->waiting_servant_deactivation() > 0 && - this->object_adapter_->enable_locking_) + if (this->poa_->waiting_servant_deactivation() > 0) { // Wakeup all waiting threads. this->poa_->servant_deactivation_condition_.broadcast (); @@ -386,8 +385,7 @@ namespace TAO if (outstanding_requests == 0) { // If locking is enabled and some thread is waiting in POA::destroy. - if (this->object_adapter_->enable_locking_ && - this->poa_->wait_for_completion_pending_) + if (this->poa_->wait_for_completion_pending_) { // Wakeup all waiting threads. this->poa_->outstanding_requests_condition_.broadcast (); diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index a7a8f63d612..6b050ea23c3 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -196,25 +196,6 @@ TAO_Resource_Factory::locked_transport_cache (void) return 0; } -ACE_Lock * -TAO_Resource_Factory::create_object_key_table_lock (void) -{ - return 0; -} - -ACE_Lock * -TAO_Resource_Factory::create_corba_object_lock (void) -{ - return 0; -} - -TAO_Configurable_Refcount -TAO_Resource_Factory::create_corba_object_refcount (void) -{ - return TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::TAO_NULL_LOCK); -} - int TAO_Resource_Factory::load_default_protocols (void) { diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index d77c18d1241..19f8d28b24f 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -24,7 +24,6 @@ #include /**/ "tao/Versioned_Namespace.h" #include "tao/Basic_Types.h" -#include "tao/Configurable_Refcount.h" #include "ace/Service_Object.h" #include "ace/Unbounded_Set.h" @@ -226,15 +225,6 @@ public: /// transport cache needs to be locked else return 0 virtual int locked_transport_cache (void); - /// Creates a lock needed for the table that stores the object keys. - virtual ACE_Lock *create_object_key_table_lock (void); - - /// Creates the lock for the CORBA Object - virtual ACE_Lock *create_corba_object_lock (void); - - /// Creates the configurable refcount for the CORBA Object - virtual TAO_Configurable_Refcount create_corba_object_refcount (void); - /// Creates the flushing strategy. The new instance is owned by the /// caller. virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0; diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp index 079b96605db..f4406f2696f 100644 --- a/TAO/tao/Server_Strategy_Factory.cpp +++ b/TAO/tao/Server_Strategy_Factory.cpp @@ -21,12 +21,6 @@ TAO_Server_Strategy_Factory::open (TAO_ORB_Core*) } int -TAO_Server_Strategy_Factory::enable_poa_locking (void) -{ - return -1; -} - -int TAO_Server_Strategy_Factory::activate_server_connections (void) { return 0; diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index db38f2b0034..fd6f34e7a66 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -101,9 +101,6 @@ public: */ virtual int open (TAO_ORB_Core* orb_core); - /// Enable POA locking? - virtual int enable_poa_locking (void); - /// Are server connections active (i.e. run in their own thread) virtual int activate_server_connections (void); diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index a983f392794..6fcf63b6024 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -74,8 +74,7 @@ TAO_Stub::TAO_Stub (const char *repository_id, // Cache the ORB pointer to respond faster to certain queries. this->orb_ = CORBA::ORB::_duplicate (this->orb_core_->orb ()); - this->profile_lock_ptr_ = - this->orb_core_->client_factory ()->create_profile_lock (); + this->profile_lock_ptr_ = new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); this->base_profiles (profiles); } diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index cd2b6fac2cd..94eeef24060 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -24,10 +24,6 @@ #include "tao/Basic_Types.h" #include "tao/Reply_Dispatcher.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Transport; diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index c17dc12b627..e95a81ca2d1 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) - : profile_lock_type_ (TAO_THREAD_LOCK) - , transport_mux_strategy_ (TAO_MUXED_TMS) + : transport_mux_strategy_ (TAO_MUXED_TMS) , wait_strategy_ (TAO_WAIT_ON_LEADER_FOLLOWER) , connect_strategy_ (TAO_LEADER_FOLLOWER_CONNECT) , rd_table_size_ (TAO_RD_TABLE_SIZE) @@ -69,51 +68,10 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) for (curarg = 0; curarg < argc && argv[curarg]; ++curarg) { if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBProfileLock")) == 0) - { - curarg++; - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT("thread")) == 0) - this->profile_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("null")) == 0) - this->profile_lock_type_ = TAO_NULL_LOCK; - else - this->report_option_value_error (ACE_TEXT("-ORBProfileLock"), name); - } - } - else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBIIOPProfileLock")) == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("WARNING: The -ORBIIOPProfileLock option") - ACE_TEXT (" is deprecated and will be removed.\n") - ACE_TEXT (" Please use -ORBProfileLock instead\n"))); - curarg++; - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT("thread")) == 0) - this->profile_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("null")) == 0) - this->profile_lock_type_ = TAO_NULL_LOCK; - else - this->report_option_value_error (ACE_TEXT("-ORBIIOPProfileLock"), name); - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBClientConnectionHandler")) == 0 - || - ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBWaitStrategy")) == 0) + ACE_TEXT("-ORBClientConnectionHandler")) == 0 + || + ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT("-ORBWaitStrategy")) == 0) { curarg++; if (curarg < argc) @@ -242,47 +200,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) return 0; } -ACE_Lock * -TAO_Default_Client_Strategy_Factory::create_profile_lock (void) -{ - ACE_Lock *the_lock = 0; - - switch (this->profile_lock_type_) - { - case TAO_NULL_LOCK: - { - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (), - 0); - break; - } - case TAO_THREAD_LOCK: - { - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), - 0); - break; - } - } - - return the_lock; -} - -TAO_Configurable_Refcount -TAO_Default_Client_Strategy_Factory::create_profile_refcount (void) -{ - switch (this->profile_lock_type_) - { - case TAO_NULL_LOCK: - return TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::TAO_NULL_LOCK); - case TAO_THREAD_LOCK: - default: - return TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::TAO_THREAD_LOCK); - } -} - /// Create the correct client transport muxing strategy. TAO_Transport_Mux_Strategy * TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (TAO_Transport *transport) diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 45b13292db3..3d7ea54f599 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -53,8 +53,6 @@ public: // = Check Client_Strategy_Factory.h for the documentation of the // following methods. - virtual ACE_Lock* create_profile_lock (void); - virtual TAO_Configurable_Refcount create_profile_refcount (void); virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); virtual ACE_Lock *create_transport_mux_strategy_lock (void); virtual int reply_dispatcher_table_size (void) const; @@ -75,9 +73,6 @@ private: TAO_THREAD_LOCK }; - /// the lock type for forwarding IIOP Profile - Lock_Type profile_lock_type_; - enum Transport_Mux_Strategy { TAO_MUXED_TMS, diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index f46a84c3113..ed57244617e 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -119,8 +119,6 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) , use_local_memory_pool_ (false) #endif , cached_connection_lock_type_ (TAO_THREAD_LOCK) - , object_key_table_lock_type_ (TAO_THREAD_LOCK) - , corba_object_lock_type_ (TAO_THREAD_LOCK) , flushing_strategy_type_ (TAO_LEADER_FOLLOWER_FLUSHING) , char_codeset_parameters_ () , wchar_codeset_parameters_ () @@ -274,43 +272,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (curarg < argc) this->wchar_codeset_parameters_.add_translator (argv[curarg]); } - - else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBConnectionCachingStrategy")) == 0) - { - ++curarg; - - // @todo: This needs to be removed after a few betas. The - // note is being written during 1.2.3 timeframe. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) This option would be deprecated\n") - ACE_TEXT ("(%P|%t) Please use -ORBConnectionPurgingStrategy ") - ACE_TEXT ("instead\n"))); - - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT ("lru")) == 0) - this->connection_purging_type_ = - TAO_Resource_Factory::LRU; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT ("lfu")) == 0) - this->connection_purging_type_ = - TAO_Resource_Factory::LFU; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT ("fifo")) == 0) - this->connection_purging_type_ = - TAO_Resource_Factory::FIFO; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT ("null")) == 0) - this->connection_purging_type_ = - TAO_Resource_Factory::NOOP; - else - this->report_option_value_error (ACE_TEXT ("-ORBConnectionCachingStrategy"), name); - } - } else if (ACE_OS::strcasecmp (argv[curarg], ACE_TEXT("-ORBConnectionPurgingStrategy")) == 0) { @@ -396,52 +357,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) } } else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBObjectKeyTableLock")) == 0) - { - ++curarg; - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT("thread")) == 0) - this->object_key_table_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("null")) == 0) - { - // @@ Bug 940 :This is a sort of hack now. We need to put - // this in a common place once we get the common - // switch that is documented in bug 940... - this->object_key_table_lock_type_ = TAO_NULL_LOCK; - } - else - this->report_option_value_error (ACE_TEXT("-ORBObjectKeyTableLock"), name); - } - } - else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBCorbaObjectLock")) == 0) - { - ++curarg; - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT("thread")) == 0) - this->corba_object_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("null")) == 0) - { - // @@ Bug 940 :This is a sort of hack now. We need to put - // this in a common place once we get the common - // switch that is documented in bug 940... - this->corba_object_lock_type_ = TAO_NULL_LOCK; - } - else - this->report_option_value_error (ACE_TEXT("-ORBCorbaObjectLock"), name); - } - } - else if (ACE_OS::strcasecmp (argv[curarg], ACE_TEXT("-ORBResourceUsage")) == 0) { ++curarg; @@ -1070,56 +985,6 @@ TAO_Default_Resource_Factory::locked_transport_cache (void) return 1; } - -ACE_Lock * -TAO_Default_Resource_Factory::create_object_key_table_lock (void) -{ - ACE_Lock *the_lock = 0; - - if (this->object_key_table_lock_type_ == TAO_NULL_LOCK) - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>, - 0); - else - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, - 0); - - return the_lock; -} - -ACE_Lock * -TAO_Default_Resource_Factory::create_corba_object_lock (void) -{ - ACE_Lock *the_lock = 0; - - if (this->corba_object_lock_type_ == TAO_NULL_LOCK) - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>, - 0); - else - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<TAO_SYNCH_MUTEX>, - 0); - - return the_lock; -} - -TAO_Configurable_Refcount -TAO_Default_Resource_Factory::create_corba_object_refcount (void) -{ - switch (this->corba_object_lock_type_) - { - case TAO_NULL_LOCK: - return TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::TAO_NULL_LOCK); - case TAO_THREAD_LOCK: - default: - return TAO_Configurable_Refcount ( - TAO_Configurable_Refcount::TAO_THREAD_LOCK); - } -} - TAO_Flushing_Strategy * TAO_Default_Resource_Factory::create_flushing_strategy (void) { diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 4c7d67f6194..9b5e7907d98 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -176,9 +176,6 @@ public: virtual int purge_percentage (void) const; virtual int max_muxed_connections (void) const; virtual ACE_Lock *create_cached_connection_lock (void); - virtual ACE_Lock *create_object_key_table_lock (void); - virtual TAO_Configurable_Refcount create_corba_object_refcount (void); - virtual ACE_Lock *create_corba_object_lock (void); virtual int locked_transport_cache (void); virtual TAO_Flushing_Strategy *create_flushing_strategy (void); virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void); @@ -236,7 +233,7 @@ protected: /// limit int max_muxed_connections_; - /// If <0> then we create reactors with signal handling disabled. + /// If 0 then we create reactors with signal handling disabled. int reactor_mask_signals_; /** @@ -290,12 +287,6 @@ private: /// Type of lock used by the cached connector. Lock_Type cached_connection_lock_type_; - /// Type of lock used by the corba object. - Lock_Type object_key_table_lock_type_; - - /// Type of lock used by the corba object. - Lock_Type corba_object_lock_type_; - enum Flushing_Strategy_Type { TAO_LEADER_FOLLOWER_FLUSHING, @@ -306,8 +297,8 @@ private: /// Type of flushing strategy configured Flushing_Strategy_Type flushing_strategy_type_; - // Initialization options. To be used later when creating a codeset - // manager instance (s) + /// Initialization options. To be used later when creating a codeset + /// manager instance (s) TAO_Codeset_Parameters char_codeset_parameters_; TAO_Codeset_Parameters wchar_codeset_parameters_; diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index a9a07a7181e..424b43e5806 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), - poa_lock_type_ (TAO_THREAD_LOCK), thread_per_connection_use_timeout_ (-1) { } @@ -21,19 +20,6 @@ TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void) } int -TAO_Default_Server_Strategy_Factory::enable_poa_locking (void) -{ - switch (this->poa_lock_type_) - { - case TAO_NULL_LOCK: - return 0; - case TAO_THREAD_LOCK: - default: - return 1; - } -} - -int TAO_Default_Server_Strategy_Factory::activate_server_connections (void) { return this->activate_server_connections_; @@ -321,24 +307,6 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) } } else if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-ORBPOALock")) == 0) - { - ++curarg; - if (curarg < argc) - { - ACE_TCHAR* name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - ACE_TEXT("thread")) == 0) - this->poa_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("null")) == 0) - this->poa_lock_type_ = TAO_NULL_LOCK; - else - this->report_option_value_error (ACE_TEXT("-ORBPOALock"), name); - } - } - else if (ACE_OS::strcasecmp (argv[curarg], ACE_TEXT("-ORBThreadFlags")) == 0) { ++curarg; diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index e37cf95a468..1e6516c7d47 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -49,7 +49,6 @@ public: // = The TAO_Server_Strategy_Factory methods, please read the // documentation in "tao/Server_Strategy_Factory.h" virtual int open (TAO_ORB_Core*); - virtual int enable_poa_locking (void); virtual int activate_server_connections (void); virtual int thread_per_connection_timeout (ACE_Time_Value &timeout); virtual int server_connection_thread_flags (void); @@ -72,15 +71,6 @@ protected: /// Default thread flags passed to thr_create(). int thread_flags_; - enum Lock_Type - { - TAO_NULL_LOCK, - TAO_THREAD_LOCK - }; - - /// The type of lock to be returned by <create_poa_lock()>. - Lock_Type poa_lock_type_; - /// The timeout flag and value for the thread-per-connection model int thread_per_connection_use_timeout_; ACE_Time_Value thread_per_connection_timeout_; diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 8e354a5a310..650facb183b 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -99,7 +99,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid Collocated_Invocation.cpp Collocation_Proxy_Broker.cpp Collocation_Resolver.cpp - Configurable_Refcount.cpp Connect_Strategy.cpp Connection_Handler.cpp Connection_Purging_Strategy.cpp |