diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-02-27 22:36:17 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-02-27 22:36:17 +0000 |
| commit | 1f53bbc0b2abf305a3ee3caa132561ed6660cdb8 (patch) | |
| tree | 224475125e0c2f3c7e5f37f139acd86360b928a6 | |
| parent | f4a99d738496a33ed8ab3669d42ac293fda0e8e9 (diff) | |
| download | ATCD-1f53bbc0b2abf305a3ee3caa132561ed6660cdb8.tar.gz | |
Working with SUNCC5.0
106 files changed, 387 insertions, 128 deletions
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index b6c5d654496..85f665f8030 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -27,11 +27,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/corbafwd.h" -#include "tao/Typecode.h" #include "tao/Resource_Factory.h" -#include "ace/Containers_T.h" - // Forward declarations. class ACE_Addr; class ACE_Reactor; diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i index 4a98e902fc1..1f314a4f905 100644 --- a/TAO/tao/Acceptor_Registry.i +++ b/TAO/tao/Acceptor_Registry.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + ACE_INLINE TAO_AcceptorSetIterator TAO_Acceptor_Registry::begin (void) { diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h index 2da5d2240ab..df5781482f0 100644 --- a/TAO/tao/Active_Object_Map.h +++ b/TAO/tao/Active_Object_Map.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i index 545d277948a..456e8387f05 100644 --- a/TAO/tao/Any.i +++ b/TAO/tao/Any.i @@ -1,9 +1,9 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ +// $Id$ // Insertion from special types. -ACE_INLINE +ACE_INLINE void CORBA_Any::replace (CORBA::TypeCode_ptr type, const void *value, @@ -17,31 +17,30 @@ CORBA_Any::replace (CORBA::TypeCode_ptr type, ACE_TRY_ENV); } -ACE_INLINE -CORBA::Boolean +ACE_INLINE CORBA::Boolean CORBA_Any::any_owns_data (void) const { return (this->any_owns_data_ != 0 && this->value_ != 0); } -ACE_INLINE -ACE_Message_Block* +ACE_INLINE ACE_Message_Block* CORBA_Any::_tao_get_cdr (void) const { return this->cdr_; } +ACE_INLINE int +CORBA_Any::_tao_byte_order (void) const +{ + return this->byte_order_; +} + ACE_INLINE CORBA_Any::to_object::to_object (CORBA_Object_out obj) : ref_ (obj.ptr ()) { } -ACE_INLINE int -CORBA_Any::_tao_byte_order (void) const -{ - return this->byte_order_; -} // ************************************************************* // Inline operations for class CORBA_Any_var // ************************************************************* diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index f4562d39a99..9a431b9c03e 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -47,6 +48,7 @@ class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation public: TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *data, const char *operation, + CORBA::ULong opname_len_, TAO_ORB_Core* orb_core, const TAO_Reply_Handler_Skeleton &reply_handler_skel, Messaging::ReplyHandler_ptr reply_handler_ptr); diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i index f00ce65d269..d11828e3b6b 100644 --- a/TAO/tao/Asynch_Invocation.i +++ b/TAO/tao/Asynch_Invocation.i @@ -11,11 +11,13 @@ ACE_INLINE TAO_GIOP_Twoway_Asynch_Invocation:: TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core *orb_core, const TAO_Reply_Handler_Skeleton &reply_handler_skel, Messaging::ReplyHandler_ptr reply_handler_ptr) : TAO_GIOP_Invocation (stub, operation, + opname_len, orb_core), rd_ (0) { @@ -44,6 +46,7 @@ TAO_GIOP_DII_Deferred_Invocation (TAO_Stub *stub, const CORBA::Request_ptr req) : TAO_GIOP_Invocation (stub, req->operation (), + ACE_OS::strlen (req->operation ()), orb_core), rd_ (0) { diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index 6bd41a43d4f..58688296181 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -1,7 +1,5 @@ /* -*- C++ -*- */ // $Id$ - - // // ============================================================================ // diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 45f7ab8c271..b163dfb82b8 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -1,6 +1,8 @@ // This may look like C, but it's really -*- C++ -*- + // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index eb76729fc8e..a3e92f1f56b 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -1,6 +1,5 @@ // $Id$ - // // ================================================================ // diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h index 972120df484..0606e83543f 100644 --- a/TAO/tao/Client_Priority_Policy.h +++ b/TAO/tao/Client_Priority_Policy.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // // ============================================================================ // diff --git a/TAO/tao/Client_Priority_Policy.i b/TAO/tao/Client_Priority_Policy.i index bbbd94029d1..492ef306190 100644 --- a/TAO/tao/Client_Priority_Policy.i +++ b/TAO/tao/Client_Priority_Policy.i @@ -1,5 +1,6 @@ // $Id$ + #if (TAO_HAS_CORBA_MESSAGING == 1) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 03f1eaca430..5d474926348 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -1,7 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Direct_Priority_Mapping.h b/TAO/tao/Direct_Priority_Mapping.h index 118edce2224..21eb938965f 100644 --- a/TAO/tao/Direct_Priority_Mapping.h +++ b/TAO/tao/Direct_Priority_Mapping.h @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 38c306d1666..41f5d45b087 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -2,7 +2,6 @@ // $Id$ - // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3f9759adf12..1363580887c 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -1,8 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - - // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/GIOP_Message_Acceptors.h b/TAO/tao/GIOP_Message_Acceptors.h index afdf71a8baf..e635fdc3ada 100644 --- a/TAO/tao/GIOP_Message_Acceptors.h +++ b/TAO/tao/GIOP_Message_Acceptors.h @@ -34,10 +34,8 @@ class TAO_Export TAO_GIOP_Message_Acceptors: public: - TAO_GIOP_Message_Acceptors (void) - { - cout << "Thaye parameshi "<<endl; - } + TAO_GIOP_Message_Acceptors (void); + int process_connector_messages (TAO_Transport *transport, TAO_ORB_Core *orb_core, TAO_InputCDR &input, @@ -112,11 +110,8 @@ private: // Inherited methods. Should not be here in the first place? //////////////////////////////////////////////////// CORBA::Boolean - write_request_header (const IOP::ServiceContextList& svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + write_request_header (const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); CORBA::Boolean diff --git a/TAO/tao/GIOP_Message_Acceptors.i b/TAO/tao/GIOP_Message_Acceptors.i index 08c7e05836a..d35ea0ef75e 100644 --- a/TAO/tao/GIOP_Message_Acceptors.i +++ b/TAO/tao/GIOP_Message_Acceptors.i @@ -1,5 +1,11 @@ //$Id$ +ACE_INLINE +TAO_GIOP_Message_Acceptors::TAO_GIOP_Message_Acceptors (void) +{ + //no-op +} + ACE_INLINE CORBA::Octet TAO_GIOP_Message_Acceptors::major_version (void) { diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index e41e9447775..48e9db8f176 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -52,7 +52,7 @@ public: // Reads input from the transport virtual CORBA::Boolean - write_message_header (const TAO_Pluggable_Connector_Params ¶ms, + write_message_header (const TAO_Operation_Details &opdetails, TAO_Pluggable_Header_Type header_type, TAO_Target_Specification &spec, TAO_OutputCDR &msg); @@ -119,11 +119,8 @@ private: // of the GIOP classes that are active. virtual CORBA::Boolean - write_request_header (const IOP::ServiceContextList& svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + write_request_header (const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg) = 0; // Write the GIOP request header in to <msg> diff --git a/TAO/tao/GIOP_Message_Connectors.h b/TAO/tao/GIOP_Message_Connectors.h index 74ffac9ddb1..634408aa0cc 100644 --- a/TAO/tao/GIOP_Message_Connectors.h +++ b/TAO/tao/GIOP_Message_Connectors.h @@ -40,11 +40,8 @@ class TAO_Export TAO_GIOP_Message_Connectors: protected: virtual CORBA::Boolean - write_request_header (const IOP::ServiceContextList& svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + write_request_header (const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); // Write the GIOP request header. @@ -86,11 +83,8 @@ public: private: virtual CORBA::Boolean - write_request_header (const IOP::ServiceContextList& svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + write_request_header (const TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); // Write the request header in to <msg> diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 7760f9f2fe9..e9e88c5343a 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -19,7 +19,6 @@ #ifndef _TAO_GIOP_MESSAGE_LITE_H_ #define _TAO_GIOP_MESSAGE_LITE_H_ -#include "tao/GIOP_Message_Base.h" #include "tao/GIOP_Server_Request.h" #include "tao/GIOP_Assorted_Headers.h" @@ -51,7 +50,7 @@ public: // Reads input from the transport layer to the cdr stream in <mesg_state> virtual CORBA::Boolean - write_message_header (const TAO_Pluggable_Connector_Params ¶ms, + write_message_header (const TAO_Operation_Details &opdetails, TAO_Pluggable_Header_Type header_type, TAO_Target_Specification &spec, TAO_OutputCDR &msg); @@ -77,11 +76,8 @@ public: // passed on to the appropriate states. private: CORBA::Boolean - write_request_header (const IOP::ServiceContextList& svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + write_request_header (const TAO_Operation_Details &details, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); // Write the GIOP lite request header in to <msg> diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index 36030c650e2..867a0ccf59c 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -1,5 +1,6 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index af819a9a4d7..665c2b0c910 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -1,8 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - - // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i index bc461ad8c0d..05386c1a335 100644 --- a/TAO/tao/IIOP_Profile.i +++ b/TAO/tao/IIOP_Profile.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + ACE_INLINE const TAO_ObjectKey & TAO_IIOP_Profile::object_key (void) const { diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 39f56f6d9ef..99a3a301cca 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -24,6 +25,7 @@ // BALA Temporrary inclusion #include "tao/GIOP_Utils.h" +#include "tao/operation_details.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -82,12 +84,9 @@ public: int twoway, ACE_Time_Value *max_wait_time); - CORBA::Boolean - send_request_header (const IOP::ServiceContextList &svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); protected: @@ -129,7 +128,7 @@ public: virtual void start_locate (TAO_ORB_Core *orb_core, TAO_Target_Specification &spec, - CORBA::ULong request_id, + TAO_Operation_Details &opdetails, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -144,12 +143,9 @@ public: ACE_Time_Value *max_time_value = 0); virtual int register_handler (void); - CORBA::Boolean - send_request_header (const IOP::ServiceContextList &svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); void messaging_init (TAO_Pluggable_Messaging_Interface *mesg); diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 9d547ecf8bf..80101595c52 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -2,7 +2,6 @@ // // $Id$ - // // ================================================================ // diff --git a/TAO/tao/IOP_Defns.h b/TAO/tao/IOP_Defns.h index 3af5f067519..87b29ce8fa4 100644 --- a/TAO/tao/IOP_Defns.h +++ b/TAO/tao/IOP_Defns.h @@ -13,7 +13,7 @@ // the Interoperability model specified by the CORBA spec. // // = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> +// Taken from the old GIOP.h file. Not sure of the author // ============================================================================ #ifndef _TAO_IOP_DEFN_H_ #define _TAO_IOP_DEFN_H_ diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h index 23555b82629..8867ae07ca4 100644 --- a/TAO/tao/IORC.h +++ b/TAO/tao/IORC.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/IOR_LookupTable.h b/TAO/tao/IOR_LookupTable.h index c9a67f615a9..c58c97269ab 100644 --- a/TAO/tao/IOR_LookupTable.h +++ b/TAO/tao/IOR_LookupTable.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h index 46aa32037ad..3e0209af772 100644 --- a/TAO/tao/InterceptorC.h +++ b/TAO/tao/InterceptorC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h index df603e81089..7814acad567 100644 --- a/TAO/tao/InterfaceC.h +++ b/TAO/tao/InterfaceC.h @@ -3,6 +3,7 @@ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index 8d7a1e1c846..e76d39803fe 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -39,6 +39,7 @@ #include "tao/Any.h" #include "tao/Reply_Dispatcher.h" #include "tao/TAOC.h" +#include "tao/operation_details.h" struct TAO_Exception_Data; class TAO_Profile; @@ -73,6 +74,7 @@ class TAO_Export TAO_GIOP_Invocation public: TAO_GIOP_Invocation (TAO_Stub *data, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core* orb_core); // Constructor. @@ -146,16 +148,15 @@ protected: TAO_Stub *stub_; // The object on which this invocation is going. - const char *opname_; - // Name of the operation being invoked. - - CORBA::ULong request_id_; - // Request ID of this operation. - char buffer [ACE_CDR::DEFAULT_BUFSIZE]; // Buffer used for both the output and input CDR streams, this is // "safe" because we only one of the streams at a time. + TAO_Operation_Details op_details_; + // The relevant operation detail + + TAO_Target_Specification target_spec_; + TAO_OutputCDR out_stream_; // Stream into which the response is placed. @@ -168,10 +169,6 @@ protected: TAO_Profile *profile_; // This invocation is using this transport, may change... - IOP::ServiceContextList service_info_; - // The ServiceContextList sent to the server side. Only valid - // when sending a request. - ACE_Time_Value max_wait_time_value_; ACE_Time_Value *max_wait_time_; // The timeout remaining for this request, it is initialized in @@ -194,6 +191,7 @@ class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation public: TAO_GIOP_Twoway_Invocation (TAO_Stub *data, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core* orb_core); // Constructor. @@ -244,6 +242,7 @@ class TAO_Export TAO_GIOP_Oneway_Invocation : public TAO_GIOP_Invocation public: TAO_GIOP_Oneway_Invocation (TAO_Stub *data, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core* orb_core); // Constructor. diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i index e57ec6fa36e..9cf44948984 100644 --- a/TAO/tao/Invocation.i +++ b/TAO/tao/Invocation.i @@ -1,18 +1,16 @@ // This may look like C, but it's really -*- C++ -*- // // $Id$ -// - ACE_INLINE IOP::ServiceContextList & TAO_GIOP_Invocation::service_info (void) { - return this->service_info_; + return this->op_details_.service_info (); } ACE_INLINE CORBA::ULong TAO_GIOP_Invocation::request_id (void) { - return this->request_id_; + return this->op_details_.request_id (); } ACE_INLINE TAO_OutputCDR & @@ -27,9 +25,10 @@ ACE_INLINE TAO_GIOP_Twoway_Invocation:: TAO_GIOP_Twoway_Invocation (TAO_Stub *stub, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (stub, operation, orb_core), - rd_ (orb_core, this->service_info_) + : TAO_GIOP_Invocation (stub, operation, opname_len, orb_core), + rd_ (orb_core, this->op_details_.service_info ()) { } @@ -53,8 +52,8 @@ ACE_INLINE TAO_GIOP_Locate_Request_Invocation:: TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (stub, 0, orb_core), - rd_ (orb_core, this->service_info_) + : TAO_GIOP_Invocation (stub, 0, 0, orb_core), + rd_ (orb_core, this->op_details_.service_info ()) { } diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 5f496b7b2bf..2c75e012de2 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -1,5 +1,7 @@ + // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index 529ee24e4c0..2e3431777d2 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // **************************************************************** ACE_INLINE diff --git a/TAO/tao/Linear_Priority_Mapping.h b/TAO/tao/Linear_Priority_Mapping.h index 242bc6f27ed..18032442610 100644 --- a/TAO/tao/Linear_Priority_Mapping.h +++ b/TAO/tao/Linear_Priority_Mapping.h @@ -1,5 +1,7 @@ + // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i index 8678acf74b9..f2c2bc2fdc4 100644 --- a/TAO/tao/MessagingC.i +++ b/TAO/tao/MessagingC.i @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index c99da0a5e34..f988054c379 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i index cb169078791..7c2d08ea338 100644 --- a/TAO/tao/MessagingS.i +++ b/TAO/tao/MessagingS.i @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i index 00d92c671cb..fb78d665235 100644 --- a/TAO/tao/MessagingS_T.i +++ b/TAO/tao/MessagingS_T.i @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i index dc9fb6240c0..907a5bd4dec 100644 --- a/TAO/tao/Messaging_Policy_i.i +++ b/TAO/tao/Messaging_Policy_i.i @@ -11,3 +11,4 @@ TAO_Sync_Scope_Policy::synchronization (void) { return this->synchronization_; } + diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index b95a3ad271a..55e3aee76ca 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index f0a8dcceab9..b4ef0128361 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 06bc2a075b3..b850edd8915 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + #include "ace/Dynamic_Service.h" ACE_INLINE ACE_Thread_Manager * diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 960acee3639..be14063a7a9 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h index 145f2e7a45b..832498ffecd 100644 --- a/TAO/tao/Object_Adapter.h +++ b/TAO/tao/Object_Adapter.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i index 1fdd4613a0d..80658bbf819 100644 --- a/TAO/tao/Object_Adapter.i +++ b/TAO/tao/Object_Adapter.i @@ -1,6 +1,7 @@ // $Id$ + ACE_INLINE TAO_POA_Current::TAO_POA_Current (void) { diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index 80992ac85c5..bf48a65db3e 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i index 58f279abb31..2d64e984f8f 100644 --- a/TAO/tao/POA.i +++ b/TAO/tao/POA.i @@ -1,5 +1,6 @@ // $Id$ + // Exception macros #include "tao/poa_macros.h" #include "tao/Environment.h" diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 97a9cc3db09..b96ec311aa8 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -1,4 +1,5 @@ // $Id$ + // // ============================================================================ // diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index 07b043d1b4c..318766a207d 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -1,4 +1,5 @@ // $Id$ + // // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO ORB and the TAO IDL Compiler have been developed by Washington diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h index 2a15d65d946..6193be9c459 100644 --- a/TAO/tao/POAManager.h +++ b/TAO/tao/POAManager.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i index b953dfd69b3..3d2eeb154ba 100644 --- a/TAO/tao/POAManager.i +++ b/TAO/tao/POAManager.i @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Environment.h" ACE_INLINE ACE_Lock & diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index bb23b1fd692..64926f26fa8 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -1,4 +1,5 @@ // $Id$ + // // ============================================================================ // diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i index ba9c7e0c1ff..9806b9d3937 100644 --- a/TAO/tao/POAS.i +++ b/TAO/tao/POAS.i @@ -1,4 +1,5 @@ // $Id$ + // // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO ORB and the TAO IDL Compiler have been developed by Washington diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index 77210f68c8d..25013083e0d 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index 73d2df4c872..f8e0e6bca04 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -47,8 +48,9 @@ class TAO_Reply_Dispatcher; class TAO_Transport_Mux_Strategy; class TAO_Wait_Strategy; -class TAO_Pluggable_Message_Factory; +class TAO_Pluggable_Messaging_Interface; class TAO_Target_Specification; +class TAO_Operation_Details; typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Transport_Buffering_Queue; @@ -126,7 +128,7 @@ public: virtual void start_locate (TAO_ORB_Core *orb_core, TAO_Target_Specification &spec, - CORBA::ULong request_id, + TAO_Operation_Details &opdetails, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) @@ -145,11 +147,8 @@ public: // wait strategy) to take appropiate action. virtual CORBA::Boolean - send_request_header (const IOP::ServiceContextList &svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + send_request_header (TAO_Operation_Details &op_details, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg) = 0; // This is a request for the transport object to write a request // header before it sends out a request @@ -222,6 +221,9 @@ protected: size_t bytes_delivered, int queued_message); + virtual void messaging_init (TAO_Pluggable_Messaging_Interface *mesg) = 0; + // Initialising the messaging object + CORBA::ULong tag_; // IOP protocol tag. diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i index 8a67c8aed7a..5e24cb367e5 100644 --- a/TAO/tao/Pluggable.i +++ b/TAO/tao/Pluggable.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // **************************************************************** ACE_INLINE TAO_ORB_Core * diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index fe85826ca0f..c29f2e736af 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -54,7 +54,7 @@ public: // the CDR through the transport layer virtual CORBA::Boolean - write_message_header (const TAO_Pluggable_Connector_Params ¶ms, + write_message_header (const TAO_Operation_Details &opdetails, TAO_Pluggable_Header_Type header_type, TAO_Target_Specification &spec, TAO_OutputCDR &msg) = 0; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 43cf2b6cc92..f8a322082d8 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -1,7 +1,6 @@ /* -*- C++ -*- */ // $Id$ - // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO ORB and the TAO IDL Compiler have been developed by Washington // University Computer Science's Distributed Object Computing Group. diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 77b39fd9be7..418b6bec652 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index d43444083a2..214fef5a663 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -1,5 +1,6 @@ // $Id$ + ACE_INLINE TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void) : relative_roundtrip_timeout_ (0), diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 3b3808dc808..654cbdd3aa8 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -2,7 +2,6 @@ // // $Id$ - // // ================================================================ // diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index abc0d4c079a..9f465b73b64 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // // $Id$ + // // ================================================================ // diff --git a/TAO/tao/Pool_Per_Endpoint.h b/TAO/tao/Pool_Per_Endpoint.h index 21159984c6d..82ffae971aa 100644 --- a/TAO/tao/Pool_Per_Endpoint.h +++ b/TAO/tao/Pool_Per_Endpoint.h @@ -1,6 +1,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index a861fa4fbb3..ba3b1b5bbd4 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Priority_Mapping.h b/TAO/tao/Priority_Mapping.h index 6aeff91fc4b..dc080daed0f 100644 --- a/TAO/tao/Priority_Mapping.h +++ b/TAO/tao/Priority_Mapping.h @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 7922844532f..70098ccf30c 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index bdbb310b9f6..c803a1dd73f 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/RT_Current.h b/TAO/tao/RT_Current.h index 9ed7a96aca0..1e0b0a01191 100644 --- a/TAO/tao/RT_Current.h +++ b/TAO/tao/RT_Current.h @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 2073deabd74..205b494cf59 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i index ad5b11296ee..2ff4767f0aa 100644 --- a/TAO/tao/Reply_Dispatcher.i +++ b/TAO/tao/Reply_Dispatcher.i @@ -1,5 +1,6 @@ // $Id$ + ACE_INLINE CORBA::ULong TAO_Synch_Reply_Dispatcher::reply_status (void) const { diff --git a/TAO/tao/SHMIOP_Acceptor.h b/TAO/tao/SHMIOP_Acceptor.h index 985b907e804..7a8102796ec 100644 --- a/TAO/tao/SHMIOP_Acceptor.h +++ b/TAO/tao/SHMIOP_Acceptor.h @@ -45,7 +45,7 @@ class TAO_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor // The IIOP-specific bridge class for the concrete acceptor. // public: - TAO_SHMIOP_Acceptor (void); + TAO_SHMIOP_Acceptor (CORBA::Boolean flag = 0); // Constructor. ~TAO_SHMIOP_Acceptor (void); @@ -111,6 +111,9 @@ private: off_t mmap_size_; // Determine the minimum size of mmap file. This dictate the // maximum size of a CORBA method invocation. + + CORBA::Boolean lite_flag_; + // Should we use GIOP lite?? }; #if defined(__ACE_INLINE__) diff --git a/TAO/tao/SHMIOP_Connect.h b/TAO/tao/SHMIOP_Connect.h index b35e958b79d..e6d1186dae4 100644 --- a/TAO/tao/SHMIOP_Connect.h +++ b/TAO/tao/SHMIOP_Connect.h @@ -94,6 +94,9 @@ public: virtual TAO_Transport *transport (void); // Return the transport objects + virtual int init_mesg_protocol (CORBA::Octet major, + CORBA::Octet minor); + // Assigns the right messaging protocol object based on the version protected: int handle_cleanup (void); // This method deregisters the handler from the reactor and closes it. @@ -103,6 +106,9 @@ protected: TAO_ORB_Core *orb_core_; // Cached ORB Core. + + TAO_Pluggable_Messaging_Interface *mesg_factory_; + // The Connector messaging factory }; // **************************************************************** @@ -114,7 +120,8 @@ class TAO_Export TAO_SHMIOP_Server_Connection_Handler : public TAO_SHMIOP_Handle public: TAO_SHMIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0); - TAO_SHMIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core); + TAO_SHMIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core, + CORBA::Boolean flag); ~TAO_SHMIOP_Server_Connection_Handler (void); // Constructor. @@ -163,6 +170,9 @@ protected: TAO_SHMIOP_Server_Transport transport_; // @@ New transport object reference. + TAO_Pluggable_Messaging_Interface *acceptor_factory_; + // Messaging acceptor factory + TAO_ORB_Core *orb_core_; // Cached ORB Core. @@ -171,6 +181,9 @@ protected: u_long refcount_; // Reference count, to avoid early deletes... + + CORBA::Boolean lite_flag_; + // Should we use GIOP or GIOPlite }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/SHMIOP_Connector.h b/TAO/tao/SHMIOP_Connector.h index 2136a874d26..caaf06cdb13 100644 --- a/TAO/tao/SHMIOP_Connector.h +++ b/TAO/tao/SHMIOP_Connector.h @@ -84,7 +84,7 @@ class TAO_Export TAO_SHMIOP_Connector : public TAO_Connector // public: // = Initialization and termination methods. - TAO_SHMIOP_Connector (void); + TAO_SHMIOP_Connector (CORBA::Boolean flag = 0); // Constructor. // = The TAO_Connector methods, please check the documentation on @@ -197,6 +197,8 @@ private: TAO_SHMIOP_BASE_CONNECTOR base_connector_; // The connector initiating connection requests for SHMIOP. + CORBA::Boolean lite_flag_; + // Do we need to use a GIOP_Lite for sending messages? #if defined (TAO_USES_ROBUST_CONNECTION_MGMT) TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_; // Cached connect strategy. diff --git a/TAO/tao/SHMIOP_Profile.h b/TAO/tao/SHMIOP_Profile.h index 9d4ac165bca..11113a001df 100644 --- a/TAO/tao/SHMIOP_Profile.h +++ b/TAO/tao/SHMIOP_Profile.h @@ -31,7 +31,7 @@ #include "tao/Profile.h" #include "tao/ORB.h" #include "tao/Object_KeyC.h" -#include "tao/GIOP.h" +#include "tao/GIOP_Utils.h" #include "ace/Synch.h" #include "ace/MEM_Addr.h" diff --git a/TAO/tao/SHMIOP_Transport.h b/TAO/tao/SHMIOP_Transport.h index 830b7d6c02d..29ceaf57f7e 100644 --- a/TAO/tao/SHMIOP_Transport.h +++ b/TAO/tao/SHMIOP_Transport.h @@ -29,7 +29,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Pluggable.h" -#include "tao/GIOP.h" +#include "tao/GIOP_Utils.h" // Forward decls. class TAO_SHMIOP_Handler_Base; @@ -81,6 +81,10 @@ public: TAO_OutputCDR &stream, int twoway, ACE_Time_Value *max_wait_time); + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetails, + TAO_Target_Specification &spec, + TAO_OutputCDR &msg); protected: TAO_SHMIOP_Handler_Base *handler_; @@ -114,13 +118,14 @@ public: // = The TAO_Transport methods, please check the documentation in // "tao/Pluggable.h" for more details. virtual void start_request (TAO_ORB_Core *orb_core, - const TAO_Profile *profile, + TAO_Target_Specification & /*spec */, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start_locate (TAO_ORB_Core *orb_core, - const TAO_Profile *profile, - CORBA::ULong request_id, + TAO_Target_Specification &spec, + TAO_Operation_Details &opdetails, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -133,9 +138,20 @@ public: ACE_Time_Value *max_time_value = 0); virtual int register_handler (void); + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetails, + TAO_Target_Specification &spec, + TAO_OutputCDR &msg); + + void messaging_init (TAO_Pluggable_Messaging_Interface *mesg); + // Initialising the messaging object private: TAO_SHMIOP_Client_Connection_Handler *client_handler_; // pointer to the corresponding client side connection handler. + + TAO_Pluggable_Messaging_Interface *client_mesg_factory_; + // The message_factor instance specific for this particular + // transport protocol. }; // **************************************************************** @@ -158,6 +174,9 @@ public: ~TAO_SHMIOP_Server_Transport (void); // Default destructor + + void messaging_init (TAO_Pluggable_Messaging_Interface *mesg); + // Initialising the messaging object TAO_SHMIOP_Server_Connection_Handler *server_handler_; // Pointer to the corresponding connection handler. @@ -165,6 +184,9 @@ public: TAO_GIOP_Message_State message_state_; // This keep the state of the current message, to enable // non-blocking reads, fragment reassembly, etc. +private: + TAO_Pluggable_Messaging_Interface *server_mesg_factory_; + // This would be server side messaging protocol }; #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 33edc95bd0e..1842066af14 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index bf1c3f34bd7..67728abc86c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i index 969882d3da2..f82ea3668c4 100644 --- a/TAO/tao/Stub.i +++ b/TAO/tao/Stub.i @@ -2,6 +2,7 @@ // $Id$ + ACE_INLINE TAO_Profile * TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) { diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h index 13fa2ab65fa..3bdd0c427f8 100644 --- a/TAO/tao/Sync_Strategies.h +++ b/TAO/tao/Sync_Strategies.h @@ -2,6 +2,7 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index b6847bf440a..17cadfab63f 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -46,9 +46,6 @@ public: PortableServer::POAManager_ptr poa_manager = 0); // Constructor. - ~TAO_ORB_Manager (void); - // Destructor. - int init (int &argc, char *argv[], CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -81,6 +78,14 @@ public: // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. + int fini (CORBA_Environment &ACE_TRY_ENV); + // Shut down the <ORB_Manager>. + + ~TAO_ORB_Manager (void); + // Destructor. + + // = Accessor methods. + int activate_poa_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Put POA manager into the <Active> state, so that incoming corba @@ -89,7 +94,7 @@ public: // service incoming requests while waiting for a result of CORBA // call on a server. Returns -1 on failure. - char* activate (PortableServer::Servant servant, + char *activate (PortableServer::Servant servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Activate <servant>, using the POA <activate_object> call. Users @@ -101,10 +106,10 @@ public: TAO_default_environment ()); // Deactivate object in RootPOA. - char * activate_under_child_poa (const char *servant_name, - PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + char *activate_under_child_poa (const char *servant_name, + PortableServer::Servant servant, + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); // Precondition: init_child_poa has been called. Activate <servant> // using the POA <activate_object_with_id> created from the string // servant_name. Users should call this to activate objects under diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 3f8b1fdecbf..86564f10224 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index cc0e7b01748..6f8a4620d54 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h index 0485ef30c6c..e4099dd5f00 100644 --- a/TAO/tao/TAOS.h +++ b/TAO/tao/TAOS.h @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h index 75f6ea26068..1a76064509e 100644 --- a/TAO/tao/Tagged_Components.h +++ b/TAO/tao/Tagged_Components.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i index da5b23331ba..63978735314 100644 --- a/TAO/tao/Tagged_Components.i +++ b/TAO/tao/Tagged_Components.i @@ -1,5 +1,6 @@ // $Id$ + ACE_INLINE TAO_Tagged_Components::TAO_Tagged_Components (void) : orb_type_ (0), diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index fb940cf5861..c05e300be1a 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -2,7 +2,6 @@ // // $Id$ - // // ================================================================ // diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 1bb7b57fe49..c3a1c73f10a 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 8872251d8af..2dd47a85350 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -30,6 +30,7 @@ // Forward decl. class TAO_InputCDR; +class TAO_OutputCDR; // A TypeCode describes data. This one's as thin a wrapper around CDR // octet sequences as is practical. There are guesses here about how @@ -283,7 +284,7 @@ private: CORBA::Boolean equiv_only, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; - // equal() and equivalent() must both recurse, but their + // equal() and equivalent() must both recurse, but their // behavior is somewhat different (as defined in CORBA 2.3). // This function allows us to reuse the same code by acting // as the point of recursion and by adding the equiv_only @@ -581,6 +582,12 @@ public: }; +// These operators are too complex to be inline.... +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr, + const CORBA::TypeCode *x); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr, + CORBA::TypeCode *&x); + #if defined (__ACE_INLINE__) # include "tao/Typecode.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h index 0e9afc08d78..7a3f9893f0f 100644 --- a/TAO/tao/UIOP_Acceptor.h +++ b/TAO/tao/UIOP_Acceptor.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h index bedb8e17447..ca93293230e 100644 --- a/TAO/tao/UIOP_Connect.h +++ b/TAO/tao/UIOP_Connect.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/UIOP_Connect.i b/TAO/tao/UIOP_Connect.i index a609f80ae7c..faedd405292 100644 --- a/TAO/tao/UIOP_Connect.i +++ b/TAO/tao/UIOP_Connect.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + #if TAO_HAS_UIOP == 1 ACE_INLINE TAO_Transport * diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h index c910a3ec723..e4d8afc7b72 100644 --- a/TAO/tao/UIOP_Connector.h +++ b/TAO/tao/UIOP_Connector.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h index 967f70b38ad..28f1afea5ff 100644 --- a/TAO/tao/UIOP_Factory.h +++ b/TAO/tao/UIOP_Factory.h @@ -1,5 +1,6 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h index 9a4c1749a5a..dc558260865 100644 --- a/TAO/tao/UIOP_Profile.h +++ b/TAO/tao/UIOP_Profile.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i index 04e3cb9859c..da2ae3e7f75 100644 --- a/TAO/tao/UIOP_Profile.i +++ b/TAO/tao/UIOP_Profile.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + # if TAO_HAS_UIOP == 1 ACE_INLINE const TAO_ObjectKey & diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h index f9b6cc66112..f15710ed7be 100644 --- a/TAO/tao/UIOP_Transport.h +++ b/TAO/tao/UIOP_Transport.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -23,7 +24,7 @@ #include "tao/Pluggable.h" -// BALA Temporrary inclusion + //#include "tao/Pluggable_Messaging.h" #include "tao/GIOP_Utils.h" //#include "tao/target_identifier.h" @@ -88,23 +89,16 @@ public: ACE_Time_Value *max_wait_time); - CORBA::Boolean - send_request_header (const IOP::ServiceContextList &svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); - protected: TAO_UIOP_Handler_Base *handler_; // the connection service handler used for accessing lower layer // communication protocols. - TAO_Pluggable_Message_Factory *giop_factory_; - // The message_factor instance specific for this particular - // transport protocol. }; class TAO_Export TAO_UIOP_Client_Transport : public TAO_UIOP_Transport @@ -140,7 +134,7 @@ public: virtual void start_locate (TAO_ORB_Core *orb_core, TAO_Target_Specification &spec, - CORBA::ULong request_id, + TAO_Operation_Details &opdetails, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -156,12 +150,9 @@ public: // Register the handler with the reactor. This will be called by the // Wait Strategy if Reactor is used for that strategy. - CORBA::Boolean - send_request_header (const IOP::ServiceContextList &svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, + virtual CORBA::Boolean + send_request_header (TAO_Operation_Details &opdetail, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR &msg); void messaging_init (TAO_Pluggable_Messaging_Interface *mesg); diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 6eab39df02c..0f7bc003b47 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -1,7 +1,9 @@ // $Id$ + // This is an automatically generated file. #define TAO_MAJOR_VERSION 1 #define TAO_MINOR_VERSION 0 -#define TAO_BETA_VERSION 13 -#define TAO_VERSION "1.0.13" +#define TAO_BETA_VERSION 14 +#define TAO_VERSION "1.0.14" + diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index b0af49a5afa..11ef1dea513 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -1702,7 +1703,7 @@ TAO_NAMESPACE_CLOSE // end of class (namespace) CORBA // @@ The values below are suggestions for some of the protocols // we have thought of, subject to change at any point // #define TAO_TAG_AIOP_PROFILE 0x54414f01U /* ATM/AAL5 */ -// #define TAO_TAG_SHMEM_PROFILE 0x54414f02U /* Shared memory */ +#define TAO_TAG_SHMEM_PROFILE 0x54414f02U /* Shared memory */ // #define TAO_TAG_MSGQ_PROFILE 0x54414f03U /* Message Queue */ // #define TAO_TAG_UDP_PROFILE 0x54414f04U /* UDP */ // #define TAO_TAG_MCAST_PROFILE 0x54414f05U /* IP/Multicast */ diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h new file mode 100644 index 00000000000..64ffba59d3a --- /dev/null +++ b/TAO/tao/operation_details.h @@ -0,0 +1,87 @@ +// This may look like C, but it's really -*- C++ -*- +// $Id$ +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// operation_details.h +// +// = AUTHOR +// Bala Natarajan <bala@cs.wustl.edu> +// ============================================================================ + +#ifndef TAO_OPERATION_DETAILS_H +#define TAO_OPERATION_DETAILS_H + +#include "tao/corbafwd.h" +#include "tao/IOPC.h" + +class TAO_Operation_Details +{ + // = TITLE + // Class with operation details + // + // = DESCRIPTION + // This class stores some of the "operation" details that would be + // required by the invocation classes. this class is in its + // infancy now but I expect this one to grow as we come with + // different varieties of use cases. +public: + TAO_Operation_Details (const char *name, + CORBA::ULong len); + //Ctor + + const char* opname (void) const; + // Operation name + + CORBA::ULong opname_len (void) const; + // Length of the operation name + + void response_flags (CORBA::Octet flags); + // Set the response flags + + CORBA::Octet response_flags (void); + CORBA::Octet response_flags (void) const; + // Get the response flags + + IOP::ServiceContextList &service_info (void); + const IOP::ServiceContextList &service_info (void) const; + // Get the service context list + + void request_id (CORBA::ULong id); + + CORBA::ULong request_id (void); + CORBA::ULong request_id (void) const; + // Get and set for request id + +private: + const char *opname_; + // Name of the operation being invoked. + + CORBA::ULong opname_len_; + // Precalculated length of opname_. + + CORBA::ULong request_id_; + // Request ID of this operation. + + CORBA::Octet response_flags_; + // Response flags + + IOP::ServiceContextList service_info_; + // The ServiceContextList sent to the server side. Only valid + // when sending a request. + + // The first element of header is service context list; + // transactional context would be acquired here using the + // transaction service APIs. Other kinds of context are as yet + // undefined. + // +}; + +#if defined (__ACE_INLINE__) +# include "tao/operation_details.i" +#endif /* __ACE_INLINE__ */ + +#endif /*TAO_OPERATION_DETAILS_H*/ diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i new file mode 100644 index 00000000000..8e0dbe46c8a --- /dev/null +++ b/TAO/tao/operation_details.i @@ -0,0 +1,72 @@ +//$Id$ +// -*- C++ -*- +ACE_INLINE +TAO_Operation_Details::TAO_Operation_Details (const char *name, + CORBA::ULong len) + :opname_ (name), + opname_len_ (len), + request_id_ (0), + response_flags_ (0) +{ + //no-op +} + +ACE_INLINE const char* +TAO_Operation_Details::opname (void) const +{ + return this->opname_; +} + +ACE_INLINE CORBA::ULong +TAO_Operation_Details::opname_len (void) const +{ + return this->opname_len_; +} + +ACE_INLINE IOP::ServiceContextList & +TAO_Operation_Details::service_info (void) +{ + return this->service_info_; +} + +ACE_INLINE const IOP::ServiceContextList & +TAO_Operation_Details::service_info (void) const +{ + return this->service_info_; +} + +ACE_INLINE void +TAO_Operation_Details::request_id (CORBA::ULong id) +{ + this->request_id_ = id; +} + +ACE_INLINE CORBA::ULong +TAO_Operation_Details::request_id (void) +{ + return this->request_id_; +} + +ACE_INLINE CORBA::ULong +TAO_Operation_Details::request_id (void) const +{ + return this->request_id_; +} + +ACE_INLINE void +TAO_Operation_Details::response_flags (CORBA::Octet flags) +{ + this->response_flags_ = flags; +} + +ACE_INLINE CORBA::Octet +TAO_Operation_Details::response_flags (void) +{ + return this->response_flags_; +} + +ACE_INLINE CORBA::Octet +TAO_Operation_Details::response_flags (void) const +{ + return this->response_flags_; +} diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index e4731cc1bc7..14b475e8505 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // @ (#) $Id$ + // ============================================================================ // // = LIBRARY @@ -379,6 +380,10 @@ enum MCAST_SERVICEID # endif /* TAO_HAS_MINIMUM_CORBA */ #endif /* !TAO_HAS_UIOP */ +#if !defined (TAO_HAS_SHMIOP) +# define TAO_HAS_SHMIOP 1 +#endif /* TAO_HAS_SHMIOP */ + // RT_CORBA support is enabled by default if TAO is not configured for // minimum CORBA. If TAO is configured for minimum CORBA, then // RT_CORBA will be disabled by default. @@ -522,6 +527,7 @@ enum MCAST_SERVICEID # endif /* TAO_HAS_MINIMUM_CORBA */ #endif /* !TAO_HAS_REMOTE_POLICIES */ + // TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro and // should not be set by the user. #if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) diff --git a/TAO/tao/params.h b/TAO/tao/params.h index aa1821ae967..0805c8a1272 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/params.i b/TAO/tao/params.i index 539949e29c6..3b01e2327a0 100644 --- a/TAO/tao/params.i +++ b/TAO/tao/params.i @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + ACE_INLINE TAO_EndpointSet & TAO_ORB_Parameters::preconnects (void) { diff --git a/TAO/tao/rtcorbafwd.h b/TAO/tao/rtcorbafwd.h index 8475baddb89..3bcd948a7a4 100644 --- a/TAO/tao/rtcorbafwd.h +++ b/TAO/tao/rtcorbafwd.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/target_identifier.i b/TAO/tao/target_identifier.i index 1358b474db2..7f2df830f88 100644 --- a/TAO/tao/target_identifier.i +++ b/TAO/tao/target_identifier.i @@ -1,6 +1,14 @@ //$Id$ +ACE_INLINE +TAO_Target_Specification::TAO_Target_Specification (void) + :specifier_ (TAO_Target_Specification::Key_Addr), + profile_index_ (0) +{ + //no-op +} + ACE_INLINE void TAO_Target_Specification::target_specifier (const TAO_ObjectKey &key) { |