diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-02-27 22:35:41 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-02-27 22:35:41 +0000 |
| commit | f4a99d738496a33ed8ab3669d42ac293fda0e8e9 (patch) | |
| tree | 9ad8e842b198ecbdf20e166a69f459e6418cd076 | |
| parent | 8f9cf818c22c1a1be19d675f89b67bed943340b1 (diff) | |
| download | ATCD-f4a99d738496a33ed8ab3669d42ac293fda0e8e9.tar.gz | |
rking with SUNCC5.0
101 files changed, 1008 insertions, 443 deletions
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index cf316bd0ed8..f93c09e9957 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -17,6 +17,7 @@ ACE_RCSID(tao, Acceptor_Registry, "$Id$") + TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) : acceptors_ (0), size_ (0) diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp index 11ffc32b64f..f36fd39819f 100644 --- a/TAO/tao/Active_Object_Map.cpp +++ b/TAO/tao/Active_Object_Map.cpp @@ -10,6 +10,7 @@ ACE_RCSID(tao, Active_Object_Map, "$Id$") + TAO_Active_Object_Map::Map_Entry::Map_Entry (void) : user_id_ (), system_id_ (), diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 9f8eeb5c8fa..ae3374215c1 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -1,5 +1,6 @@ // $Id$ + // Portions of this file are: // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved @@ -18,6 +19,7 @@ ACE_RCSID(tao, Any, "$Id$") + CORBA::TypeCode_ptr CORBA_Any::type (void) const { @@ -101,7 +103,8 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc, // Retrieve the start of the message block chain and save it. this->byte_order_ = TAO_ENCAP_BYTE_ORDER; - this->cdr_ = stream.begin ()->clone (); + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, stream.begin ()); } } ACE_CATCHANY @@ -120,9 +123,10 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr type, : type_ (CORBA::TypeCode::_duplicate (type)), value_ (0), byte_order_ (byte_order), - cdr_ (ACE_Message_Block::duplicate (mb)), any_owns_data_ (0) { + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, mb); } // Copy constructor for "Any". @@ -141,7 +145,8 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src) // CDR stream always contains encoded object, if any holds anything // at all. this->byte_order_ = src.byte_order_; - this->cdr_ = ACE_Message_Block::duplicate (src.cdr_); + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, src.cdr_); // No need to copy src's value_. We can always get that from cdr. } @@ -191,7 +196,8 @@ CORBA_Any::operator= (const CORBA_Any &src) this->any_owns_data_ = 0; this->byte_order_ = src.byte_order_; - this->cdr_ = ACE_Message_Block::duplicate (src.cdr_); + ACE_NEW_RETURN (this->cdr_, ACE_Message_Block, *this); + ACE_CDR::consolidate (this->cdr_, src.cdr_); // Simply duplicate the cdr string here. We can save the decode // operation if there's no need to extract the object. } @@ -276,7 +282,8 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc, // Retrieve the start of the message block chain and duplicate it. this->byte_order_ = TAO_ENCAP_BYTE_ORDER; - this->cdr_ = ACE_Message_Block::duplicate (stream.begin ()); + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, stream.begin ()); } } @@ -304,7 +311,8 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc, this->any_owns_data_ = 0; this->byte_order_ = byte_order; - this->cdr_ = ACE_Message_Block::duplicate (mb); + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, mb); // We can save the decode operation if there's no need to extract // the object. } @@ -337,7 +345,8 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc, this->any_owns_data_ = any_owns_data; this->byte_order_ = byte_order; - this->cdr_ = ACE_Message_Block::duplicate (mb); + ACE_NEW (this->cdr_, ACE_Message_Block); + ACE_CDR::consolidate (this->cdr_, mb); // We can save the decode operation if there's no need to extract // the object. } @@ -2061,7 +2070,8 @@ CORBA_Any::operator>>= (to_object obj) const { // Any interface is allowed CORBA::Boolean result = - (this->type_->kind () == CORBA::tk_objref); + (this->type_->kind (ACE_TRY_ENV) == CORBA::tk_objref); + ACE_TRY_CHECK; if (result) { diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index 8e182fff3e6..0294b1fd740 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Asynch_Invocation.h" #include "tao/Timeprobe.h" @@ -16,6 +17,7 @@ ACE_RCSID(tao, Asynch_Invocation, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Asynch_Invocation_Timeprobe_Description[] = @@ -151,7 +153,7 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // heap allocated reply dispatcher. int retval = - this->transport_->tms ()->bind_dispatcher (this->request_id_, + this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (), this->rd_); if (retval == -1) { diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 3755ec6ffe6..7d2a41a04c2 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -1,5 +1,6 @@ // $Id$ + // Portions of this file are: // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved @@ -43,6 +44,7 @@ ACE_RCSID(tao, CDR, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_CDR_Timeprobe_Description[] = diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp index 2927990f6fa..a6772003aa2 100644 --- a/TAO/tao/CDR_Interpreter.cpp +++ b/TAO/tao/CDR_Interpreter.cpp @@ -1,5 +1,6 @@ // $Id$ + // @(#)interp.cpp 1.4 95/11/04 // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved @@ -18,6 +19,7 @@ ACE_RCSID(tao, CDR_Interpreter, "$Id$") + TAO_CDR_Interpreter::Table_Element TAO_CDR_Interpreter::table_[CORBA::TC_KIND_COUNT] = { diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index a20f0f0c2e9..7a5b9339088 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -1,5 +1,6 @@ // // $Id$ + // // ================================================================ // diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp index a0ce82e96fc..0335fb57e5f 100644 --- a/TAO/tao/Client_Priority_Policy.cpp +++ b/TAO/tao/Client_Priority_Policy.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Client_Priority_Policy.h" #if ! defined (__ACE_INLINE__) @@ -8,8 +9,10 @@ #if (TAO_HAS_CORBA_MESSAGING == 1) + ACE_RCSID(TAO, Client_Priority_Policy, "$Id$") + TAO_Client_Priority_Policy::TAO_Client_Priority_Policy ( PortableServer::POA_ptr poa, const TAO::PrioritySpecification &priority_spec) diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index e7d990be362..44a01383ad1 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -1,13 +1,13 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - #include "tao/ORB_Core.h" #include "tao/Connector_Registry.h" #include "tao/Profile.h" #include "tao/Environment.h" #include "tao/debug.h" + #if !defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 009f75238ff..987ab94ed7a 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -1,5 +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. @@ -21,6 +22,7 @@ ACE_RCSID(tao, CurrentC, "$Id$") + CORBA_Current_ptr CORBA_Current::_duplicate (CORBA_Current_ptr obj) { if (!CORBA::is_nil (obj)) diff --git a/TAO/tao/Direct_Priority_Mapping.cpp b/TAO/tao/Direct_Priority_Mapping.cpp index 15f654ead3d..648c86bdae0 100644 --- a/TAO/tao/Direct_Priority_Mapping.cpp +++ b/TAO/tao/Direct_Priority_Mapping.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/orbconf.h" #if (TAO_HAS_RT_CORBA == 1) @@ -12,8 +13,10 @@ # include "tao/Direct_Priority_Mapping.i" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID(tao, Direct_Priority_Mapping, "$Id$") + TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (int policy) : policy_ (policy) { diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 5082b2d43b6..a44fef530c2 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // // And later modified by Jeff Parsons @@ -107,6 +108,7 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "get_domain_policy", + 17, istub->orb_core () ); @@ -242,6 +244,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "make_domain_manager", + 19, istub->orb_core () ); diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp index b1ab2782837..b4165cd23ed 100644 --- a/TAO/tao/DomainS.cpp +++ b/TAO/tao/DomainS.cpp @@ -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/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp index a2c7db9d9e5..c66fed58742 100644 --- a/TAO/tao/DynArray_i.cpp +++ b/TAO/tao/DynArray_i.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ==================================================================== // // = LIBRARY diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp index 927314ffb1d..b9fa1fd4e15 100644 --- a/TAO/tao/DynEnum_i.cpp +++ b/TAO/tao/DynEnum_i.cpp @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // =================================================================== // // = LIBRARY diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp index 318ba8a45ad..73ef52be568 100644 --- a/TAO/tao/DynStruct_i.cpp +++ b/TAO/tao/DynStruct_i.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ==================================================================== // // = LIBRARY diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index 35021bfccc5..f36cf58f7ee 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + #include "tao/DynAny_i.h" #if !defined (TAO_HAS_MINIMUM_CORBA) diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index cbc6fb8facf..a51befe971c 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -10,6 +10,7 @@ ACE_RCSID(tao, Environment, "$Id$") + #if 0 CORBA_Environment::CORBA_Environment (void) : exception_ (0), diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 6971e535edc..8240d84b170 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,5 +1,6 @@ // $Id$ + // THREADING NOTE: calling thread handles mutual exclusion policy // on all of these data structures. diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index f4ed08e58b8..ec1fd30d353 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ================================================================ // // = LIBRARY @@ -69,7 +70,7 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] = 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind @@ -305,7 +306,7 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind @@ -389,7 +390,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo else { ACE_NEW_RETURN (_tao_elem, GIOP::IORAddressingInfo, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (GIOP::_tc_IORAddressingInfo, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -406,7 +408,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo ACE_CATCHANY { delete _tao_elem; - return 0; + return 0; } ACE_ENDTRY; return 0; @@ -482,7 +484,8 @@ CORBA::Boolean operator>>= ( else { ACE_NEW_RETURN (_tao_elem, GIOP::TargetAddress, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); stream >> *_tao_elem; ((CORBA::Any *)&_tao_any)->_tao_replace ( GIOP::_tc_TargetAddress, @@ -491,7 +494,7 @@ CORBA::Boolean operator>>= ( ACE_TRY_ENV ); ACE_TRY_CHECK; - + return 1; } } @@ -503,5 +506,3 @@ CORBA::Boolean operator>>= ( return 0; } - - diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp index d379cd6e184..07c45f6b49c 100644 --- a/TAO/tao/GIOP_Message_Acceptors.cpp +++ b/TAO/tao/GIOP_Message_Acceptors.cpp @@ -4,6 +4,9 @@ #include "tao/debug.h" #include "tao/POA.h" +#if !defined (__ACE_INLINE__) +# include "tao/GIOP_Message_Acceptors.i" +#endif /* __ACE_INLINE__ */ int TAO_GIOP_Message_Acceptors:: @@ -678,12 +681,9 @@ set_state (CORBA::Octet def_major, CORBA::Boolean TAO_GIOP_Message_Acceptors:: - write_request_header (const IOP::ServiceContextList& /*svc_ctx*/, - CORBA::ULong /*request_id */, - CORBA::Octet /*response_flags*/, - TAO_Target_Specification & /*spec*/, - const char* /*opname*/, - TAO_OutputCDR & /*msg*/) +write_request_header (const TAO_Operation_Details & /**/, + TAO_Target_Specification & /*spec*/, + TAO_OutputCDR & /*msg*/) { ACE_NOTSUP_RETURN (0); } @@ -700,8 +700,8 @@ TAO_GIOP_Message_Acceptors:: int TAO_GIOP_Message_Acceptors:: parse_reply (TAO_Message_State_Factory & /*mesg_state*/, - TAO_Pluggable_Connector_Params & /*params*/, - CORBA::ULong & /*reply_status*/) + TAO_Pluggable_Connector_Params & /*params*/, + CORBA::ULong & /*reply_status*/) { ACE_NOTSUP_RETURN (-1); } diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 9acbfaa0b10..8e40994f0dc 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1,7 +1,8 @@ //$Id$ #include "tao/GIOP_Message_Base.h" -#include "debug.h" +#include "tao/debug.h" +#include "tao/operation_details.h" @@ -92,7 +93,7 @@ TAO_GIOP_Message_Base:: CORBA::Boolean TAO_GIOP_Message_Base:: - 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 &cdr) @@ -100,15 +101,12 @@ TAO_GIOP_Message_Base:: switch (header_type) { case TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER: - return this->write_request_header (params.svc_ctx, - params.request_id, - params.response_flags, + return this->write_request_header (opdetails, spec, - params.operation_name, cdr); break; case TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER: - return this->write_locate_request_header (params.request_id, + return this->write_locate_request_header (opdetails.request_id (), spec, cdr); break; @@ -437,7 +435,6 @@ TAO_GIOP_Message_Base::parse_header (TAO_GIOP_Message_State *state) state->cdr.skip_bytes (this->message_size_offset ()); state->cdr.read_ulong (state->message_size); - cout << "Message size "<< state->message_size <<endl; if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/GIOP_Message_Connectors.cpp b/TAO/tao/GIOP_Message_Connectors.cpp index e564350809b..d9a9a28d72d 100644 --- a/TAO/tao/GIOP_Message_Connectors.cpp +++ b/TAO/tao/GIOP_Message_Connectors.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "tao/Principal.h" #include "tao/TAOC.h" +#include "tao/operation_details.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Connectors.i" @@ -11,11 +12,8 @@ CORBA::Boolean TAO_GIOP_Message_Connectors:: - 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) { // Adding only stuff that are common to all versions of GIOP. @@ -24,7 +22,9 @@ TAO_GIOP_Message_Connectors:: // anyway. // First the request id - msg << request_id; + msg << opdetails.request_id (); + + const CORBA::Octet response_flags = opdetails.response_flags (); // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented. if (response_flags == 131) @@ -127,23 +127,17 @@ process_connector_messages (TAO_Transport * /*transport*/, CORBA::Boolean TAO_GIOP_Message_Connector_11:: - 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) { // This is sepecific to GIOP 1.1. So put them here - msg << svc_ctx; + msg << opdetails.service_info (); // Let us call our parent class to check what he can do for // us. - TAO_GIOP_Message_Connectors::write_request_header (svc_ctx, - request_id, - response_flags, + TAO_GIOP_Message_Connectors::write_request_header (opdetails, spec, - opname, msg); // In this case we cannot recognise anything other than the Object @@ -163,9 +157,15 @@ TAO_GIOP_Message_Connector_11:: return 0; } - msg << opname; - - // The principal is not used. So send a null pointer + msg.write_string (opdetails.opname_len (), + opdetails.opname ()); + + // Last element of request header is the principal; no portable way + // to get it, we just pass empty principal (convention: indicates + // "anybody"). Steps upward in security include passing an + // unverified user ID, and then verifying the message (i.e. a dummy + // service context entry is set up to hold a digital signature for + // this message, then patched shortly before it's sent). static CORBA::Principal_ptr principal = 0; msg << principal; diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index de8277f4169..9b78f1755c1 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -179,7 +179,7 @@ TAO_GIOP_Message_Lite:: CORBA::Boolean TAO_GIOP_Message_Lite:: - 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 &cdr) @@ -187,15 +187,12 @@ TAO_GIOP_Message_Lite:: switch (header_type) { case TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER: - return this->write_request_header (params.svc_ctx, - params.request_id, - params.response_flags, + return this->write_request_header (opdetails, spec, - params.operation_name, cdr); break; case TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER: - return this->write_locate_request_header (params.request_id, + return this->write_locate_request_header (opdetails.request_id (), spec, cdr); break; @@ -214,9 +211,9 @@ int TAO_GIOP_Message_Lite:: send_message (TAO_Transport *transport, TAO_OutputCDR &stream, - ACE_Time_Value *max_wait_time = 0, - TAO_Stub *stub = 0, - int two_way = 1) + ACE_Time_Value *max_wait_time, + TAO_Stub *stub, + int two_way) { // Get the header length const size_t header_len = TAO_GIOP_LITE_HEADER_LEN; @@ -398,14 +395,13 @@ TAO_GIOP_Message_Lite:: CORBA::Boolean TAO_GIOP_Message_Lite:: - 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 &out_stream) { - out_stream << request_id; + out_stream << opdetails.request_id (); + + const CORBA::Octet response_flags = opdetails.response_flags (); // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented. if (response_flags == 131) @@ -451,7 +447,8 @@ TAO_GIOP_Message_Lite:: return 0; } - out_stream << opname; + out_stream.write_string (opdetails.opname_len (), + opdetails.opname ()); return 1; } @@ -1233,8 +1230,6 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, if (slot < sizeof (names)/sizeof(names[0])) message_name = names [slot]; - ACE_DEBUG ((LM_DEBUG, - "(%N|%l) \n")); // Byte order. int byte_order = TAO_ENCAP_BYTE_ORDER; @@ -1245,14 +1240,10 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, if (ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST || ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY) { - ACE_DEBUG ((LM_DEBUG, - "(%N|%l) \n")); // @@ Only works if ServiceContextList is empty.... id = ACE_reinterpret_cast (CORBA::ULong *, (char * ) (ptr)); - ACE_DEBUG ((LM_DEBUG, - "(%N|%l) \n")); } // Print. diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp index 871e17793c5..4f54afdd2bb 100644 --- a/TAO/tao/GIOP_Server_Request.cpp +++ b/TAO/tao/GIOP_Server_Request.cpp @@ -1,5 +1,6 @@ // $Id$ + // Implementation of the Dynamic Server Skeleton Interface (for GIOP) #include "tao/GIOP_Server_Request.h" @@ -22,6 +23,7 @@ ACE_RCSID(tao, GIOP_Server_Request, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Server_Request_Timeprobe_Description[] = @@ -72,7 +74,6 @@ TAO_GIOP_ServerRequest:: requesting_principal_ (0) { ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START); - // parse_error = this->parse_header (); } @@ -264,7 +265,8 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV) } else { - TAO_InputCDR cdr (retval_->_tao_get_cdr ()); + TAO_InputCDR cdr (this->retval_->_tao_get_cdr (), + this->retval_->_tao_byte_order ()); (void) this->outgoing_->append (tc.in (), &cdr, ACE_TRY_ENV); ACE_CHECK; @@ -530,8 +532,8 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) if ((*this->outgoing_ << object_ptr) == 0) { ACE_DEBUG ((LM_DEBUG, - "TAO_GIOP_ServerRequest::marshal - " - "encoding forwarded objref failed\n")); + ASYS_TEXT ("TAO_GIOP_ServerRequest::marshal - ") + ASYS_TEXT ("encoding forwarded objref failed\n"))); return; } } @@ -554,7 +556,8 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) this->outgoing_->write_ulong (this->exception_type_); // we use the any's ACE_Message_Block - TAO_InputCDR cdr (this->exception_->_tao_get_cdr ()); + TAO_InputCDR cdr (this->exception_->_tao_get_cdr (), + this->exception_->_tao_byte_order ()); (void) this->outgoing_->append (except_tc, &cdr, ACE_TRY_ENV); } } @@ -598,8 +601,8 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (TAO_Transport *transport) // No exception but some kind of error, yet a response // is required. ACE_ERROR ((LM_ERROR, - "TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n", - "TAO_GIOP_ServerRequest::send_no_exception_reply")); + ASYS_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"), + ASYS_TEXT ("TAO_GIOP_ServerRequest::send_no_exception_reply"))); } } } diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index c858f5a205c..3388e8948ce 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -2,6 +2,7 @@ // $Id$ + #include "tao/IIOP_Acceptor.h" #include "tao/IIOP_Profile.h" #include "tao/MProfile.h" @@ -16,7 +17,6 @@ ACE_RCSID(tao, IIOP_Acceptor, "$Id$") - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Acceptor<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>; diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index b01ff054a58..4e851a1daaa 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/IIOP_Connect.h" #include "tao/Timeprobe.h" #include "tao/debug.h" @@ -12,12 +13,14 @@ #include "tao/GIOP_Message_Acceptors.h" #include "tao/GIOP_Message_Connectors.h" + #if !defined (__ACE_INLINE__) # include "tao/IIOP_Connect.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(tao, IIOP_Connect, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_IIOP_Connect_Timeprobe_Description[] = @@ -69,6 +72,7 @@ TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t) TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_Handler_Base (t), transport_ (this, 0), + acceptor_factory_ (0), orb_core_ (0), tss_resources_ (0), refcount_ (1), @@ -86,6 +90,7 @@ TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_ CORBA::Boolean flag) : TAO_IIOP_Handler_Base (orb_core), transport_ (this, orb_core), + acceptor_factory_ (0), orb_core_ (orb_core), tss_resources_ (orb_core->get_tss_resources ()), refcount_ (1), diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 4e3f8b5d170..812997da88e 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -1,7 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - #include "tao/IIOP_Connector.h" #include "tao/IIOP_Profile.h" #include "tao/debug.h" @@ -10,8 +9,8 @@ #include "tao/Environment.h" #include "ace/Auto_Ptr.h" -ACE_RCSID(tao, IIOP_Connector, "$Id$") +ACE_RCSID(tao, IIOP_Connector, "$Id$") #if defined (TAO_USES_ROBUST_CONNECTION_MGMT) @@ -457,25 +456,40 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile, if (iiop_profile == 0) return -1; - const ACE_INET_Addr &oa = + const ACE_INET_Addr &remote_address = iiop_profile->object_addr (); - ACE_Synch_Options synch_options; + TAO_IIOP_Client_Connection_Handler *svc_handler = 0; + int result = 0; + if (max_wait_time != 0) - synch_options.set (ACE_Synch_Options::USE_TIMEOUT, - *max_wait_time); - - TAO_IIOP_Client_Connection_Handler* result; - - // The connect call will set the hint () stored in the Profile - // object; but we obtain the transport in the <result> - // variable. Other threads may modify the hint, but we are not - // affected. - if (this->base_connector_.connect (iiop_profile->hint (), - result, - oa, - synch_options) == -1) - { // Give users a clue to the problem. + { + ACE_Synch_Options synch_options (ACE_Synch_Options::USE_TIMEOUT, + *max_wait_time); + + // The connect call will set the hint () stored in the Profile + // object; but we obtain the transport in the <svc_handler> + // variable. Other threads may modify the hint, but we are not + // affected. + result = this->base_connector_.connect (iiop_profile->hint (), + svc_handler, + remote_address, + synch_options); + } + else + { + // The connect call will set the hint () stored in the Profile + // object; but we obtain the transport in the <svc_handler> + // variable. Other threads may modify the hint, but we are not + // affected. + result = this->base_connector_.connect (iiop_profile->hint (), + svc_handler, + remote_address); + } + + if (result == -1) + { + // Give users a clue to the problem. if (TAO_orbdebug) { char buffer [MAXNAMELEN * 2]; @@ -492,20 +506,21 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile, return -1; } - transport = result->transport (); + transport = svc_handler->transport (); + int ret_val = 0; if (lite_flag_) { - ret_val = result->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR, - TAO_DEF_GIOP_LITE_MINOR); + ret_val = svc_handler->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR, + TAO_DEF_GIOP_LITE_MINOR); } else { // Now that we have the client connection handler object we need to // set the right messaging protocol for the connection handler. const TAO_GIOP_Version& version = iiop_profile->version (); - ret_val = result->init_mesg_protocol (version.major, - version.minor); + ret_val = svc_handler->init_mesg_protocol (version.major, + version.minor); } if (ret_val == -1) diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 0f14c993bc9..12e22867cfe 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -1,10 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ - - - - #include "tao/IIOP_Profile.h" #include "tao/IIOP_Connect.h" #include "tao/CDR.h" @@ -16,7 +12,6 @@ ACE_RCSID(tao, IIOP_Profile, "$Id$") - #if !defined (__ACE_INLINE__) # include "tao/IIOP_Profile.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 56208e237c6..7aeba526bf5 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -2,6 +2,7 @@ // $Id$ + #include "tao/IIOP_Transport.h" #include "tao/IIOP_Connect.h" #include "tao/IIOP_Profile.h" @@ -13,6 +14,7 @@ #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/debug.h" +//#include "tao/target_identifier.h" #include "tao/Pluggable_Messaging.h" @@ -175,7 +177,7 @@ TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, void TAO_IIOP_Client_Transport::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) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -187,9 +189,7 @@ TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core */*orb_core*/, output) == 0) ACE_THROW (CORBA::MARSHAL ()); - TAO_Pluggable_Connector_Params params; - params.request_id = request_id; - if (this->client_mesg_factory_->write_message_header (params, + if (this->client_mesg_factory_->write_message_header (opdetails, TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, spec, output) == 0) @@ -327,22 +327,14 @@ TAO_IIOP_Client_Transport::messaging_init (TAO_Pluggable_Messaging_Interface *me } CORBA::Boolean -TAO_IIOP_Client_Transport::send_request_header (const IOP::ServiceContextList & svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, +TAO_IIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR & msg) { - TAO_Pluggable_Connector_Params params; - params.svc_ctx = svc_ctx; - params.request_id = request_id; - params.response_flags = response_flags; - params.operation_name = opname; // We are going to pass on this request to the underlying messaging // layer. It should take care of this request CORBA::Boolean retval = - this->client_mesg_factory_->write_message_header (params, + this->client_mesg_factory_->write_message_header (opdetails, TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, spec, msg); @@ -424,13 +416,11 @@ TAO_IIOP_Transport::send_request (TAO_Stub *, CORBA::Boolean -TAO_IIOP_Transport::send_request_header (const IOP::ServiceContextList & /*svc_ctx*/, - CORBA::ULong /*request_id*/, - CORBA::Octet /*response_flags*/, +TAO_IIOP_Transport::send_request_header (TAO_Operation_Details & /**/, TAO_Target_Specification & /*spec */ , - const char* /*opname*/, TAO_OutputCDR & /*msg*/) { // We should never be here. So return an error. return 0; } + diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 821dd36b645..ec9d78943d4 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -1,5 +1,6 @@ // // $Id$ + // // ================================================================ // diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp index f0e4083fe78..a1871ff6f84 100644 --- a/TAO/tao/IORC.cpp +++ b/TAO/tao/IORC.cpp @@ -20,6 +20,7 @@ ACE_RCSID(tao, IORC, "$Id$") + TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/tao/IOR_LookupTable.cpp index 2a0ed2c406f..ca40f54cac8 100644 --- a/TAO/tao/IOR_LookupTable.cpp +++ b/TAO/tao/IOR_LookupTable.cpp @@ -1,12 +1,14 @@ // $Id$ + #include "tao/IOR_LookupTable.h" #include "tao/ObjectIDList.h" #include "tao/Exception.h" #include "tao/Environment.h" #include "tao/debug.h" + ACE_RCSID(tao, IOR_TableLookup, "$Id$") diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp index 3419c7825af..501c2bbf0d8 100644 --- a/TAO/tao/ImplRepoC.cpp +++ b/TAO/tao/ImplRepoC.cpp @@ -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. @@ -73,6 +74,7 @@ void ImplementationRepository::ServerObject::ping ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "ping", + 4, istub->orb_core () ); @@ -181,6 +183,7 @@ void ImplementationRepository::ServerObject::shutdown ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown", + 8, istub->orb_core () ); @@ -1166,6 +1169,7 @@ void ImplementationRepository::Administration::activate_server ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "activate_server", + 15, istub->orb_core () ); @@ -1287,6 +1291,7 @@ void ImplementationRepository::Administration::register_server ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "register_server", + 15, istub->orb_core () ); @@ -1403,6 +1408,7 @@ void ImplementationRepository::Administration::reregister_server ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "reregister_server", + 17, istub->orb_core () ); @@ -1524,6 +1530,7 @@ void ImplementationRepository::Administration::remove_server ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "remove_server", + 13, istub->orb_core () ); @@ -1644,6 +1651,7 @@ void ImplementationRepository::Administration::shutdown_server ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown_server", + 15, istub->orb_core () ); @@ -1766,6 +1774,7 @@ char * ImplementationRepository::Administration::server_is_running ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_running", + 17, istub->orb_core () ); @@ -1895,6 +1904,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_shutting_down", + 23, istub->orb_core () ); @@ -2017,6 +2027,7 @@ void ImplementationRepository::Administration::find ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "find", + 4, istub->orb_core () ); @@ -2138,6 +2149,7 @@ void ImplementationRepository::Administration::list ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "list", + 4, istub->orb_core () ); @@ -2585,6 +2597,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "next_n", + 6, istub->orb_core () ); @@ -2706,6 +2719,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", + 7, istub->orb_core () ); diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp index c10168780fc..57cecf63f05 100644 --- a/TAO/tao/InterceptorC.cpp +++ b/TAO/tao/InterceptorC.cpp @@ -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/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp index 1849ed31dae..d77fe4923a0 100644 --- a/TAO/tao/InterfaceC.cpp +++ b/TAO/tao/InterfaceC.cpp @@ -154,6 +154,7 @@ CORBA::DefinitionKind CORBA_IRObject::def_kind ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""def_kind", + 13, istub->orb_core () ); @@ -212,6 +213,7 @@ void CORBA_IRObject::destroy ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", + 7, istub->orb_core () ); @@ -351,6 +353,7 @@ char * CORBA_Contained::id ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""id", + 7, istub->orb_core () ); @@ -410,6 +413,7 @@ void CORBA_Contained::id ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""id", + 7, istub->orb_core () ); @@ -469,6 +473,7 @@ char * CORBA_Contained::name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""name", + 9, istub->orb_core () ); @@ -528,6 +533,7 @@ void CORBA_Contained::name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""name", + 9, istub->orb_core () ); @@ -587,6 +593,7 @@ char * CORBA_Contained::version ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""version", + 12, istub->orb_core () ); @@ -646,6 +653,7 @@ void CORBA_Contained::version ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""version", + 12, istub->orb_core () ); @@ -705,6 +713,7 @@ CORBA_Container_ptr CORBA_Contained::defined_in ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""defined_in", + 15, istub->orb_core () ); @@ -763,6 +772,7 @@ char * CORBA_Contained::absolute_name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""absolute_name", + 18, istub->orb_core () ); @@ -821,6 +831,7 @@ CORBA_Repository_ptr CORBA_Contained::containing_repository ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""containing_repository", + 26, istub->orb_core () ); @@ -924,6 +935,7 @@ CORBA_Contained::Description * CORBA_Contained::describe ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "describe", + 8, istub->orb_core () ); @@ -985,6 +997,7 @@ void CORBA_Contained::move ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "move", + 4, istub->orb_core () ); @@ -2165,6 +2178,7 @@ CORBA_Contained_ptr CORBA_Container::lookup ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "lookup", + 6, istub->orb_core () ); @@ -2232,6 +2246,7 @@ CORBA_ContainedSeq * CORBA_Container::contents ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "contents", + 8, istub->orb_core () ); @@ -2302,6 +2317,7 @@ CORBA_ContainedSeq * CORBA_Container::lookup_name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "lookup_name", + 11, istub->orb_core () ); @@ -2579,6 +2595,7 @@ CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "describe_contents", + 17, istub->orb_core () ); @@ -2648,6 +2665,7 @@ CORBA_ModuleDef_ptr CORBA_Container::create_module ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_module", + 13, istub->orb_core () ); @@ -2719,6 +2737,7 @@ CORBA_ConstantDef_ptr CORBA_Container::create_constant ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_constant", + 15, istub->orb_core () ); @@ -2791,6 +2810,7 @@ CORBA_StructDef_ptr CORBA_Container::create_struct ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_struct", + 13, istub->orb_core () ); @@ -2863,6 +2883,7 @@ CORBA_UnionDef_ptr CORBA_Container::create_union ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_union", + 12, istub->orb_core () ); @@ -2935,6 +2956,7 @@ CORBA_EnumDef_ptr CORBA_Container::create_enum ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_enum", + 11, istub->orb_core () ); @@ -3006,6 +3028,7 @@ CORBA_AliasDef_ptr CORBA_Container::create_alias ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_alias", + 12, istub->orb_core () ); @@ -3077,6 +3100,7 @@ CORBA_InterfaceDef_ptr CORBA_Container::create_interface ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_interface", + 16, istub->orb_core () ); @@ -3154,6 +3178,7 @@ CORBA_ValueDef_ptr CORBA_Container::create_value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_value", + 12, istub->orb_core () ); @@ -3231,6 +3256,7 @@ CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_value_box", + 16, istub->orb_core () ); @@ -3302,6 +3328,7 @@ CORBA_ExceptionDef_ptr CORBA_Container::create_exception ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_exception", + 16, istub->orb_core () ); @@ -3443,6 +3470,7 @@ CORBA::TypeCode_ptr CORBA_IDLType::type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type", + 9, istub->orb_core () ); @@ -3609,6 +3637,7 @@ CORBA_Contained_ptr CORBA_Repository::lookup_id ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "lookup_id", + 9, istub->orb_core () ); @@ -3674,6 +3703,7 @@ CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "get_primitive", + 13, istub->orb_core () ); @@ -3739,6 +3769,7 @@ CORBA_StringDef_ptr CORBA_Repository::create_string ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_string", + 13, istub->orb_core () ); @@ -3804,6 +3835,7 @@ CORBA_WstringDef_ptr CORBA_Repository::create_wstring ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_wstring", + 14, istub->orb_core () ); @@ -3870,6 +3902,7 @@ CORBA_SequenceDef_ptr CORBA_Repository::create_sequence ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_sequence", + 15, istub->orb_core () ); @@ -3937,6 +3970,7 @@ CORBA_ArrayDef_ptr CORBA_Repository::create_array ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_array", + 12, istub->orb_core () ); @@ -4004,6 +4038,7 @@ CORBA_FixedDef_ptr CORBA_Repository::create_fixed ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_fixed", + 12, istub->orb_core () ); @@ -4268,6 +4303,7 @@ CORBA::TypeCode_ptr CORBA_ConstantDef::type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type", + 9, istub->orb_core () ); @@ -4326,6 +4362,7 @@ CORBA_IDLType_ptr CORBA_ConstantDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type_def", + 13, istub->orb_core () ); @@ -4385,6 +4422,7 @@ void CORBA_ConstantDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""type_def", + 13, istub->orb_core () ); @@ -4445,6 +4483,7 @@ CORBA_Any * CORBA_ConstantDef::value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -4504,6 +4543,7 @@ void CORBA_ConstantDef::value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""value", + 10, istub->orb_core () ); @@ -4820,6 +4860,7 @@ CORBA_StructMemberSeq * CORBA_StructDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""members", + 12, istub->orb_core () ); @@ -4879,6 +4920,7 @@ void CORBA_StructDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""members", + 12, istub->orb_core () ); @@ -5016,6 +5058,7 @@ CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""discriminator_type", + 23, istub->orb_core () ); @@ -5074,6 +5117,7 @@ CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""discriminator_type_def", + 27, istub->orb_core () ); @@ -5133,6 +5177,7 @@ void CORBA_UnionDef::discriminator_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""discriminator_type_def", + 27, istub->orb_core () ); @@ -5193,6 +5238,7 @@ CORBA_UnionMemberSeq * CORBA_UnionDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""members", + 12, istub->orb_core () ); @@ -5252,6 +5298,7 @@ void CORBA_UnionDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""members", + 12, istub->orb_core () ); @@ -5390,6 +5437,7 @@ CORBA_EnumMemberSeq * CORBA_EnumDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""members", + 12, istub->orb_core () ); @@ -5449,6 +5497,7 @@ void CORBA_EnumDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""members", + 12, istub->orb_core () ); @@ -5585,6 +5634,7 @@ CORBA_IDLType_ptr CORBA_AliasDef::original_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""original_type_def", + 22, istub->orb_core () ); @@ -5644,6 +5694,7 @@ void CORBA_AliasDef::original_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""original_type_def", + 22, istub->orb_core () ); @@ -5780,6 +5831,7 @@ CORBA::PrimitiveKind CORBA_PrimitiveDef::kind ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""kind", + 9, istub->orb_core () ); @@ -5913,6 +5965,7 @@ CORBA::ULong CORBA_StringDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""bound", + 10, istub->orb_core () ); @@ -5972,6 +6025,7 @@ void CORBA_StringDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""bound", + 10, istub->orb_core () ); @@ -6106,6 +6160,7 @@ CORBA::ULong CORBA_WstringDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""bound", + 10, istub->orb_core () ); @@ -6165,6 +6220,7 @@ void CORBA_WstringDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""bound", + 10, istub->orb_core () ); @@ -6299,6 +6355,7 @@ CORBA::UShort CORBA_FixedDef::digits ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""digits", + 11, istub->orb_core () ); @@ -6358,6 +6415,7 @@ void CORBA_FixedDef::digits ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""digits", + 11, istub->orb_core () ); @@ -6417,6 +6475,7 @@ CORBA::Short CORBA_FixedDef::scale ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""scale", + 10, istub->orb_core () ); @@ -6476,6 +6535,7 @@ void CORBA_FixedDef::scale ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""scale", + 10, istub->orb_core () ); @@ -6610,6 +6670,7 @@ CORBA::ULong CORBA_SequenceDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""bound", + 10, istub->orb_core () ); @@ -6669,6 +6730,7 @@ void CORBA_SequenceDef::bound ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""bound", + 10, istub->orb_core () ); @@ -6728,6 +6790,7 @@ CORBA::TypeCode_ptr CORBA_SequenceDef::element_type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""element_type", + 17, istub->orb_core () ); @@ -6786,6 +6849,7 @@ CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""element_type_def", + 21, istub->orb_core () ); @@ -6845,6 +6909,7 @@ void CORBA_SequenceDef::element_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""element_type_def", + 21, istub->orb_core () ); @@ -6979,6 +7044,7 @@ CORBA::ULong CORBA_ArrayDef::length ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""length", + 11, istub->orb_core () ); @@ -7038,6 +7104,7 @@ void CORBA_ArrayDef::length ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""length", + 11, istub->orb_core () ); @@ -7097,6 +7164,7 @@ CORBA::TypeCode_ptr CORBA_ArrayDef::element_type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""element_type", + 17, istub->orb_core () ); @@ -7155,6 +7223,7 @@ CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""element_type_def", + 21, istub->orb_core () ); @@ -7213,6 +7282,7 @@ void CORBA_ArrayDef::element_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""element_type_def", + 21, istub->orb_core () ); @@ -7347,6 +7417,7 @@ CORBA::TypeCode_ptr CORBA_ExceptionDef::type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type", + 9, istub->orb_core () ); @@ -7406,6 +7477,7 @@ CORBA_StructMemberSeq * CORBA_ExceptionDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""members", + 12, istub->orb_core () ); @@ -7465,6 +7537,7 @@ void CORBA_ExceptionDef::members ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""members", + 12, istub->orb_core () ); @@ -7665,6 +7738,7 @@ CORBA::TypeCode_ptr CORBA_AttributeDef::type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type", + 9, istub->orb_core () ); @@ -7723,6 +7797,7 @@ CORBA_IDLType_ptr CORBA_AttributeDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type_def", + 13, istub->orb_core () ); @@ -7782,6 +7857,7 @@ void CORBA_AttributeDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""type_def", + 13, istub->orb_core () ); @@ -7841,6 +7917,7 @@ CORBA::AttributeMode CORBA_AttributeDef::mode ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""mode", + 9, istub->orb_core () ); @@ -7900,6 +7977,7 @@ void CORBA_AttributeDef::mode ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""mode", + 9, istub->orb_core () ); @@ -8702,6 +8780,7 @@ CORBA::TypeCode_ptr CORBA_OperationDef::result ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""result", + 11, istub->orb_core () ); @@ -8760,6 +8839,7 @@ CORBA_IDLType_ptr CORBA_OperationDef::result_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""result_def", + 15, istub->orb_core () ); @@ -8819,6 +8899,7 @@ void CORBA_OperationDef::result_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""result_def", + 15, istub->orb_core () ); @@ -8879,6 +8960,7 @@ CORBA_ParDescriptionSeq * CORBA_OperationDef::params ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""params", + 11, istub->orb_core () ); @@ -8938,6 +9020,7 @@ void CORBA_OperationDef::params ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""params", + 11, istub->orb_core () ); @@ -8997,6 +9080,7 @@ CORBA::OperationMode CORBA_OperationDef::mode ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""mode", + 9, istub->orb_core () ); @@ -9056,6 +9140,7 @@ void CORBA_OperationDef::mode ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""mode", + 9, istub->orb_core () ); @@ -9116,6 +9201,7 @@ CORBA_ContextIdSeq * CORBA_OperationDef::contexts ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""contexts", + 13, istub->orb_core () ); @@ -9175,6 +9261,7 @@ void CORBA_OperationDef::contexts ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""contexts", + 13, istub->orb_core () ); @@ -9294,6 +9381,7 @@ void CORBA_OperationDef::exceptions ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""exceptions", + 15, istub->orb_core () ); @@ -10149,6 +10237,7 @@ CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""base_interfaces", + 20, istub->orb_core () ); @@ -10208,6 +10297,7 @@ void CORBA_InterfaceDef::base_interfaces ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""base_interfaces", + 20, istub->orb_core () ); @@ -10268,6 +10358,7 @@ CORBA::Boolean CORBA_InterfaceDef::is_a ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "is_a", + 4, istub->orb_core () ); @@ -10673,6 +10764,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_inte TAO_GIOP_Twoway_Invocation _tao_call ( istub, "describe_interface", + 18, istub->orb_core () ); @@ -10736,6 +10828,7 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_attribute", + 16, istub->orb_core () ); @@ -10812,6 +10905,7 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_operation", + 16, istub->orb_core () ); @@ -11288,6 +11382,7 @@ CORBA::TypeCode_ptr CORBA_ValueMemberDef::type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type", + 9, istub->orb_core () ); @@ -11346,6 +11441,7 @@ CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""type_def", + 13, istub->orb_core () ); @@ -11405,6 +11501,7 @@ void CORBA_ValueMemberDef::type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""type_def", + 13, istub->orb_core () ); @@ -11464,6 +11561,7 @@ CORBA::Visibility CORBA_ValueMemberDef::access ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""access", + 11, istub->orb_core () ); @@ -11523,6 +11621,7 @@ void CORBA_ValueMemberDef::access ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""access", + 11, istub->orb_core () ); @@ -11657,6 +11756,7 @@ CORBA_InterfaceDef_ptr CORBA_ValueDef::supported_interface ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""supported_interface", + 24, istub->orb_core () ); @@ -11716,6 +11816,7 @@ void CORBA_ValueDef::supported_interface ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""supported_interface", + 24, istub->orb_core () ); @@ -11776,6 +11877,7 @@ CORBA_InitializerSeq * CORBA_ValueDef::initializers ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""initializers", + 17, istub->orb_core () ); @@ -11835,6 +11937,7 @@ void CORBA_ValueDef::initializers ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""initializers", + 17, istub->orb_core () ); @@ -11894,6 +11997,7 @@ CORBA_ValueDef_ptr CORBA_ValueDef::base_value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""base_value", + 15, istub->orb_core () ); @@ -11953,6 +12057,7 @@ void CORBA_ValueDef::base_value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""base_value", + 15, istub->orb_core () ); @@ -12013,6 +12118,7 @@ CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""abstract_base_values", + 25, istub->orb_core () ); @@ -12072,6 +12178,7 @@ void CORBA_ValueDef::abstract_base_values ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""abstract_base_values", + 25, istub->orb_core () ); @@ -12131,6 +12238,7 @@ CORBA::Boolean CORBA_ValueDef::is_abstract ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""is_abstract", + 16, istub->orb_core () ); @@ -12190,6 +12298,7 @@ void CORBA_ValueDef::is_abstract ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""is_abstract", + 16, istub->orb_core () ); @@ -12249,6 +12358,7 @@ CORBA::Boolean CORBA_ValueDef::is_custom ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""is_custom", + 14, istub->orb_core () ); @@ -12308,6 +12418,7 @@ void CORBA_ValueDef::is_custom ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""is_custom", + 14, istub->orb_core () ); @@ -12367,6 +12478,7 @@ CORBA::Boolean CORBA_ValueDef::is_truncatable ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""is_truncatable", + 19, istub->orb_core () ); @@ -12426,6 +12538,7 @@ void CORBA_ValueDef::is_truncatable ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""is_truncatable", + 19, istub->orb_core () ); @@ -12486,6 +12599,7 @@ CORBA::Boolean CORBA_ValueDef::is_a ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "is_a", + 4, istub->orb_core () ); @@ -13057,6 +13171,7 @@ CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "describe_value", + 14, istub->orb_core () ); @@ -13120,6 +13235,7 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_value_member", + 19, istub->orb_core () ); @@ -13193,6 +13309,7 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_attribute", + 16, istub->orb_core () ); @@ -13269,6 +13386,7 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_operation", + 16, istub->orb_core () ); @@ -13512,6 +13630,7 @@ CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""original_type_def", + 22, istub->orb_core () ); @@ -13571,6 +13690,7 @@ void CORBA_ValueBoxDef::original_type_def ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""original_type_def", + 22, istub->orb_core () ); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 5f762aecbce..df5bb0a759f 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/Invocation.h" #include "tao/Stub.h" #include "tao/Principal.h" @@ -73,10 +74,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Invocation_Timeprobe_Description, TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core* orb_core) : stub_ (stub), - opname_ (operation), - request_id_ (0), + op_details_ (operation, opname_len), out_stream_ (buffer, sizeof buffer, /* ACE_CDR::DEFAULT_BUFSIZE */ TAO_ENCAP_BYTE_ORDER, orb_core->output_cdr_buffer_allocator (), @@ -269,11 +270,9 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) if (this->transport_ != 0) this->transport_->idle (); - countdown.update (); int result = conn_reg->connect (this->profile_, this->transport_, this->max_wait_time_); - countdown.update (); if (result == 0) break; @@ -294,12 +293,14 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) TAO_INVOCATION_CONNECT_MINOR_CODE, errno), CORBA::COMPLETED_NO)); + + countdown.update (); } // Obtain unique request id from the RMS. - this->request_id_ = this->transport_->tms ()->request_id (); + this->op_details_.request_id ( + this->transport_->tms ()->request_id ()); - countdown.update (); } void @@ -309,25 +310,16 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags, { // Then fill in the rest of the RequestHeader // - // 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. - // - // Last element of request header is the principal; no portable way - // to get it, we just pass empty principal (convention: indicates - // "anybody"). Steps upward in security include passing an - // unverified user ID, and then verifying the message (i.e. a dummy - // service context entry is set up to hold a digital signature for - // this message, then patched shortly before it's sent). - TAO_Target_Specification spec; - spec.target_specifier (this->profile_->object_key ()); - - if (this->transport_->send_request_header (this->service_info_, - this->request_id_, - response_flags, - spec, - this->opname_, + + // The target specification mode + this->target_spec_.target_specifier (this->profile_->object_key ()); + + // Update the response flags + this->op_details_.response_flags (response_flags); + + //Send the request for the header + if (this->transport_->send_request_header (this->op_details_, + this->target_spec_, this->out_stream_) == 0) ACE_THROW (CORBA::MARSHAL ()); } @@ -351,7 +343,6 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, // Even for oneways: with AMI it is possible to wait for a // response (empty) for oneways, just to make sure that they // arrive, there are policies to control that. - countdown.update (); int result = this->transport_->send_request (this->stub_, @@ -359,7 +350,6 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, this->out_stream_, is_roundtrip, this->max_wait_time_); - countdown.update (); // // @@ highly desirable to know whether we wrote _any_ data; if @@ -541,10 +531,9 @@ TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->TAO_GIOP_Invocation::start (ACE_TRY_ENV); ACE_CHECK; - TAO_Target_Specification spec; - spec.target_specifier (this->profile_->object_key ()); + this->target_spec_.target_specifier (this->profile_->object_key ()); this->transport_->start_request (this->orb_core_, - spec, + this->target_spec_, this->out_stream_, ACE_TRY_ENV); } @@ -604,9 +593,11 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions, const ACE_Message_Block* cdr = this->inp_stream ().start (); - CORBA_Any any (tcp, 0, + + CORBA_Any any (tcp, 0, this->inp_stream ().byte_order (), cdr); + CORBA_Exception *exception; ACE_NEW_THROW_EX (exception, @@ -729,7 +720,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // Bind. int retval = - this->transport_->tms ()->bind_dispatcher (this->request_id_, + this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (), &this->rd_); if (retval == -1) { @@ -911,9 +902,11 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) TAO_GIOP_Oneway_Invocation:: TAO_GIOP_Oneway_Invocation (TAO_Stub *stub, const char *operation, + CORBA::ULong opname_len, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (stub, operation, orb_core), + : TAO_GIOP_Invocation (stub, operation, opname_len, orb_core), sync_scope_ (TAO::SYNC_WITH_TRANSPORT) + { #if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Sync_Scope_Policy *ssp = stub->sync_scope (); @@ -938,11 +931,11 @@ TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->TAO_GIOP_Invocation::start (ACE_TRY_ENV); ACE_CHECK; - TAO_Target_Specification spec; - spec.target_specifier (this->profile_->object_key ()); + // Make sure that you have the right object key + this->target_spec_.target_specifier (this->profile_->object_key ()); this->transport_->start_request (this->orb_core_, - spec, + this->target_spec_, this->out_stream_, ACE_TRY_ENV); } @@ -960,16 +953,16 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); } + // Create this only if a reply is required. TAO_Synch_Reply_Dispatcher rd (this->orb_core_, - this->service_info_); - + this->op_details_.service_info ()); // The rest of this function is very similar to // TWO_GIOP_Twoway_Invocation::invoke_i, because we must // wait for a reply. See comments in that code. int retval = - this->transport_->tms ()->bind_dispatcher (this->request_id_, + this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (), &rd); if (retval == -1) { @@ -1144,11 +1137,12 @@ TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->TAO_GIOP_Invocation::start (ACE_TRY_ENV); ACE_CHECK; - TAO_Target_Specification spec; - spec.target_specifier (this->profile_->object_key ()); + // Just make sure that you pass in the object key + this->target_spec_.target_specifier (this->profile_->object_key ()); + this->transport_->start_locate (this->orb_core_, - spec, - this->request_id_, + this->target_spec_, + this->op_details_, this->out_stream_, ACE_TRY_ENV); } @@ -1169,7 +1163,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // Bind. int retval = - this->transport_->tms ()->bind_dispatcher (this->request_id_, + this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (), &this->rd_); if (retval == -1) { diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index c49a2d2495c..ff3cb2fef0e 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Leader_Follower.h" #include "tao/Resource_Factory.h" @@ -7,8 +8,10 @@ # include "tao/Leader_Follower.i" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID(tao, Leader_Follower, "$Id$") + TAO_Leader_Follower::~TAO_Leader_Follower (void) { delete this->reactor_; diff --git a/TAO/tao/Linear_Priority_Mapping.cpp b/TAO/tao/Linear_Priority_Mapping.cpp index 27c346394d4..d995fc7b2b9 100644 --- a/TAO/tao/Linear_Priority_Mapping.cpp +++ b/TAO/tao/Linear_Priority_Mapping.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/orbconf.h" #if (TAO_HAS_RT_CORBA == 1) @@ -12,8 +13,10 @@ # include "tao/Linear_Priority_Mapping.i" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID(tao, Linear_Priority_Mapping, "$Id$") + TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (int policy) : policy_ (policy) { diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index 5bf8c2c8604..9882d51e961 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -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. @@ -23,6 +24,7 @@ ACE_RCSID(tao, MessagingC, "$Id$") + static const CORBA::Long _oc_Messaging_RebindMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -1669,6 +1671,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""operation_target", + 21, istub->orb_core () ); @@ -1723,6 +1726,7 @@ char * Messaging::Poller::operation_name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""operation_name", + 19, istub->orb_core () ); @@ -1777,6 +1781,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""associated_handler", + 23, istub->orb_core () ); @@ -1831,6 +1836,7 @@ void Messaging::Poller::associated_handler ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_set_""associated_handler", + 23, istub->orb_core () ); @@ -1886,6 +1892,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""is_from_poller", + 19, istub->orb_core () ); @@ -1940,6 +1947,7 @@ CORBA::Object_ptr Messaging::Poller::target ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""target", + 11, istub->orb_core () ); @@ -1994,6 +2002,7 @@ char * Messaging::Poller::op_name ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""op_name", + 12, istub->orb_core () ); diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp index 505f5d50ef3..442fe4105b3 100644 --- a/TAO/tao/MessagingS.cpp +++ b/TAO/tao/MessagingS.cpp @@ -2,6 +2,7 @@ // $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. @@ -27,6 +28,7 @@ ACE_RCSID(tao, MessagingS, "$Id$") + POA_Messaging::RebindPolicy::RebindPolicy (void) { } diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp index 71addde084d..73bda811ed7 100644 --- a/TAO/tao/MessagingS_T.cpp +++ b/TAO/tao/MessagingS_T.cpp @@ -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.cpp b/TAO/tao/Messaging_Policy_i.cpp index eaef8da234b..e1547516d16 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/Messaging_Policy_i.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -14,7 +15,6 @@ ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") - TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (PortableServer::POA_ptr poa, const TimeBase::TimeT& relative_expiry) : poa_ (PortableServer::POA::_duplicate (poa)), diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 90baedd7f5b..182513c3245 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -1,5 +1,6 @@ // $Id$ + // Implementation of Named Value List and NamedValue classes #include "tao/NVList.h" @@ -18,6 +19,7 @@ ACE_RCSID(tao, NVList, "$Id$") + // Reference counting for DII Request object CORBA::ULong diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 431ecd88664..e55d8a7e73d 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/ORB.h" #include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" @@ -67,6 +68,7 @@ using std::set_unexpected; ACE_RCSID(tao, ORB, "$Id$") + static const char ior_prefix [] = "IOR:"; static const char file_prefix[] = "file://"; @@ -1335,7 +1337,6 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) // // NOTE: we still "just" assume that native floating point is // IEEE. - if (sizeof (CORBA::Short) != 2 || sizeof (CORBA::Long) != 4 || sizeof (CORBA::LongLong) != 8 diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index f46b0386eb4..82d5c5501f2 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2,6 +2,7 @@ + #include "tao/ORB_Core.h" #include "ace/Env_Value_T.h" @@ -129,7 +130,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) ACE_NEW (this->eager_buffering_sync_strategy_, TAO_Eager_Buffering_Sync_Strategy); - ACE_NEW (this->delayed_buffering_sync_strategy_, TAO_Delayed_Buffering_Sync_Strategy); @@ -349,6 +349,23 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) //////////////////////////////////////////////////////////////// // continue with the 'parameter' flags // //////////////////////////////////////////////////////////////// + else if ((current_arg = arg_shifter.get_the_parameter + ("-ORBSvcConfDirective"))) + { + // This is used to pass arguments to the Service + // Configurator using the "command line" to provide + // configuration information rather than using a svc.conf + // file. Pass the "-S" to the service configurator. + this->svc_config_argv_[this->svc_config_argc_++] = + CORBA::string_dup ("-S"); + + // Pass the next argument. + this->svc_config_argv_[this->svc_config_argc_++] = + CORBA::string_dup (current_arg); + + arg_shifter.consume_arg (); + } + else if ((current_arg = arg_shifter.get_the_parameter ("-ORBSvcConf"))) { @@ -773,22 +790,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter - ("-ORBSvcConfDirective"))) - { - // This is used to pass arguments to the Service - // Configurator using the "command line" to provide - // configuration information rather than using a svc.conf - // file. Pass the "-S" to the service configurator. - this->svc_config_argv_[this->svc_config_argc_++] = - CORBA::string_dup ("-S"); - - // Pass the next argument. - this->svc_config_argv_[this->svc_config_argc_++] = - CORBA::string_dup (current_arg); - - arg_shifter.consume_arg (); - } // A new <ObjectID>:<IOR> mapping has been specified. This will be // used by the resolve_initial_references (). @@ -939,14 +940,19 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) //////////////////////////////////////////////////////////////// // catch all the remaining -ORB args // //////////////////////////////////////////////////////////////// - else if (arg_shifter.cur_arg_strncasecmp - ("-ORB") != -1) + else if (arg_shifter.cur_arg_strncasecmp ("-ORB") != -1) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_WARNING, - ASYS_TEXT ("WARNING: Unknown \"-ORB\" option <%s>.\n") - ASYS_TEXT (" Removing it from the argument list.\n"), - current_arg)); + { + current_arg = arg_shifter.get_current (); + ACE_DEBUG ((LM_WARNING, + ASYS_TEXT ("WARNING: Unknown \"-ORB\" option ") + ASYS_TEXT ("<%s>.\n") + ASYS_TEXT (" Removing it from the ") + ASYS_TEXT ("argument list.\n"), + ((current_arg == 0) ? "<NULL>" : current_arg))); + } + arg_shifter.consume_arg (); } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index b5c6db36528..c1066ecbba9 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -30,6 +30,7 @@ ACE_RCSID(tao, Object, "$Id$") + CORBA_Object::~CORBA_Object (void) { if (this->protocol_proxy_) @@ -111,6 +112,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_is_a", + 5, istub->orb_core () ); @@ -285,8 +287,9 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) TAO_GIOP_Twoway_Invocation _tao_call ( - istub, + istub, "_non_existent", + 13, istub->orb_core () ); @@ -431,6 +434,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_interface", + 10, istub->orb_core () ); diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index 7d0421cffa6..d2e23419a08 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Object_Adapter.h" #include "tao/POA.h" #include "tao/ORB.h" @@ -11,8 +12,10 @@ # include "tao/Object_Adapter.i" #endif /* __ACE_INLINE__ */ + ACE_RCSID(tao, Object_Adapter, "$Id$") + // Timeprobes class #include "tao/Timeprobe.h" diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp index d5992812b44..06037d9dd66 100644 --- a/TAO/tao/Operation_Table.cpp +++ b/TAO/tao/Operation_Table.cpp @@ -6,6 +6,7 @@ ACE_RCSID(tao, Operation_Table, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Operation_Table_Timeprobe_Description[] = diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index ebe4fc27136..f3b0af9fed9 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -1,5 +1,6 @@ // @(#) $Id$ + // auto_ptr class #include "ace/Auto_Ptr.h" @@ -79,6 +80,7 @@ private: ACE_RCSID(tao, POA, "$Id$") + #if !defined (TAO_NO_IOR_TABLE) // This is the TAO_Object_key-prefix that is appended to all TAO Object keys. // It's an array of octets representing ^t^a^o/0 in octal. diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 182c77f7da5..ce8b486efa2 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -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 @@ -23,8 +24,10 @@ #include "tao/POAC.i" #endif // !defined INLINE + ACE_RCSID(tao, POAC, "$Id$") + #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CS_) #define _PORTABLESERVER__TAO_SEQ_OCTET_CS_ @@ -173,7 +176,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardR else { ACE_NEW_RETURN (_tao_elem, PortableServer::ForwardRequest, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::_tc_ForwardRequest, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -342,6 +346,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -505,6 +510,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -668,6 +674,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -830,6 +837,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -995,6 +1003,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -1158,6 +1167,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -1321,6 +1331,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""value", + 10, istub->orb_core () ); @@ -1534,7 +1545,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManag else { ACE_NEW_RETURN (_tao_elem, PortableServer::POAManager::AdapterInactive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2037,7 +2049,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterAlreadyExists, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2171,7 +2184,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterInactive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2305,7 +2319,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterNonExistent, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2446,7 +2461,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Inv else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::InvalidPolicy, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2583,7 +2599,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::NoS else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::NoServant, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_NoServant, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2719,7 +2736,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectAlreadyActive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2851,7 +2869,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectNotActive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -2983,7 +3002,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantAlreadyActive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -3115,7 +3135,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantNotActive, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -3247,7 +3268,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongAdapter, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -3379,7 +3401,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro else { ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongPolicy, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -3584,7 +3607,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current: else { ACE_NEW_RETURN (_tao_elem, PortableServer::Current::NoContext, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (PortableServer::Current::_tc_NoContext, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -3645,6 +3669,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro TAO_GIOP_Twoway_Invocation _tao_call ( istub, "get_object_id", + 13, istub->orb_core () ); diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/POAManager.cpp index 8c86e550a06..a90cbbcea59 100644 --- a/TAO/tao/POAManager.cpp +++ b/TAO/tao/POAManager.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/POAManager.h" #include "tao/POA.h" #include "tao/Server_Strategy_Factory.h" diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index 0fcd784cdac..2f486e2932a 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -1,5 +1,6 @@ // $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. @@ -19,6 +20,7 @@ ACE_RCSID(tao, POAS, "$Id$") + #if (TAO_HAS_MINIMUM_POA == 0) #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp index e1c9c6112c0..29f1c5890a1 100644 --- a/TAO/tao/Pluggable.cpp +++ b/TAO/tao/Pluggable.cpp @@ -2,6 +2,7 @@ // $Id$ + #include "tao/Pluggable.h" #include "tao/Stub.h" #include "tao/Environment.h" @@ -19,6 +20,7 @@ # include "tao/Pluggable.i" #endif /* __ACE_INLINE__ */ + ACE_RCSID(tao, Pluggable, "$Id$") @@ -229,7 +231,7 @@ TAO_Transport::start_request (TAO_ORB_Core *, void TAO_Transport::start_locate (TAO_ORB_Core *, TAO_Target_Specification & /*spec */, - CORBA::ULong, + TAO_Operation_Details & /* */, TAO_OutputCDR &, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index dd5be304cd6..b3008817e40 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -1,5 +1,6 @@ // $Id$ + /* -*- C++ -*- */ // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* @@ -21,6 +22,7 @@ ACE_RCSID(tao, PolicyC, "$Id$") + // **************************************************************** TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) @@ -240,6 +242,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "_get_""policy_type", + 16, istub->orb_core () ); @@ -293,6 +296,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "copy", + 4, istub->orb_core () ); @@ -345,6 +349,7 @@ void CORBA_Policy::destroy ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", + 7, istub->orb_core () ); @@ -617,7 +622,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyError *&_tao else { ACE_NEW_RETURN (_tao_elem, CORBA_PolicyError, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_PolicyError, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -684,7 +690,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InvalidPolicies *& else { ACE_NEW_RETURN (_tao_elem, CORBA_InvalidPolicies, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_InvalidPolicies, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -733,7 +740,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Policy_ptr &_tao_e CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (CORBA::_tc_Policy, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (CORBA::_tc_Policy, &_tao_obj_var.out (), 0, ACE_TRY_ENV) @@ -805,7 +813,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyList *&_tao_ else { ACE_NEW_RETURN (_tao_elem, CORBA_PolicyList, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_PolicyList, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -874,7 +883,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *&_t else { ACE_NEW_RETURN (_tao_elem, CORBA_PolicyTypeSeq, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_PolicyTypeSeq, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -922,7 +932,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType & CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (CORBA::_tc_SetOverrideType, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_SetOverrideType, &_tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) return 1; diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index cb0047b55ce..171ef36dec8 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/Policy_Manager.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -16,6 +17,7 @@ # include "tao/Policy_Manager.i" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID(tao, Policy_Manager, "$Id$") diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 2d8af8c59ff..ca88b25a126 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // // $Id$ + // // ================================================================ // @@ -30,7 +31,11 @@ #include "tao/PollableC.i" #endif /* !defined INLINE */ +<<<<<<< PollableC.cpp +ACE_RCSID(tao, PollableC, "$Id$") +======= ACE_RCSID(tao, PollableC, "$Id$") +>>>>>>> 1.14.2.3 CORBA_Pollable_ptr CORBA_Pollable::_narrow ( CORBA::Object_ptr obj, @@ -127,6 +132,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "is_ready", + 8, istub->orb_core () ); @@ -187,6 +193,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_pollable_set", + 19, istub->orb_core () ); @@ -560,6 +567,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "create_dii_pollable", + 19, istub->orb_core () ); @@ -614,6 +622,7 @@ void CORBA_PollableSet::add_pollable ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "add_pollable", + 12, istub->orb_core () ); @@ -675,6 +684,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "poll", + 4, istub->orb_core () ); @@ -740,6 +750,7 @@ void CORBA_PollableSet::remove ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "remove", + 6, istub->orb_core () ); @@ -795,6 +806,7 @@ CORBA::UShort CORBA_PollableSet::number_left ( TAO_GIOP_Twoway_Invocation _tao_call ( istub, "number_left", + 11, istub->orb_core () ); @@ -876,7 +888,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Pollable_ptr &_tao CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (CORBA::_tc_Pollable, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (CORBA::_tc_Pollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV) @@ -934,7 +947,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DIIPollable_ptr & CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (CORBA::_tc_DIIPollable, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (CORBA::_tc_DIIPollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV) @@ -992,7 +1006,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet_ptr &_ CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (CORBA::_tc_PollableSet, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (CORBA::_tc_PollableSet, &_tao_obj_var.out (), 0, ACE_TRY_ENV) @@ -1068,7 +1083,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::NoPos else { ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::NoPossiblePollable, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -1135,7 +1151,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::Unkno else { ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::UnknownPollable, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 4c0f72f8a65..3e615df051a 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -31,6 +31,10 @@ ACE_RCSID(tao, PollableS, "$Id$") +<<<<<<< PollableS.cpp +ACE_RCSID(tao, PollableS, "$Id$") +======= +>>>>>>> 1.9.2.2 class TAO_CORBA_Pollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { diff --git a/TAO/tao/Pool_Per_Endpoint.cpp b/TAO/tao/Pool_Per_Endpoint.cpp index 832c3fd1f21..1cd02ae4606 100644 --- a/TAO/tao/Pool_Per_Endpoint.cpp +++ b/TAO/tao/Pool_Per_Endpoint.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Pool_Per_Endpoint.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" @@ -16,6 +17,7 @@ ACE_RCSID(tao, Pool_Per_Endpoint, "$Id$") + TAO_Pool_Per_Endpoint::TAO_Pool_Per_Endpoint (CORBA::ORB_ptr orb, int policy, int poolsize, diff --git a/TAO/tao/Priority_Mapping.cpp b/TAO/tao/Priority_Mapping.cpp index aafd60b22b4..cf62d36a1d5 100644 --- a/TAO/tao/Priority_Mapping.cpp +++ b/TAO/tao/Priority_Mapping.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/orbconf.h" #if (TAO_HAS_RT_CORBA == 1) @@ -12,6 +13,7 @@ ACE_RCSID(tao, Priority_Mapping, "$Id$") + TAO_Priority_Mapping::TAO_Priority_Mapping (void) { } diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 8fb3afde951..e11e71b790e 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Profile.h" #include "tao/Object_KeyC.h" @@ -10,6 +11,7 @@ ACE_RCSID(tao, Profile, "$Id$") + // **************************************************************** TAO_Profile::~TAO_Profile (void) diff --git a/TAO/tao/RT_Current.cpp b/TAO/tao/RT_Current.cpp index f6d98af18c4..5f639d47a10 100644 --- a/TAO/tao/RT_Current.cpp +++ b/TAO/tao/RT_Current.cpp @@ -1,5 +1,6 @@ // // $Id$ + // #include "tao/RT_Current.h" @@ -18,6 +19,7 @@ ACE_RCSID(tao, RT_Current, "$Id$") + TAO_RT_Current_ptr TAO_RT_Current::_duplicate (TAO_RT_Current_ptr obj) { diff --git a/TAO/tao/Reactor_Per_Priority.cpp b/TAO/tao/Reactor_Per_Priority.cpp index 273901a85c8..17f70403f16 100644 --- a/TAO/tao/Reactor_Per_Priority.cpp +++ b/TAO/tao/Reactor_Per_Priority.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Reactor_Per_Priority.h" #include "tao/ORB_Core.h" #include "tao/Resource_Factory.h" @@ -14,6 +15,7 @@ ACE_RCSID(tao, Reactor_Per_Priority, "$Id$") + TAO_Reactor_Per_Priority::~TAO_Reactor_Per_Priority (void) { for (Map_Iterator i = this->map_.begin (); diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 16ffa9d0c3c..616412d6e8c 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/Reply_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/Leader_Follower.h" diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp index 3a713845a2c..ca56420c549 100644 --- a/TAO/tao/Request.cpp +++ b/TAO/tao/Request.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/Request.h" #include "tao/GIOP_Utils.h" @@ -16,6 +17,7 @@ ACE_RCSID(tao, Request, "$Id$") + CORBA::ULong CORBA_Request::_incr_refcnt (void) { diff --git a/TAO/tao/SHMIOP_Acceptor.cpp b/TAO/tao/SHMIOP_Acceptor.cpp index 2faf5b9c382..0a3dc351921 100644 --- a/TAO/tao/SHMIOP_Acceptor.cpp +++ b/TAO/tao/SHMIOP_Acceptor.cpp @@ -9,7 +9,6 @@ #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" -#include "tao/GIOP.h" #include "tao/debug.h" #if !defined(__ACE_INLINE__) @@ -44,7 +43,7 @@ template class TAO_Accept_Strategy<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void) +TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), @@ -53,7 +52,8 @@ TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void) concurrency_strategy_ (0), accept_strategy_ (0), mmap_file_prefix_ (0), - mmap_size_ (1024 * 1024) + mmap_size_ (1024 * 1024), + lite_flag_ (flag) { } @@ -176,7 +176,8 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core) this->orb_core_ = orb_core; ACE_NEW_RETURN (this->creation_strategy_, - TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_), + TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_, + this->lite_flag_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp index 24022e2c6ae..7f5a7bd394c 100644 --- a/TAO/tao/SHMIOP_Connect.cpp +++ b/TAO/tao/SHMIOP_Connect.cpp @@ -9,7 +9,9 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/CDR.h" -#include "tao/GIOP.h" +#include "tao/GIOP_Message_Connectors.h" +#include "tao/GIOP_Message_Acceptors.h" +#include "tao/GIOP_Message_Lite.h" #if !defined (__ACE_INLINE__) # include "tao/SHMIOP_Connect.i" @@ -68,6 +70,7 @@ TAO_SHMIOP_Handler_Base::TAO_SHMIOP_Handler_Base (ACE_Thread_Manager *t) TAO_SHMIOP_Server_Connection_Handler::TAO_SHMIOP_Server_Connection_Handler (ACE_Thread_Manager *t) : TAO_SHMIOP_Handler_Base (t), transport_ (this, 0), + acceptor_factory_ (0), orb_core_ (0), tss_resources_ (0), refcount_ (1) @@ -81,13 +84,33 @@ TAO_SHMIOP_Server_Connection_Handler::TAO_SHMIOP_Server_Connection_Handler (ACE_ ACE_ASSERT (this->orb_core_ != 0); } -TAO_SHMIOP_Server_Connection_Handler::TAO_SHMIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core) +TAO_SHMIOP_Server_Connection_Handler::TAO_SHMIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core, + CORBA::Boolean flag) : TAO_SHMIOP_Handler_Base (orb_core), transport_ (this, orb_core), + acceptor_factory_ (0), orb_core_ (orb_core), tss_resources_ (orb_core->get_tss_resources ()), - refcount_ (1) + refcount_ (1), + lite_flag_ (flag) { + if (lite_flag_) + { + ACE_NEW (this->acceptor_factory_, + TAO_GIOP_Message_Lite); + } + else + { + ACE_NEW (this->acceptor_factory_, + TAO_GIOP_Message_Acceptors); + } + + // OK, Here is a small twist. By now the all the objecs cached in + // this class would have been constructed. But we would like to make + // the one of the objects, precisely the transport object a pointer + // to the Messaging object. So, we set this up properly by calling + // the messaging_init method on the transport. + this->transport_.messaging_init (this->acceptor_factory_); } TAO_SHMIOP_Server_Connection_Handler::~TAO_SHMIOP_Server_Connection_Handler (void) @@ -268,10 +291,10 @@ TAO_SHMIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, { this->refcount_++; - int result = TAO_GIOP::handle_input (this->transport (), - this->orb_core_, - this->transport_.message_state_, - max_wait_time); + int result = this->acceptor_factory_->handle_input (this->transport (), + this->orb_core_, + this->transport_.message_state_, + max_wait_time); if (result == -1 && TAO_debug_level > 0) { @@ -312,11 +335,11 @@ TAO_SHMIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, // Reset the message state. this->transport_.message_state_.reset (0); - result = TAO_GIOP::process_server_message (this->transport (), - this->orb_core_, - input_cdr, - message_type, - giop_version); + result = + this->acceptor_factory_->process_connector_messages (this->transport (), + this->orb_core_, + input_cdr, + message_type); if (result != -1) result = 0; @@ -503,6 +526,59 @@ TAO_SHMIOP_Client_Connection_Handler::handle_cleanup (void) return 0; } +int +TAO_SHMIOP_Client_Connection_Handler:: + init_mesg_protocol (CORBA::Octet major, + CORBA::Octet minor) +{ + if (major == TAO_DEF_GIOP_LITE_MAJOR && + minor == TAO_DEF_GIOP_LITE_MINOR) + { + ACE_NEW_RETURN (this->mesg_factory_, + TAO_GIOP_Message_Lite, + -1); + } + else if (major == TAO_DEF_GIOP_MAJOR) + { + if (minor > TAO_DEF_GIOP_MINOR) + minor = TAO_DEF_GIOP_MINOR; + switch (minor) + { + case 0: + ACE_NEW_RETURN (this->mesg_factory_, + TAO_GIOP_Message_Connector_10, + 0); + break; + case 1: + ACE_NEW_RETURN (this->mesg_factory_, + TAO_GIOP_Message_Connector_11, + 0); + break; + default: + if (TAO_debug_level > 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("(%N|%l|%p|%t) No matching minor version number \n")), + 0); + } + } + } + else + { + if (TAO_debug_level > 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), + 0); + } + } + + // Make the transport know + this->transport_.messaging_init (this->mesg_factory_); + + return 1; +} + // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/SHMIOP_Connector.cpp b/TAO/tao/SHMIOP_Connector.cpp index c8fe1994bba..86e11993d32 100644 --- a/TAO/tao/SHMIOP_Connector.cpp +++ b/TAO/tao/SHMIOP_Connector.cpp @@ -6,7 +6,6 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/SHMIOP_Profile.h" -#include "tao/GIOP.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" @@ -323,10 +322,11 @@ typedef ACE_Cached_Connect_Strategy<TAO_SHMIOP_Client_Connection_Handler, TAO_CACHED_CONNECT_STRATEGY; #endif /* ! TAO_USES_ROBUST_CONNECTION_MGMT */ -TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void) +TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Octet flag) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), orb_core_ (0), - base_connector_ () + base_connector_ (), + lite_flag_ (flag) #if defined (TAO_USES_ROBUST_CONNECTION_MGMT) , cached_connect_strategy_ (0), @@ -491,6 +491,31 @@ TAO_SHMIOP_Connector::connect (TAO_Profile *profile, } transport = svc_handler->transport (); + + int ret_val = 0; + if (this->lite_flag_) + { + ret_val = svc_handler->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR, + TAO_DEF_GIOP_LITE_MINOR); + } + else + { + // Now that we have the client connection handler object we need to + // set the right messaging protocol for the connection handler. + const TAO_GIOP_Version& version = shmiop_profile->version (); + ret_val = svc_handler->init_mesg_protocol (version.major, + version.minor); + + } + if (ret_val == -1) + { + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("(%N|%l|%p|%t) init_mesg_protocol () failed \n"))); + } + return -1; + } return 0; } diff --git a/TAO/tao/SHMIOP_Profile.cpp b/TAO/tao/SHMIOP_Profile.cpp index 0e389e69994..46a3ba303ae 100644 --- a/TAO/tao/SHMIOP_Profile.cpp +++ b/TAO/tao/SHMIOP_Profile.cpp @@ -6,7 +6,6 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/SHMIOP_Connect.h" -#include "tao/GIOP.h" #include "tao/CDR.h" #include "tao/Environment.h" #include "tao/ORB.h" diff --git a/TAO/tao/SHMIOP_Transport.cpp b/TAO/tao/SHMIOP_Transport.cpp index 73adeab19cb..93e52d6474a 100644 --- a/TAO/tao/SHMIOP_Transport.cpp +++ b/TAO/tao/SHMIOP_Transport.cpp @@ -112,6 +112,12 @@ TAO_SHMIOP_Server_Transport::~TAO_SHMIOP_Server_Transport (void) { } +void +TAO_SHMIOP_Server_Transport::messaging_init (TAO_Pluggable_Messaging_Interface *mesg) +{ + this->server_mesg_factory_ = mesg; +} + // **************************************************************** TAO_SHMIOP_Client_Transport:: @@ -134,15 +140,14 @@ TAO_SHMIOP_Client_Transport::client_handler (void) } void -TAO_SHMIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core, - const TAO_Profile* pfile, +TAO_SHMIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/, + TAO_Target_Specification & /*spec */, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FUNCTION_PP_TIMEPROBE (TAO_SHMIOP_CLIENT_TRANSPORT_START_REQUEST_START); - - const TAO_SHMIOP_Profile* profile = + /*const TAO_SHMIOP_Profile* profile = ACE_dynamic_cast(const TAO_SHMIOP_Profile*, pfile); // @@ This should be implemented in the transport object, which @@ -151,35 +156,32 @@ TAO_SHMIOP_Client_Transport::start_request (TAO_ORB_Core *orb_core, TAO_GIOP::Request, output, orb_core) == 0) + ACE_THROW (CORBA::MARSHAL ());*/ + if (this->client_mesg_factory_->write_protocol_header + (TAO_PLUGGABLE_MESSAGE_REQUEST, + output) == 0) ACE_THROW (CORBA::MARSHAL ()); } void -TAO_SHMIOP_Client_Transport::start_locate (TAO_ORB_Core *orb_core, - const TAO_Profile* pfile, - CORBA::ULong request_id, +TAO_SHMIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/, + TAO_Target_Specification &spec, + TAO_Operation_Details &opdetails, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) { - const TAO_SHMIOP_Profile* profile = - ACE_dynamic_cast(const TAO_SHMIOP_Profile*, pfile); - - // Obtain object key. - const TAO_ObjectKey& key = profile->object_key (); - - // @@ This should be implemented in the transport object, which - // would query the profile to obtain the version... - if (TAO_GIOP::start_message (profile->version (), - TAO_GIOP::LocateRequest, - output, - orb_core) == 0) + // See this is GIOP way of doing this..But anyway SHMIOP will be tied + // up with GIOP. + if (this->client_mesg_factory_->write_protocol_header + (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, + output) == 0) ACE_THROW (CORBA::MARSHAL ()); - - - if (TAO_GIOP::write_locate_request_header (request_id, - key, - output) == 0) + + if (this->client_mesg_factory_->write_message_header (opdetails, + TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, + spec, + output) == 0) ACE_THROW (CORBA::MARSHAL ()); } @@ -194,13 +196,12 @@ TAO_SHMIOP_Client_Transport::send_request (TAO_Stub *stub, two_way) == -1) return -1; - if (TAO_GIOP::send_message (this, - stream, - orb_core, - max_wait_time, - stub) == -1) + if (this->client_mesg_factory_->send_message (this, + stream, + max_wait_time, + stub, + two_way) == -1) return -1; - return this->idle_after_send (); } @@ -229,10 +230,10 @@ TAO_SHMIOP_Client_Transport::handle_client_input (int /* block */, return -1; } - int result = TAO_GIOP::handle_input (this, - this->orb_core_, - *message_state, - max_wait_time); + int result = this->client_mesg_factory_->handle_input (this, + this->orb_core_, + *message_state, + max_wait_time); if (result == -1) { if (TAO_debug_level > 0) @@ -246,16 +247,12 @@ TAO_SHMIOP_Client_Transport::handle_client_input (int /* block */, // OK, the complete message is here... - IOP::ServiceContextList reply_ctx; - CORBA::ULong request_id; + TAO_Pluggable_Connector_Params params; CORBA::ULong reply_status; - result = TAO_GIOP::parse_reply (this, - this->orb_core_, - *message_state, - reply_ctx, - request_id, - reply_status); + result = this->client_mesg_factory_->parse_reply (*message_state, + params, + reply_status); if (result == -1) { if (TAO_debug_level > 0) @@ -267,10 +264,10 @@ TAO_SHMIOP_Client_Transport::handle_client_input (int /* block */, } result = - this->tms_->dispatch_reply (request_id, + this->tms_->dispatch_reply (params.request_id, reply_status, message_state->giop_version, - reply_ctx, + params.svc_ctx, message_state); if (result == -1) @@ -310,6 +307,28 @@ TAO_SHMIOP_Client_Transport::register_handler (void) ACE_Event_Handler::READ_MASK); } +void +TAO_SHMIOP_Client_Transport::messaging_init (TAO_Pluggable_Messaging_Interface *mesg) +{ + this->client_mesg_factory_ = mesg; +} + +CORBA::Boolean +TAO_SHMIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails, + TAO_Target_Specification &spec, + TAO_OutputCDR & msg) +{ + // We are going to pass on this request to the underlying messaging + // layer. It should take care of this request + CORBA::Boolean retval = + this->client_mesg_factory_->write_message_header (opdetails, + TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, + spec, + msg); + + return retval; +} + // ********************************************************************* ssize_t @@ -378,4 +397,14 @@ TAO_SHMIOP_Transport::send_request (TAO_Stub *, return -1; } +CORBA::Boolean +TAO_SHMIOP_Transport::send_request_header (TAO_Operation_Details & /**/, + TAO_Target_Specification & /*spec */ , + TAO_OutputCDR & /*msg*/) +{ + // We should never be here. So return an error. + return 0; +} + + #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp index b917c859520..9151bf96840 100644 --- a/TAO/tao/Services.cpp +++ b/TAO/tao/Services.cpp @@ -28,30 +28,30 @@ CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (void) {} CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) TAO_Unbounded_Sequence<CORBA::Octet> #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::Octet> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} CORBA::ServiceDetail::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor @@ -72,7 +72,7 @@ CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_) #define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_ @@ -80,43 +80,43 @@ CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length) { CORBA::ULong* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length); - + if (this->buffer_ != 0) { CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old); - + } this->buffer_ = tmp; } - + void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_); - + CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp); this->buffer_ = 0; - } - + } + CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_ @@ -128,30 +128,30 @@ CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ULong> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor @@ -162,7 +162,7 @@ CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_) #define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_ @@ -170,43 +170,43 @@ CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length) { CORBA::ServiceDetail* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length); - + if (this->buffer_ != 0) { CORBA::ServiceDetail *old = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old); - + } this->buffer_ = tmp; } - + void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + CORBA::ServiceDetail *tmp = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_); - + CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp); this->buffer_ = 0; - } - + } + CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_ @@ -218,30 +218,30 @@ CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ServiceDetail> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max, CORBA::ULong length, CORBA::ServiceDetail *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ServiceDetail> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<CORBA::ServiceDetail> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor @@ -293,7 +293,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_ else { ACE_NEW_RETURN (_tao_elem, CORBA::ServiceDetail, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_ServiceDetail, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -310,7 +311,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_ ACE_CATCHANY { delete _tao_elem; - return 0; + return 0; } ACE_ENDTRY; return 0; @@ -359,7 +360,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformatio else { ACE_NEW_RETURN (_tao_elem, CORBA::ServiceInformation, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (CORBA::_tc_ServiceInformation, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -376,7 +378,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformatio ACE_CATCHANY { delete _tao_elem; - return 0; + return 0; } ACE_ENDTRY; return 0; @@ -390,20 +392,20 @@ ACE_INLINE CORBA::Boolean operator<< ( if (strm << _tao_sequence.length ()) { // encode all elements - + #if defined (TAO_NO_COPY_OCTET_SEQUENCES) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_ServiceDetail::_tao_seq_Octet *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ } return 0; // error @@ -417,11 +419,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_ // set the length of the sequence _tao_sequence.length (_tao_seq_len); // retrieve all the elements - + #if defined (TAO_NO_COPY_OCTET_SEQUENCES) if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE)) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -430,16 +432,16 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_ } else return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); - + #else /* TAO_NO_COPY_OCTET_SEQUENCES */ return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ } return 0; // error } -CORBA::Boolean +CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ServiceDetail &_tao_aggregate) { if ( @@ -449,10 +451,10 @@ operator<< (TAO_OutputCDR &strm, const CORBA_ServiceDetail &_tao_aggregate) return 1; else return 0; - + } -CORBA::Boolean +CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail &_tao_aggregate) { if ( @@ -462,10 +464,10 @@ operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail &_tao_aggregate) return 1; else return 0; - + } -CORBA::Boolean +CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence @@ -479,8 +481,8 @@ operator<< ( return 0; // error } -CORBA::Boolean -operator>> (TAO_InputCDR &strm, +CORBA::Boolean +operator>> (TAO_InputCDR &strm, CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence) { CORBA::ULong _tao_seq_len; @@ -494,7 +496,7 @@ operator>> (TAO_InputCDR &strm, return 0; // error } -CORBA::Boolean +CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence @@ -511,8 +513,8 @@ operator<< ( return 0; // error } -CORBA::Boolean -operator>> (TAO_InputCDR &strm, +CORBA::Boolean +operator>> (TAO_InputCDR &strm, CORBA_ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence) { CORBA::ULong _tao_seq_len; @@ -529,8 +531,8 @@ operator>> (TAO_InputCDR &strm, return 0; // error } -CORBA::Boolean -operator<< (TAO_OutputCDR &strm, +CORBA::Boolean +operator<< (TAO_OutputCDR &strm, const CORBA_ServiceInformation &_tao_aggregate) { if ( @@ -540,10 +542,10 @@ operator<< (TAO_OutputCDR &strm, return 1; else return 0; - + } -CORBA::Boolean operator>> (TAO_InputCDR &strm, +CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceInformation &_tao_aggregate) { if ( @@ -553,6 +555,5 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, return 1; else return 0; - -} +} diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 199dd42e2ae..9e9e0dc2114 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -2,6 +2,7 @@ + // @ (#)iiopobj.cpp 1.9 95/11/04 // Copyright 1995 by Sun Microsystems Inc. // All Rights Reserved @@ -37,6 +38,7 @@ ACE_RCSID(tao, TAO_Stub, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_TAO_Stub_Timeprobe_Description[] = @@ -340,7 +342,9 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV, if (info->is_roundtrip) { - TAO_GIOP_Twoway_Invocation call (this, info->opname, + TAO_GIOP_Twoway_Invocation call (this, + info->opname, + ACE_OS::strlen (info->opname), this->orb_core_); ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR); @@ -485,7 +489,9 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV, } // if (two way) else { - TAO_GIOP_Oneway_Invocation call (this, info->opname, + TAO_GIOP_Oneway_Invocation call (this, + info->opname, + ACE_OS::strlen (info->opname), this->orb_core_); ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR); @@ -617,6 +623,7 @@ TAO_Stub::do_dynamic_call (const char *opname, { TAO_GIOP_Twoway_Invocation call (this, opname, + ACE_OS::strlen (opname), this->orb_core_); // Loop as needed for forwarding; see above. @@ -683,6 +690,7 @@ TAO_Stub::do_dynamic_call (const char *opname, { TAO_GIOP_Oneway_Invocation call (this, opname, + ACE_OS::strlen (opname), this->orb_core_); for (;;) @@ -1161,7 +1169,6 @@ TAO_Stub::sync_strategy (void) if (scope == Messaging::SYNC_DELAYED_BUFFERING) return this->orb_core_->delayed_buffering_sync_strategy (); - } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp index ecd56a9b6f3..11065b3b3d6 100644 --- a/TAO/tao/Sync_Strategies.cpp +++ b/TAO/tao/Sync_Strategies.cpp @@ -3,6 +3,7 @@ + #include "tao/Sync_Strategies.h" #include "tao/Buffering_Constraint_Policy.h" diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp index 2b762d43364..e2aeb8e2539 100644 --- a/TAO/tao/TAO.cpp +++ b/TAO/tao/TAO.cpp @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -18,6 +19,7 @@ ACE_RCSID(tao, TAO, "$Id$") + // constructor TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -307,6 +309,21 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv, } int +TAO_ORB_Manager::fini (CORBA_Environment &ACE_TRY_ENV) +{ + this->poa_->destroy (1, 1, ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + this->poa_ = 0; + + this->orb_->destroy (ACE_TRY_ENV); + ACE_CHECK_RETURN (-1); + + this->orb_ = 0; + return 0; +} + +int TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV) { this->poa_manager_->activate (ACE_TRY_ENV); diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 5481a52e65a..4aca9968af3 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -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. @@ -185,7 +186,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::PrioritySpecificati else { ACE_NEW_RETURN (_tao_elem, TAO::PrioritySpecification, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (TAO::_tc_PrioritySpecification, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -234,7 +236,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::ClientPriorityPolic CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (TAO::_tc_ClientPriorityPolicy, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (TAO::_tc_ClientPriorityPolicy, &_tao_obj_var.out (), 0, ACE_TRY_ENV) @@ -447,7 +450,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint else { ACE_NEW_RETURN (_tao_elem, TAO::BufferingConstraint, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (TAO::_tc_BufferingConstraint, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -496,7 +500,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO::BufferingConstraint CORBA::TypeCode_var type = _tao_any.type (); if (!type->equal (TAO::_tc_BufferingConstraintPolicy, ACE_TRY_ENV)) return 0; // not equal ACE_TRY_CHECK; - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); CORBA::Object_var _tao_obj_var; ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0); if (stream.decode (TAO::_tc_BufferingConstraintPolicy, &_tao_obj_var.out (), 0, ACE_TRY_ENV) diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp index 0e5e142d52d..962f15a80d2 100644 --- a/TAO/tao/TAOS.cpp +++ b/TAO/tao/TAOS.cpp @@ -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/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 2a714a82e4f..a58bb6f8771 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -2,6 +2,7 @@ + #include "tao/TAO_Internal.h" #include "ace/Service_Config.h" #include "ace/Service_Repository.h" @@ -11,9 +12,12 @@ #include "tao/default_resource.h" #include "tao/IIOP_Factory.h" #include "tao/UIOP_Factory.h" +#include "tao/SHMIOP_Factory.h" + ACE_RCSID(tao, TAO_Internal, "$Id$") + int TAO_Internal::service_open_count_ = 0; #if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP) const char *TAO_Internal::resource_factory_args_ = TAO_DEFAULT_RESOURCE_FACTORY_ARGS; @@ -70,6 +74,11 @@ TAO_Internal::open_services (int &argc, ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_UIOP_Protocol_Factory); #endif /* TAO_HAS_UIOP == 1 */ +#if TAO_HAS_SHMIOP == 1 + ACE_Service_Config::static_svcs ()-> + insert (&ace_svc_desc_TAO_SHMIOP_Protocol_Factory); +#endif /* TAO_HAS_UIOP == 1 */ + // add descriptor to list of static objects. int result = 0; diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 7cc9f733ca1..ec2f84b51b3 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -174,7 +174,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::UtcT *&_tao_el else { ACE_NEW_RETURN (_tao_elem, TimeBase::UtcT, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (TimeBase::_tc_UtcT, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { @@ -240,7 +241,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::IntervalT *&_t else { ACE_NEW_RETURN (_tao_elem, TimeBase::IntervalT, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr ()); + TAO_InputCDR stream (_tao_any._tao_get_cdr (), + _tao_any._tao_byte_order ()); if (stream.decode (TimeBase::_tc_IntervalT, _tao_elem, 0, ACE_TRY_ENV) == CORBA::TypeCode::TRAVERSE_CONTINUE) { diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp index c970eb78765..ef7fae8b222 100644 --- a/TAO/tao/Transport_Mux_Strategy.cpp +++ b/TAO/tao/Transport_Mux_Strategy.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Transport_Mux_Strategy.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index ee99cd97eb2..2ae3dcb0cd7 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1,5 +1,6 @@ // $Id$ + // Typecodes essentially consist of just the CDR octets that get // marshaled and unmarshaled, and this code knows how to parse those // octets and answer questions CORBA's TypeCode APIs require. @@ -27,6 +28,7 @@ ACE_RCSID(tao, Typecode, "$Id$") + CORBA_TypeCode::Bounds::Bounds (void) : CORBA_UserException (CORBA::TypeCode::_tc_Bounds) { diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 3260e382e46..f319545e38d 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -2,6 +2,7 @@ + // ============================================================================ // // = LIBRARY @@ -48,6 +49,8 @@ #endif /* TAO_HAS_AMI_POLLER == 1 */ + + ACE_RCSID(tao, Typecode_Constants, "$Id$") diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp index f6f31b7e363..cc5c58d09d5 100644 --- a/TAO/tao/UIOP_Acceptor.cpp +++ b/TAO/tao/UIOP_Acceptor.cpp @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -30,6 +31,7 @@ ACE_RCSID(tao, UIOP_Acceptor, "$Id$") + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>; diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp index 8fc2e28a3ec..e8b4362cea1 100644 --- a/TAO/tao/UIOP_Connect.cpp +++ b/TAO/tao/UIOP_Connect.cpp @@ -1,6 +1,7 @@ // $Id$ + #include "tao/UIOP_Connect.h" #if TAO_HAS_UIOP == 1 @@ -25,6 +26,7 @@ ACE_RCSID(tao, UIOP_Connect, "$Id$") + #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_UIOP_Connect_Timeprobe_Description[] = diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp index f9b7a771aac..f2b2fdef6c6 100644 --- a/TAO/tao/UIOP_Connector.cpp +++ b/TAO/tao/UIOP_Connector.cpp @@ -12,6 +12,7 @@ #include "tao/Environment.h" #include "ace/Auto_Ptr.h" + ACE_RCSID(tao, UIOP_Connector, "$Id$") @@ -455,32 +456,48 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile, if (uiop_profile == 0) return -1; - const ACE_UNIX_Addr &oa = + const ACE_UNIX_Addr &remote_address = uiop_profile->object_addr (); - ACE_Synch_Options synch_options; + TAO_UIOP_Client_Connection_Handler *svc_handler = 0; + int result = 0; + if (max_wait_time != 0) - synch_options.set (ACE_Synch_Options::USE_TIMEOUT, - *max_wait_time); - - TAO_UIOP_Client_Connection_Handler* result; - - // The connect call will set the hint () stored in the Profile - // object; but we obtain the transport in the <result> - // variable. Other threads may modify the hint, but we are not - // affected. - if (this->base_connector_.connect (uiop_profile->hint (), - result, - oa, - synch_options) == -1) - { // Give users a clue to the problem. + { + ACE_Synch_Options synch_options (ACE_Synch_Options::USE_TIMEOUT, + *max_wait_time); + + // The connect call will set the hint () stored in the Profile + // object; but we obtain the transport in the <svc_handler> + // variable. Other threads may modify the hint, but we are not + // affected. + result = this->base_connector_.connect (uiop_profile->hint (), + svc_handler, + remote_address, + synch_options); + } + else + { + // The connect call will set the hint () stored in the Profile + // object; but we obtain the transport in the <svc_handler> + // variable. Other threads may modify the hint, but we are not + // affected. + result = this->base_connector_.connect (uiop_profile->hint (), + svc_handler, + remote_address); + } + + if (result == -1) + { + // Give users a clue to the problem. if (TAO_orbdebug) { - char buffer [MAXPATHLEN + 1]; - profile->addr_to_string (buffer, MAXPATHLEN); + char buffer [MAXNAMELEN * 2]; + profile->addr_to_string (buffer, + (MAXNAMELEN * 2) - 1); ACE_DEBUG ((LM_ERROR, - "(%P|%t) %s:%u, connection to " - "%s failed (%p)\n", + ASYS_TEXT ("(%P|%t) %s:%u, connection to ") + ASYS_TEXT ("%s failed (%p)\n"), __FILE__, __LINE__, buffer, @@ -489,11 +506,11 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile, return -1; } - transport = result->transport (); + transport = svc_handler->transport (); int ret_val = 0; if (lite_flag_) { - ret_val = result->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR, + ret_val = svc_handler->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR, TAO_DEF_GIOP_LITE_MINOR); } else diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp index 09fc3875bed..5e1ae1d8b4e 100644 --- a/TAO/tao/UIOP_Factory.cpp +++ b/TAO/tao/UIOP_Factory.cpp @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + #include "tao/UIOP_Factory.h" #if TAO_HAS_UIOP == 1 @@ -11,6 +12,7 @@ ACE_RCSID(tao, UIOP_Factory, "$Id$") + static const char prefix_[] = "uiop"; TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void) diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp index c1b7d861181..88ab16a5366 100644 --- a/TAO/tao/UIOP_Profile.cpp +++ b/TAO/tao/UIOP_Profile.cpp @@ -2,6 +2,7 @@ // $Id$ + #include "tao/UIOP_Profile.h" #if TAO_HAS_UIOP == 1 @@ -15,6 +16,7 @@ ACE_RCSID(tao, UIOP_Profile, "$Id$") + #if !defined (__ACE_INLINE__) # include "tao/UIOP_Profile.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp index f1fcb8164c3..8b3ffdb0555 100644 --- a/TAO/tao/UIOP_Transport.cpp +++ b/TAO/tao/UIOP_Transport.cpp @@ -3,6 +3,7 @@ + #include "tao/UIOP_Transport.h" #if TAO_HAS_UIOP == 1 @@ -73,7 +74,6 @@ TAO_UIOP_Transport::~TAO_UIOP_Transport (void) // Dequeue messages and delete message blocks. this->dequeue_all (); } - } TAO_UIOP_Handler_Base *& @@ -171,7 +171,7 @@ TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, void TAO_UIOP_Client_Transport::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) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -189,9 +189,7 @@ TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/, output) == 0) ACE_THROW (CORBA::MARSHAL ()); - TAO_Pluggable_Connector_Params params; - params.request_id = request_id; - if (this->client_mesg_factory_->write_message_header (params, + if (this->client_mesg_factory_->write_message_header (opdetails, TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, spec, output) == 0) @@ -331,22 +329,14 @@ TAO_UIOP_Client_Transport::messaging_init (TAO_Pluggable_Messaging_Interface *me } CORBA::Boolean -TAO_UIOP_Client_Transport::send_request_header (const IOP::ServiceContextList & svc_ctx, - CORBA::ULong request_id, - CORBA::Octet response_flags, +TAO_UIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, - const char* opname, TAO_OutputCDR & msg) { - TAO_Pluggable_Connector_Params params; - params.svc_ctx = svc_ctx; - params.request_id = request_id; - params.response_flags = response_flags; - params.operation_name = opname; // We are going to pass on this request to the underlying messaging // layer. It should take care of this request CORBA::Boolean retval = - this->client_mesg_factory_->write_message_header (params, + this->client_mesg_factory_->write_message_header (opdetails, TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, spec, msg); @@ -423,12 +413,10 @@ TAO_UIOP_Transport::send_request (TAO_Stub *, return -1; } + CORBA::Boolean -TAO_UIOP_Transport::send_request_header (const IOP::ServiceContextList & /*svc_ctx*/, - CORBA::ULong /*request_id*/, - CORBA::Octet /*response_flags*/, +TAO_UIOP_Transport::send_request_header (TAO_Operation_Details & /*opdetails*/, TAO_Target_Specification & /*spec*/, - const char* /*opname*/, TAO_OutputCDR & /*msg*/) { // We should never be here. So return an error. diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp index 6037f7bb9c3..7eacefaecb3 100644 --- a/TAO/tao/ValueBase.cpp +++ b/TAO/tao/ValueBase.cpp @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -27,6 +28,7 @@ ACE_RCSID(tao, ValueBase, "$Id$") + // destructor CORBA_ValueBase::~CORBA_ValueBase (void) { diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index 9ad209b0a2e..4f8a4116fff 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Wait_Strategy.h" #include "tao/Pluggable.h" #include "tao/ORB_Core.h" @@ -8,6 +9,7 @@ ACE_RCSID(tao, Wait_Strategy, "$Id$") + // Constructor. TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport) : transport_ (transport) @@ -173,23 +175,28 @@ int TAO_Exclusive_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core, int two_way) { - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, - orb_core->leader_follower ().lock (), -1); + // + // Note that in previous versions of this code, the assignment of + // the following three variables was protected by the + // leader/followers lock. In the case of oneways, these fields are + // not used, so this seems excessive. In the case of twoways, this + // stuff is done before the request is actually sent, therefore, + // there isn't any chance of the leader resetting these fields + // simultaneously. Therefore, the lock has been removed. + // - // The last request may have left this unitialized - this->reply_received_ = 0; + // The last request may have left this unitialized + this->reply_received_ = 0; - // Set the state so that we know we're looking for a response. - this->expecting_response_ = two_way; + // Set the state so that we know we're looking for a response. + this->expecting_response_ = two_way; - // remember in which thread the client connection handler was running - this->calling_thread_ = ACE_Thread::self (); + // remember in which thread the client connection handler was running + this->calling_thread_ = ACE_Thread::self (); - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) - sending request for <%x>\n"), - this->transport_)); - } + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) - sending request for <%x>\n"), + this->transport_)); // Register the handler. this->transport_->register_handler (); diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index b1c39f1f7a0..32f5a4bc665 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -27,6 +28,7 @@ ACE_RCSID(tao, append, "$Id$") + // Encode instances of arbitrary data types based only on typecode. // "data" points to the data type; if it's not a primitve data type, // the TypeCode interpreter is used to recursively encode its @@ -445,7 +447,8 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { CORBA::Long l; - TAO_InputCDR stream (member_label->_tao_get_cdr ()); + TAO_InputCDR stream (member_label->_tao_get_cdr (), + member_label->_tao_byte_order ()); (void)stream.decode (discrim_tc, &l, 0, ACE_TRY_ENV); if (l == *(CORBA::Long *) &discrim_val) discrim_matched = 1; diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 1c24595b7f5..4adf84234b1 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -163,8 +164,8 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, // See TAO_Stub.cpp::do_static_call in which a GIOP_Invocation is // allocated on stack #if 0 - any->cdr_ = ACE_Message_Block::duplicate ((ACE_Message_Block *) - stream->start ()); + any->byte_order_ = stream->byte_order (); + any->cdr_ = ACE_CDR::consolidate (stream->start ()); #endif // one solution is to heap allocate the GIOP_Invocation. However, that // would be bad since not all requests will use Anys. @@ -208,7 +209,10 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, DEEP_FREE (any->type_, any->value_, 0, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - any->cdr_ = ACE_Message_Block::duplicate (out.begin ()); + any->byte_order_ = stream->byte_order (); + ACE_NEW_RETURN (any->cdr_, ACE_Message_Block, + CORBA::TypeCode::TRAVERSE_STOP); + ACE_CDR::consolidate (any->cdr_, out.begin ()); any->value_ = 0; if (any->type_) @@ -798,7 +802,8 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, { CORBA::ULong ul; TAO_InputCDR stream ((ACE_Message_Block *) - member_label->_tao_get_cdr ()); + member_label->_tao_get_cdr (), + member_label->_tao_byte_order ()); (void)stream.decode (discrim_tc.in (), &ul, 0, ACE_TRY_ENV); //@@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)? ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index 39bb3a3b134..816f83f8c3c 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -1,6 +1,7 @@ // ============================================================================ // // $Id$ + // // = LIBRARY // TAO @@ -41,6 +42,7 @@ ACE_RCSID(tao, deep_free, "$Id$") + CORBA::TypeCode::traverse_status DEEP_FREE (CORBA::TypeCode_ptr param, const void *source, @@ -95,11 +97,11 @@ DEEP_FREE (CORBA::TypeCode_ptr param, retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV); // @@ (JP) This takes care of a memory leak we had for recursive unions // and unions that contain an anonymous sequence. For unions that contain - // typedef'd sequences and other cases where the union member is a + // typedef'd sequences and other cases where the union member is a // pointer, we still have leaks. These are not so easy to fix for all // cases. What we need is Carlos' _tao_destroy() method in the stubs. - delete ACE_reinterpret_cast (TAO_Base_Sequence *, - ACE_const_cast (void *, + delete ACE_reinterpret_cast (TAO_Base_Sequence *, + ACE_const_cast (void *, source)); break; case CORBA::tk_array: @@ -186,7 +188,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, } // In case this hasn't been done yet. - source = ptr_align_binary (source, + source = ptr_align_binary (source, tc->alignment (ACE_TRY_ENV)); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); @@ -368,6 +370,8 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, CORBA::TypeCode_var type = member_label->type (); switch (type->kind (ACE_TRY_ENV)) { + // @@ This is not going to work, it assumes that the CDR + // stream is in the same byte order. case CORBA::tk_short: if (*(CORBA::Short *)member_label->_tao_get_cdr ()->base () == *(CORBA::Short *)discrim_val) diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index c889dd18ab9..191a30f8a0f 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/default_client.h" #include "tao/ORB_Core.h" #include "tao/Wait_Strategy.h" @@ -11,6 +12,7 @@ ACE_RCSID(tao, default_client, "$Id$") + TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) : profile_lock_type_ (TAO_THREAD_LOCK), cached_connector_lock_type_ (TAO_THREAD_LOCK) diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index d2a5c3c96c2..c60881094f2 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/default_resource.h" #include "tao/Client_Strategy_Factory.h" #include "tao/Server_Strategy_Factory.h" @@ -7,6 +8,7 @@ #include "tao/debug.h" #include "tao/IIOP_Factory.h" #include "tao/UIOP_Factory.h" +#include "tao/SHMIOP_Factory.h" #include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" #include "tao/Single_Reactor.h" @@ -29,6 +31,7 @@ ACE_RCSID(tao, default_resource, "$Id$") + TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) : use_tss_resources_ (0), use_locked_data_blocks_ (1), @@ -335,12 +338,29 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) // You do *NOT* need modify this code to add your own protocol, // instead simply add the following to your svc.conf file: // - // dynamic PN_Factory Service_Object * LIB:_make_PN_Protocol_Factory() "" - // static Resource_Factory "-ORBProtocolFactory PN_Factory" + // dynamic PP_Factory Service_Object * LIB:_make_PP_Protocol_Factory() "" + // static Resource_Factory "-ORBProtocolFactory PP_Factory" + // + // where "PP_Factory" is the name of your protocol, i.e. the + // second argument passed to the ACE_STATIC_SVC_DEFINE macro: // - // where PN is the name of your protocol and LIB is the base - // name of the shared library that implements the protocol. + // ACE_STATIC_SVC_DEFINE (PP_Protocol_Factory, + // ASYS_TEXT ("PP_Factory"), ...) // + // "PP_Protocol_Factory" is the name of your protocol factory + // class. A "_make_" is prepended to your protocol factory + // class name by the ACE_FACTORY_DECLARE macro. The resulting + // factory function "_make_PP_Protocol_Factory()" is what should + // be used in the "dynamic" line in your svc.conf file. + // + // LIB is the base name of the shared library that implements + // the protocol. The directory containing your library must be + // in your library search path, typically defined by the + // LD_LIBRARY_PATH environment variable on UNIX systems, and/or + // the `/etc/ld.so.conf' file on some UNIX systems. Remember to + // run "ldconfig" if you modify `/etc/ld.so.conf'. + + TAO_Protocol_Factory *protocol_factory = 0; TAO_Protocol_Item *item = 0; @@ -421,6 +441,45 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) "TAO (%P|%t) Loaded default protocol <UIOP_Factory>\n")); } #endif /* TAO_HAS_UIOP == 1 */ + +#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) + protocol_factory = + ACE_Dynamic_Service<TAO_Protocol_Factory>::instance ("SHMIOP_Factory"); + + if (protocol_factory == 0) + { + if (TAO_orbdebug) + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "SHMIOP Protocol Factory")); + + ACE_NEW_RETURN (protocol_factory, + TAO_SHMIOP_Protocol_Factory, + -1); + } + + ACE_NEW_RETURN (item, TAO_Protocol_Item ("SHMIOP_Factory"), -1); + item->factory (protocol_factory); + + if (this->protocol_factories_.insert (item) == -1) + { + delete item; + delete protocol_factory; + + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) Unable to add " + "<%s> to protocol factory set.\n", + item->protocol_name ().c_str ()), + -1); + } + + if (TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) Loaded default protocol <SHMIOP_Factory>\n")); + } +#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ return 0; } diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index bb0a10ddde2..01e5b156491 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/default_server.h" #include "tao/ORB_Core.h" @@ -9,6 +10,7 @@ ACE_RCSID(tao, default_server, "$Id$") + TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index e5f1cbf6c32..8157b33905f 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -510,7 +510,8 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { CORBA::ULong ul; - TAO_InputCDR stream (member_label->_tao_get_cdr ()); + TAO_InputCDR stream (member_label->_tao_get_cdr (), + member_label->_tao_byte_order ()); (void)stream.decode (discrim_tc.in (), &ul, 0, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (ul == *(CORBA::ULong *) discrim_val) diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp new file mode 100644 index 00000000000..448b80e3a57 --- /dev/null +++ b/TAO/tao/operation_details.cpp @@ -0,0 +1,6 @@ +//$Id$ +#include "tao/operation_details.h" + +#if !defined (__ACE_INLINE__) +# include "tao/operation_details.i" +#endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 6548cb3e8ad..d67c3e46e94 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/params.h" #if !defined (__ACE_INLINE__) @@ -9,6 +10,7 @@ ACE_RCSID(tao, params, "$Id$") + TAO_ORB_Parameters::TAO_ORB_Parameters (void) : preconnects_list_ (), endpoints_list_ (), diff --git a/TAO/tao/rtcorbafwd.cpp b/TAO/tao/rtcorbafwd.cpp index 9c2398619f2..e262c728a1a 100644 --- a/TAO/tao/rtcorbafwd.cpp +++ b/TAO/tao/rtcorbafwd.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/rtcorbafwd.h" #if (TAO_HAS_RT_CORBA == 1) @@ -10,6 +11,7 @@ ACE_RCSID(tao, rtcorbafwd, "$Id$") + TAO_NAMESPACE_TYPE (const RTCORBA::Priority) TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const RTCORBA::Priority, minPriority, 0) diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index bdcabc99e1b..c62af842fd9 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -27,6 +28,7 @@ ACE_RCSID(tao, skip, "$Id$") + CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, void *context, @@ -441,7 +443,8 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, case CORBA::tk_enum: { CORBA::ULong ul; - TAO_InputCDR stream (member_label->_tao_get_cdr ()); + TAO_InputCDR stream (member_label->_tao_get_cdr (), + member_label->_tao_byte_order ()); (void)stream.decode (discrim_tc.in (), &ul, 0, ACE_TRY_ENV); if (ul == *(CORBA::ULong *) &discrim_val) discrim_matched = 1; diff --git a/TAO/tao/target_identifier.cpp b/TAO/tao/target_identifier.cpp index eca96906319..536aed72317 100644 --- a/TAO/tao/target_identifier.cpp +++ b/TAO/tao/target_identifier.cpp @@ -2,12 +2,6 @@ #include "tao/target_identifier.h" #if !defined (__ACE_INLINE__) -#include "target_identfier.i" +#include "target_identifier.i" #endif /* !defined INLINE */ -TAO_Target_Specification::TAO_Target_Specification (void) - :specifier_ (TAO_Target_Specification::Key_Addr), - profile_index_ (0) -{ - //no-op -} |