From b7da9906aa72edec01f561aa06a849df149af6d2 Mon Sep 17 00:00:00 2001 From: bala Date: Thu, 7 Dec 2000 12:10:18 +0000 Subject: *** empty log message *** --- TAO/tao/MessagingC.cpp | 144 +++------------------------------- TAO/tao/MessagingC.h | 77 +----------------- TAO/tao/MessagingC.i | 4 +- TAO/tao/Strategies/TAO_Strategies.dsp | 20 ++++- TAO/tao/TAO.dsp | 30 +++---- TAO/tao/TAO_Static.dsp | 52 ++++++++---- 6 files changed, 77 insertions(+), 250 deletions(-) diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index 872ce64215a..f524903f9a0 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -1627,7 +1627,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy ( // default constructor Messaging::ReplyHandler::ReplyHandler (int collocated) { - this->setup_collocation (collocated); + this->_tao_setup_collocation (collocated); } // destructor @@ -1635,14 +1635,14 @@ Messaging::ReplyHandler::~ReplyHandler (void) {} void -Messaging::ReplyHandler::setup_collocation (int collocated) +Messaging::ReplyHandler::_tao_setup_collocation (int collocated) { if (collocated) this->the_TAO_ReplyHandler_Proxy_Broker_ = - Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer (this); + ::Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer (this); else this->the_TAO_ReplyHandler_Proxy_Broker_ = - Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::the_TAO_ReplyHandler_Remote_Proxy_Broker (); + ::Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::the_TAO_ReplyHandler_Remote_Proxy_Broker (); } @@ -1702,7 +1702,7 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow ( if (CORBA::is_nil (default_proxy)) ACE_NEW_RETURN (default_proxy, ::Messaging::ReplyHandler (stub, 0, obj->_servant ()), ReplyHandler::_nil ()); -#if (TAO_HAS_SMART_PROXIES == 1) +#if 0//(TAO_HAS_SMART_PROXIES == 1) return TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); # else return default_proxy; @@ -1765,137 +1765,11 @@ const char* Messaging::ReplyHandler::_interface_repository_id (void) const return "IDL:omg.org/Messaging/ReplyHandler:1.0"; } -#if (TAO_HAS_SMART_PROXIES == 1) -Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory) +static const CORBA::Long _oc_Messaging_ReplyHandler[] = { - if (register_proxy_factory) - { - TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this); - } -} - -Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void) -{ -} - -Messaging::ReplyHandler_ptr -Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::create_proxy ( - ::Messaging::ReplyHandler_ptr proxy, - CORBA::Environment & - ) -{ - return proxy; -} - -Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void) - : proxy_factory_ (0), - delete_proxy_factory_ (0) -{ -} - -Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void) -{ - // Making sure the factory which the adapter has is destroyed with it. - if (this->proxy_factory_ != 0) - delete this->proxy_factory_; -} - -int -Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::register_proxy_factory ( - TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - // Remove any existing and replace with the new one. - this->unregister_proxy_factory (ACE_TRY_ENV); - this->proxy_factory_ = df; - this->delete_proxy_factory_ = 0; -return 0; -} - -int -Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::unregister_proxy_factory ( - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) - { - // Its necessary to set to 1 to make sure that it - // doesnt get into an infinite loop in as it is - // invoked in the destructor of the class too. - this->delete_proxy_factory_ = 1; - delete this->proxy_factory_; - this->proxy_factory_ = 0; - } -return 0; -} - -Messaging::ReplyHandler_ptr -Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::create_proxy ( - ::Messaging::ReplyHandler_ptr proxy, - CORBA::Environment & - ) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->lock_, 0)); - // Verify that an is available else make one. - if (this->proxy_factory_ == 0) - ACE_NEW_RETURN (this->proxy_factory_, - TAO_Messaging_ReplyHandler_Default_Proxy_Factory (1), - 0); - - - return this->proxy_factory_->create_proxy (proxy); -} - -Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void) -{ -} - -Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void) -{ -} - -TAO_Stub * -Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::_stubobj (void) const -{ - return this->base_proxy_->_stubobj (); -} - -Messaging::ReplyHandler_ptr -Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::get_proxy (void) - -{ - // Obtain the real proxy stored in - if (CORBA::is_nil (this->proxy_.in ())) - { - // Necessary to do this else you are stuck in an infinte loop - // creating smart proxies! - TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->unregister_proxy_factory (); - this->proxy_ = ::Messaging::ReplyHandler::_unchecked_narrow (this->base_proxy_.in ()); - } - - return this->proxy_.in (); - } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Singleton; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate TAO_Singleton - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* TAO_HAS_SMART_PROXIES */ - - static const CORBA::Long _oc_Messaging_ReplyHandler[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0 - 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler + TAO_ENCAP_BYTE_ORDER, // byte order + 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0 + 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler }; static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler)); TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 1033c29fe6b..2163a56c9f4 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -34,11 +34,6 @@ #include "tao/IOPC.h" #include "tao/PollableC.h" -#if (TAO_HAS_SMART_PROXIES == 1) -#include "tao/Smart_Proxies.h" -#include "tao/TAO_Singleton.h" -#endif /*TAO_HAS_SMART_PROXIES == 1*/ - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -2565,7 +2560,7 @@ class TAO_Export ReplyHandler : public virtual CORBA_Object ReplyHandler (int collocated = 0); protected: - virtual void setup_collocation (int collocated); + virtual void _tao_setup_collocation (int collocated); ReplyHandler ( TAO_Stub *objref, @@ -2675,76 +2670,6 @@ class TAO_Export ReplyHandler : public virtual CORBA_Object // End Remote Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// -#if (TAO_HAS_SMART_PROXIES == 1) -class TAO_Export TAO_Messaging_ReplyHandler_Default_Proxy_Factory - { - public: - - TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory = 1); - - virtual ~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void); - - virtual ReplyHandler_ptr create_proxy ( - ReplyHandler_ptr proxy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -}; - - -class TAO_Export TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter - { - public: - - friend class TAO_Singleton; - - int register_proxy_factory ( - TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - int unregister_proxy_factory ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - ReplyHandler_ptr create_proxy ( - ReplyHandler_ptr proxy, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - protected: - TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); - ~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void); - TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter &operator= ( - const TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter & - ); - TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; - int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; - - }; - - typedef TAO_Singleton TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; - - class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base - : public virtual ReplyHandler, - public virtual TAO_Smart_Proxy_Base - { - public: - TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); - ~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void); - virtual TAO_Stub *_stubobj (void) const; - protected: - ::Messaging::ReplyHandler_ptr get_proxy (void); - ::Messaging::ReplyHandler_var proxy_; - }; - -#endif /* TAO_HAS_SMART_PROXIES */ - - #endif /* end #if !defined */ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i index 1e205275950..d2e30c90b42 100644 --- a/TAO/tao/MessagingC.i +++ b/TAO/tao/MessagingC.i @@ -3860,8 +3860,8 @@ Messaging::ReplyHandler::ReplyHandler ( ) : CORBA_Object (objref, _tao_collocated, servant) { - - this->setup_collocation (_tao_collocated); + + this->_tao_setup_collocation (_tao_collocated); } #if !defined (_MESSAGING_REPLYHANDLER___VAR_CI_) diff --git a/TAO/tao/Strategies/TAO_Strategies.dsp b/TAO/tao/Strategies/TAO_Strategies.dsp index 1cb590ab3b4..cc2ebed5649 100644 --- a/TAO/tao/Strategies/TAO_Strategies.dsp +++ b/TAO/tao/Strategies/TAO_Strategies.dsp @@ -114,7 +114,7 @@ SOURCE=.\SHMIOP_Acceptor.cpp # End Source File # Begin Source File -SOURCE=.\SHMIOP_Connect.cpp +SOURCE=.\SHMIOP_Connection_Handler.cpp # End Source File # Begin Source File @@ -146,7 +146,7 @@ SOURCE=.\UIOP_Acceptor.cpp # End Source File # Begin Source File -SOURCE=.\UIOP_Connect.cpp +SOURCE=.\UIOP_Connection_Handler.cpp # End Source File # Begin Source File @@ -206,6 +206,10 @@ SOURCE=.\SHMIOP_Connect.h # End Source File # Begin Source File +SOURCE=.\SHMIOP_Connection_Handler.h +# End Source File +# Begin Source File + SOURCE=.\SHMIOP_Connector.h # End Source File # Begin Source File @@ -246,6 +250,10 @@ SOURCE=.\UIOP_Connect.h # End Source File # Begin Source File +SOURCE=.\UIOP_Connection_Handler.h +# End Source File +# Begin Source File + SOURCE=.\UIOP_Connector.h # End Source File # Begin Source File @@ -302,6 +310,10 @@ SOURCE=.\SHMIOP_Connect.i # End Source File # Begin Source File +SOURCE=.\SHMIOP_Connection_Handler.inl +# End Source File +# Begin Source File + SOURCE=.\SHMIOP_Endpoint.i # End Source File # Begin Source File @@ -322,6 +334,10 @@ SOURCE=.\UIOP_Connect.i # End Source File # Begin Source File +SOURCE=.\UIOP_Connection_Handler.inl +# End Source File +# Begin Source File + SOURCE=.\UIOP_Endpoint.i # End Source File # Begin Source File diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 89d809d44e0..f0f49b9cea8 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -1221,7 +1221,7 @@ SOURCE=.\GIOP_Message_Generator_Parser_Impl.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Headers.cpp +SOURCE=.\GIOP_Message_Lite.cpp !IF "$(CFG)" == "TAO DLL - Win32 Alpha Release" @@ -1240,7 +1240,7 @@ SOURCE=.\GIOP_Message_Headers.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Lite.cpp +SOURCE=.\GIOP_Message_Locate_Header.cpp !IF "$(CFG)" == "TAO DLL - Win32 Alpha Release" @@ -3572,14 +3572,6 @@ SOURCE=.\giop.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Accept_State.h -# End Source File -# Begin Source File - -SOURCE=.\GIOP_Message_Acceptors.h -# End Source File -# Begin Source File - SOURCE=.\GIOP_Message_Base.h # End Source File # Begin Source File @@ -3608,11 +3600,11 @@ SOURCE=.\GIOP_Message_Generator_Parser_Impl.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Headers.h +SOURCE=.\GIOP_Message_Lite.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Lite.h +SOURCE=.\GIOP_Message_Locate_Header.h # End Source File # Begin Source File @@ -4280,23 +4272,23 @@ SOURCE=.\giop.i # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Accept_State.i +SOURCE=.\GIOP_Message_Base.i # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Acceptors.i +SOURCE=.\GIOP_Message_Generator_Parser.inl # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Base.i +SOURCE=.\GIOP_Message_Generator_Parser_10.inl # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Connectors.i +SOURCE=.\GIOP_Message_Generator_Parser_11.inl # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Generator_Parser.inl +SOURCE=.\GIOP_Message_Generator_Parser_12.inl # End Source File # Begin Source File @@ -4308,10 +4300,6 @@ SOURCE=.\GIOP_Message_Headers.i # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Lite.i -# End Source File -# Begin Source File - SOURCE=.\GIOP_Message_State.i # End Source File # Begin Source File diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index d135649ac32..4c2aae59624 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -279,23 +279,27 @@ SOURCE=.\giop.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Accept_State.h +SOURCE=.\GIOP_Message_Base.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Acceptors.h +SOURCE=.\GIOP_Message_Generator_Parser.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Base.h +SOURCE=.\GIOP_Message_Generator_Parser_10.h +# End Source File +# Begin Source File + +SOURCE=.\GIOP_Message_Generator_Parser_11.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Connectors.h +SOURCE=.\GIOP_Message_Generator_Parser_12.h # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Headers.h +SOURCE=.\GIOP_Message_Generator_Parser_Impl.h # End Source File # Begin Source File @@ -303,6 +307,10 @@ SOURCE=.\GIOP_Message_Lite.h # End Source File # Begin Source File +SOURCE=.\GIOP_Message_Locate_Header.h +# End Source File +# Begin Source File + SOURCE=.\GIOP_Message_State.h # End Source File # Begin Source File @@ -963,19 +971,27 @@ SOURCE=.\giop.i # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Accept_State.i +SOURCE=.\GIOP_Message_Base.i # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Acceptors.i +SOURCE=.\GIOP_Message_Generator_Parser.inl # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Base.i +SOURCE=.\GIOP_Message_Generator_Parser_10.inl +# End Source File +# Begin Source File + +SOURCE=.\GIOP_Message_Generator_Parser_11.inl +# End Source File +# Begin Source File + +SOURCE=.\GIOP_Message_Generator_Parser_12.inl # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Connectors.i +SOURCE=.\GIOP_Message_Generator_Parser_Impl.inl # End Source File # Begin Source File @@ -1559,23 +1575,27 @@ SOURCE=.\FILE_Parser.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Accept_State.cpp +SOURCE=.\GIOP_Message_Base.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Acceptors.cpp +SOURCE=.\GIOP_Message_Generator_Parser.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Base.cpp +SOURCE=.\GIOP_Message_Generator_Parser_10.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Connectors.cpp +SOURCE=.\GIOP_Message_Generator_Parser_11.cpp # End Source File # Begin Source File -SOURCE=.\GIOP_Message_Headers.cpp +SOURCE=.\GIOP_Message_Generator_Parser_12.cpp +# End Source File +# Begin Source File + +SOURCE=.\GIOP_Message_Generator_Parser_Impl.cpp # End Source File # Begin Source File @@ -1583,6 +1603,10 @@ SOURCE=.\GIOP_Message_Lite.cpp # End Source File # Begin Source File +SOURCE=.\GIOP_Message_Locate_Header.cpp +# End Source File +# Begin Source File + SOURCE=.\GIOP_Message_State.cpp # End Source File # Begin Source File -- cgit v1.2.1