diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-01-11 23:54:32 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-01-11 23:54:32 +0000 |
| commit | 8d842ae794433b33abea5c236bf732f1f656d070 (patch) | |
| tree | 1ddd70b11f24940ebf318e356ea5b3bdde06175c | |
| parent | d57c0d80b5a61b7dc1eb0ec0274032c4d493c7ce (diff) | |
| download | ATCD-8d842ae794433b33abea5c236bf732f1f656d070.tar.gz | |
Merged version with TAO1_.0.12
47 files changed, 511 insertions, 388 deletions
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index a2a37f7595f..b6c5d654496 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -41,10 +41,8 @@ class TAO_Stub; class TAO_Profile; class TAO_MProfile; -typedef ACE_Unbounded_Set<TAO_Acceptor*> - TAO_AcceptorSet; -typedef ACE_Unbounded_Set_Iterator<TAO_Acceptor*> - TAO_AcceptorSetItor; + +typedef TAO_Acceptor** TAO_AcceptorSetIterator; class TAO_Export TAO_Acceptor_Registry { @@ -66,7 +64,7 @@ public: // Default destructor. int open (TAO_ORB_Core *orb_core, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); // Initialize all registered acceptors. Return -1 on error. @@ -86,8 +84,8 @@ public: // corresponds to a collocated object. // = Iterator. - TAO_AcceptorSetItor begin (void); - TAO_AcceptorSetItor end (void); + TAO_AcceptorSetIterator begin (void); + TAO_AcceptorSetIterator end (void); private: int open_default (TAO_ORB_Core *orb_core, @@ -100,8 +98,11 @@ private: // Create a default acceptor using the specified protocol factory. private: - TAO_AcceptorSet acceptors_; + TAO_Acceptor **acceptors_; // List of acceptors that are currently open. + + size_t size_; + // Number of acceptors that are currently open. }; #if defined(__ACE_INLINE__) diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 9c010470e85..01c672e1181 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -173,16 +173,19 @@ public: CORBA::Boolean operator>>= (CORBA::Double&) const; // extract a double - CORBA::Boolean operator>>= (CORBA_Any&) const; + CORBA::Boolean operator>>= (CORBA_Any&) const; // non-spec + CORBA::Boolean operator>>= (const CORBA_Any*&) const; // extract an Any CORBA::Boolean operator>>= (CORBA::TypeCode_ptr&) const; // extract a TypeCode - CORBA::Boolean operator>>= (char*&) const; + CORBA::Boolean operator>>= (char*&) const; // deperecated + CORBA::Boolean operator>>= (const char*&) const; // extract an unbounded string - CORBA::Boolean operator>>= (CORBA::WChar*&) const; + CORBA::Boolean operator>>= (CORBA::WChar*&) const; // deprecated + CORBA::Boolean operator>>= (const CORBA::WChar*&) const; // extract an unbounded wide string // = Special types. @@ -235,7 +238,7 @@ public: // This one's not in ACE. struct TAO_Export to_object { - // This signature reflects the change seet out in + // This signature reflects the change set out in // issue 154 of the 1.3 RTF. to_object (CORBA_Object_out obj); CORBA::Object_ptr &ref_; diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 4532c73b303..51754a07423 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -29,9 +29,9 @@ #include "tao/MessagingC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation { @@ -81,9 +81,9 @@ private: // Reply dispatcher for the current synchronous Asynch_Invocation. }; -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ //*********************************************************************** diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index 5e54d8503a6..b2e6267b677 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // // ============================================================================ // @@ -26,7 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/TAOS.h" @@ -89,10 +90,10 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ - #if defined (__ACE_INLINE__) #include "tao/Buffering_Constraint_Policy.i" #endif /* __ACE_INLINE__ */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + #endif /* TAO_BUFFERING_CONSTRAINT_POLICY_H */ diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 0eb9c96c85f..a3e92f1f56b 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -1,4 +1,5 @@ // $Id$ + // // ================================================================ // diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 1c65c121432..5d474926348 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -41,12 +41,8 @@ class TAO_Stub; class TAO_MProfile; class TAO_Resource_Factory; -typedef ACE_Unbounded_Set<TAO_Connector*> - TAO_ConnectorSet; - -typedef ACE_Unbounded_Set_Iterator<TAO_Connector*> - TAO_ConnectorSetItor; +typedef TAO_Connector** TAO_ConnectorSetIterator; class TAO_Export TAO_Connector_Registry { @@ -78,7 +74,7 @@ public: // Close all open connectors. int preconnect (TAO_ORB_Core *orb_core, - TAO_PreconnectSet &preconnections); + TAO_EndpointSet &preconnections); // For this list of preconnections call the connector specific // preconnect method for each preconnection. @@ -107,15 +103,27 @@ public: int purge_connections (void); // Purge "old" connections. #endif /* TAO_USES_ROBUST_CONNECTION_MGMT */ + + // = Iterator. + TAO_ConnectorSetIterator begin (void); + TAO_ConnectorSetIterator end (void); + private: int preprocess_preconnects (TAO_ORB_Core *orb_core, - TAO_PreconnectSet &preconnects); + TAO_EndpointSet &preconnects); // Put the preconnects in a form that makes it simple for protocol // implementers to parse. private: - TAO_ConnectorSet connectors_; - // list of connectors currently open. + TAO_Connector** connectors_; + // List of connectors that are currently open. + + size_t size_; + // Number of connectors that are currently open. }; +#if defined(__ACE_INLINE__) +#include "tao/Connector_Registry.i" +#endif /* __ACE_INLINE__ */ + #endif /* TAO_CONNECTOR_REGISTRY_H */ diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 9d96865b014..41f5d45b087 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 1363580887c..6b181b16677 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/GIOP_Message_Accept_State.h b/TAO/tao/GIOP_Message_Accept_State.h index 1d9e989819e..b6576e18684 100644 --- a/TAO/tao/GIOP_Message_Accept_State.h +++ b/TAO/tao/GIOP_Message_Accept_State.h @@ -9,7 +9,7 @@ // GIOP_Message_Acceptors.h // // = DESCRIPTION -// +// Interface for the different accept states // // = AUTHOR // Balachandran Natarajan <bala@cs.wustl.edu> @@ -23,8 +23,13 @@ class TAO_GIOP_Message_Accept_State { // = TITLE + // TAO_GIOP_Message_Accept_State + // // = DESCRIPTION - public: + // An abstract base class for different versions of GIOP. This is + // similar to the base class in the strategy pattern + // +public: virtual int parse_request_header (TAO_GIOP_ServerRequest &) = 0; // Parse the Request Header from the incoming stream. This will do a @@ -32,6 +37,7 @@ class TAO_GIOP_Message_Accept_State virtual CORBA::Boolean write_reply_header (TAO_OutputCDR &output, CORBA::ULong request_id) = 0; + // Write the reply header in to <output> virtual int parse_locate_header (TAO_GIOP_Locate_Request_Header &) = 0; // Parse the Loacte Request Header from the incoming stream. This will do a @@ -41,18 +47,22 @@ class TAO_GIOP_Message_Accept_State write_locate_reply_mesg (TAO_OutputCDR &output, CORBA::ULong request_id, TAO_GIOP_Locate_Status_Msg &status) = 0; + // Writes the locate _reply message in to the <output> virtual CORBA::Octet major_version (void) = 0; virtual CORBA::Octet minor_version (void) = 0; + // Our versions + private: - }; class TAO_GIOP_Message_Accept_State_11 : public TAO_GIOP_Message_Accept_State { // = TITLE + // TAO_GIOP_Message_Accept_State_11 // = DESCRIPTION + // public: virtual int parse_request_header (TAO_GIOP_ServerRequest &); @@ -62,6 +72,7 @@ public: virtual CORBA::Boolean write_reply_header (TAO_OutputCDR &output, CORBA::ULong request_id); + // Write the version specific reply header in to <output> virtual int parse_locate_header (TAO_GIOP_Locate_Request_Header &); // Parse the Loacte Request Header from the incoming stream. This will do a @@ -71,10 +82,12 @@ public: write_locate_reply_mesg (TAO_OutputCDR &output, CORBA::ULong request_id, TAO_GIOP_Locate_Status_Msg &status); + // Writes the locate reply message in to <output> virtual CORBA::Octet major_version (void); virtual CORBA::Octet minor_version (void); - + // Our versions + private: }; diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 392e25afab7..b284df40f28 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -61,7 +61,8 @@ public: int send_message (TAO_Transport *transport, TAO_OutputCDR &stream, ACE_Time_Value *max_wait_time = 0, - TAO_Stub *stub = 0); + TAO_Stub *stub = 0, + int two_way = 1); // Sends the encapsulated stream in <stream> on to the transport virtual int parse_reply (TAO_Message_State_Factory &mesg_state, diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index 35399402e5c..513090cb1f3 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -45,7 +46,8 @@ class TAO_Export TAO_IIOP_Profile : public TAO_Profile // This class defines the IIOP profile as specified in the CORBA // specification. public: - static const char object_key_delimiter; + static const char object_key_delimiter_; + virtual char object_key_delimiter (void) const; // The object key delimiter that IIOP uses or expects. static const char *prefix (void); diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 4e52d555451..d644903f0bc 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -1,6 +1,8 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -65,6 +67,7 @@ public: virtual ACE_HANDLE handle (void); virtual ACE_Event_Handler *event_handler (void); virtual ssize_t send (TAO_Stub *stub, + int two_way, const ACE_Message_Block *mblk, const ACE_Time_Value *s = 0); virtual ssize_t send (const ACE_Message_Block *mblk, diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index a5512933cac..80101595c52 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // // $Id$ + // // ================================================================ // diff --git a/TAO/tao/IOR_LookupTable.h b/TAO/tao/IOR_LookupTable.h index 7bbc6628605..73f72837138 100644 --- a/TAO/tao/IOR_LookupTable.h +++ b/TAO/tao/IOR_LookupTable.h @@ -29,6 +29,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class TAO_Export TAO_IOR_LookupTable_Callback +{ +public: + virtual int find_ior (const ACE_CString &object_name, + ACE_CString &ior); +}; + class TAO_Export TAO_IOR_LookupTable { // Represents a table for the IOR lookups, given the object keys. A @@ -62,6 +69,10 @@ public: // Locate <object_name> and pass out parameter via <ior>. If the IOR is // found, return 0. Return -1 if not found. + void register_callback (TAO_IOR_LookupTable_Callback *callback, + int delete_callback = 0); + // Registers a callback class with the lookup table. + CORBA_ORB_ObjectIdList_ptr list_initial_services ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Returns a sequence of ObjectIds that lists which objects have @@ -74,6 +85,12 @@ public: private: TAO_IOR_Map table_; // Maintains the table of object_names -> IORs. + + TAO_IOR_LookupTable_Callback *callback_; + // The callback class that table can also use to find IORs. + + int delete_callback_; + // If true, means delete the callback_. }; #endif /* TAO_IOR_LOOKUPTABLE_H */ diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h index 037489c6191..d27576fa570 100644 --- a/TAO/tao/InterfaceC.h +++ b/TAO/tao/InterfaceC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ //$Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. @@ -18,7 +19,7 @@ #include "tao/Sequence_T.h" #include "tao/varout.h" -#if defined TAO_HAS_INTERFACE_REPOSITORY +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -8543,5 +8544,5 @@ operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &); #pragma warning(pop) #endif /* _MSC_VER */ -#endif /*TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index e398337c0d4..19ab178d042 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -1,3 +1,4 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index 2a2bb22ee30..9f14b0e9f8a 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -23,12 +23,12 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) #include "tao/ValueBase.h" #include "tao/ValueFactory.h" -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ #include "tao/corbafwd.h" @@ -84,9 +84,6 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - // = TAO specific extension. - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_FLUSH; - typedef CORBA::Short RoutingType; typedef CORBA::Short_out RoutingType_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingType; @@ -1562,7 +1559,7 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES; -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) // valuetype class class ExceptionHolder; @@ -1894,9 +1891,9 @@ TAO_NAMESPACE Messaging TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler; -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Poller; typedef Poller *Poller_ptr; @@ -2013,12 +2010,12 @@ TAO_NAMESPACE Messaging }; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ } TAO_NAMESPACE_CLOSE // module Messaging -#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) TAO_NAMESPACE OBV_Messaging { @@ -2064,7 +2061,7 @@ TAO_NAMESPACE OBV_Messaging } TAO_NAMESPACE_CLOSE -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ // Typedef for the Reply Handler Skeleton. // This is handcrafted not generated by the IDL compiler. @@ -2087,7 +2084,7 @@ enum TAO_AMI_Reply_Status }; -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, @@ -2095,7 +2092,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)( CORBA::ULong reply_status, CORBA::Environment & ); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ TAO_Export void operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PriorityRange *&); @@ -2111,22 +2108,24 @@ TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); / TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) extern TAO_Export Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj); + CORBA::Object_ptr obj); // Any operators for interface Messaging::ReplyHandler TAO_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ + -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) // Any operators for interface Messaging::Poller TAO_Export void operator<<= (CORBA::Any &, Messaging::Poller_ptr); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::Poller *&); -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ + #ifndef __ACE_INLINE__ @@ -2141,16 +2140,16 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue::_t TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &); -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &); -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #endif @@ -2166,6 +2165,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Poller_ptr &); #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_IDL_MESSAGINGC_H */ diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index 69e4e0886bc..c99da0a5e34 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -13,7 +13,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/TimeBaseS.h" #include "tao/POA_CORBA.h" @@ -204,10 +204,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - virtual Messaging::SyncScope synchronization ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + virtual Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV); + virtual Messaging::SyncScope synchronization (void); private: SyncScopePolicy_ptr servant_; @@ -247,10 +245,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - Messaging::SyncScope synchronization ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV); + Messaging::SyncScope synchronization (void); CORBA::PolicyType policy_type ( CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () @@ -1019,10 +1015,11 @@ private: virtual void* _downcast ( const char* logical_type_id ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; + virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV) = 0; + // Hacky TAO extension to reduce call to + // CORBA::Environment::default_environment () since this method + // will never raise exceptions. + virtual TimeBase::TimeT relative_expiry (void) = 0; Messaging::RelativeRequestTimeoutPolicy *_this ( CORBA::Environment &ACE_TRY_ENV = @@ -1051,10 +1048,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); + virtual TimeBase::TimeT relative_expiry (void); private: RelativeRequestTimeoutPolicy_ptr servant_; @@ -1094,10 +1089,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); + TimeBase::TimeT relative_expiry (void); CORBA::PolicyType policy_type ( CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () @@ -1140,10 +1133,11 @@ private: virtual void* _downcast ( const char* logical_type_id ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ) = 0; + virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV) = 0; + // Hacky TAO extension to reduce call to + // CORBA::Environment::default_environment () since this method + // will never raise exceptions. + virtual TimeBase::TimeT relative_expiry (void) = 0; Messaging::RelativeRoundtripTimeoutPolicy *_this ( CORBA::Environment &ACE_TRY_ENV = @@ -1172,10 +1166,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); + virtual TimeBase::TimeT relative_expiry (void); private: RelativeRoundtripTimeoutPolicy_ptr servant_; @@ -1215,10 +1207,8 @@ private: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); + TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); + TimeBase::TimeT relative_expiry (void); CORBA::PolicyType policy_type ( CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () @@ -1606,7 +1596,7 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -#if defined (TAO_HAS_AMI_CALLBACK) +#if (TAO_HAS_AMI_CALLBACK == 1) class ReplyHandler; typedef ReplyHandler *ReplyHandler_ptr; @@ -1745,9 +1735,9 @@ private: #endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_HAS_AMI_CALLBACK */ +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Poller; typedef Poller *Poller_ptr; @@ -1897,12 +1887,6 @@ private: CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; - virtual void _dispatch ( - CORBA::ServerRequest &_tao_req, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); }; class TAO_Export _tao_collocated_Poller : public virtual Messaging::Poller, @@ -2036,7 +2020,7 @@ private: }; #endif /* ACE_HAS_USING_KEYWORD */ -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ } TAO_NAMESPACE_CLOSE @@ -2051,6 +2035,6 @@ TAO_NAMESPACE_CLOSE #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_IDL_MESSAGINGS_H */ diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index 4d2327be021..828e9910931 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // // ============================================================================ // @@ -22,7 +23,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/MessagingS.h" @@ -33,8 +34,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public TAO_RefCountServantBase, - public POA_Messaging::RelativeRoundtripTimeoutPolicy +class TAO_Export TAO_RelativeRoundtripTimeoutPolicy : public TAO_RefCountServantBase, + public POA_Messaging::RelativeRoundtripTimeoutPolicy { // = TITLE // Messaging::RelativeRoundtripTimeoutPolicy implementation @@ -44,42 +45,36 @@ class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public TAO_RefCountServa // request. // public: - TAO_RelativeRoundtripTimeoutPolicy_i (PortableServer::POA_ptr poa, - const TimeBase::TimeT& relative_expiry); + TAO_RelativeRoundtripTimeoutPolicy (PortableServer::POA_ptr poa, + const TimeBase::TimeT& relative_expiry); // Constructor. - TAO_RelativeRoundtripTimeoutPolicy_i (const TAO_RelativeRoundtripTimeoutPolicy_i &rhs); + TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs); // Copy constructor. - static CORBA::Policy_ptr create ( - PortableServer::POA_ptr poa, - const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + static CORBA::Policy_ptr create (PortableServer::POA_ptr poa, + const CORBA::Any& val, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of // CORBA::ORB::create_policy. - virtual TAO_RelativeRoundtripTimeoutPolicy_i *clone (void) const; + virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; // Returns a copy of <this>. // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment () - ); - virtual CORBA::PolicyType policy_type ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - virtual CORBA::Policy_ptr copy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - virtual void destroy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); - virtual PortableServer::POA_ptr _default_POA ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ); + virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV); + virtual TimeBase::TimeT relative_expiry (void); + + virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + + virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + + virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + + void set_time_value (ACE_Time_Value &time_value); + // Change the CORBA representation to the ACE representation. private: PortableServer::POA_var poa_; @@ -149,6 +144,6 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_MESSAGING_POLICY_I_H */ diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index b7171784851..dae86fbce06 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -487,7 +488,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); -#if defined (TAO_HAS_INTERFACE_REPOSITORY) +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) //Methods added for Philipe Merle for CORBA Script.. CORBA_TypeCode_ptr create_interface_tc (const char * id, const char * name, @@ -607,12 +608,12 @@ public: // Returns a sequence of ObjectIds that lists which objects have // references available via the initial references mechanism. -#if defined(TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ---------------------------------------------------------------- // = TAO-specific extensions to the CORBA specification. @@ -633,6 +634,10 @@ public: CORBA::Object_ptr &obj); // Find the given ObjectID in the table. + void _tao_register_IOR_table_callback (TAO_IOR_LookupTable_Callback *callback, + int delete_callback); + // Registers a new callback class with the table + CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV, const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, @@ -889,10 +894,4 @@ operator>> (istream &, CORBA::WString_out &); # include "tao/ORB.i" #endif /* __ACE_INLINE__ */ -#if defined (_MSC_VER) -// @@ NW: Disable messing with alignment for now. -// VC++, goes back to other padding rules -//# pragma pack (pop) -#endif /* _MSV_VER */ - #endif /* TAO_ORB_H */ diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 14e6b7cdc17..0130f38df11 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -30,6 +31,7 @@ #include "tao/POAC.h" + #include "ace/Map_Manager.h" #include "ace/Singleton.h" @@ -53,12 +55,11 @@ class TAO_Reactor_Registry; class TAO_Leader_Follower; class TAO_Priority_Mapping; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class TAO_None_Sync_Strategy; -class TAO_Flush_Sync_Strategy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ class TAO_Transport_Sync_Strategy; @@ -306,7 +307,8 @@ public: // on the heap and/or as class members; we need to investigate the // tradeoffs and take a decision. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) + TAO_Policy_Manager *policy_manager (void); // Return the Policy_Manager for this ORB. @@ -323,7 +325,7 @@ public: // type. // If there is no default policy it returns CORBA::Policy::_nil () - TAO_RelativeRoundtripTimeoutPolicy_i *default_relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *default_relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *default_client_priority (void) const; @@ -331,35 +333,33 @@ public: TAO_Buffering_Constraint_Policy *default_buffering_constraint (void) const; -#endif /* TAO_HAS_CORBA_MESSAGING */ - -#if defined (TAO_HAS_CORBA_MESSAGING) - TAO_None_Sync_Strategy &none_sync_strategy (void); // This strategy will buffer messages. - TAO_Flush_Sync_Strategy &flush_sync_strategy (void); - // This strategy will flush any buffered messages. + TAO_RelativeRoundtripTimeoutPolicy *stubless_relative_roundtrip_timeout (void); + // Access to the RoundtripTimeoutPolicy policy set on the thread or + // on the ORB. In this method, we do not consider the stub since we + // do not have access to it. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy &transport_sync_strategy (void); // This strategy will sync with the transport. -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) TAO_Priority_Mapping *priority_mapping (void); // Access the priority mapping class, this is a TAO extension but // there is no standard way to get to it either. -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ int get_thread_priority (CORBA::Short &priority); int set_thread_priority (CORBA::Short priority); // Accessor and modifier to the current thread priority, used to // implement the RTCORBA::Current interface, but it is faster for // some critical components. - // If TAO_HAS_RT_CORBA is not defined the operations are noops. + // If TAO_HAS_RT_CORBA == 0, the operations are noops. TAO_ORB_Core_TSS_Resources* get_tss_resources (void); // Obtain the TSS resources of this orb. @@ -406,6 +406,10 @@ public: const char *orbid (void) const; // Return ORBid string. + CORBA::Object_ptr implrepo_service (void); + void implrepo_service (const CORBA::Object_ptr ir); + // Set/Get the IOR of the Implementation Repository service. + protected: int set_iiop_endpoint (int dotted_decimal_addresses, CORBA::UShort port, @@ -456,6 +460,13 @@ protected: TAO_ProtocolFactorySet *protocol_factories_; // Pointer to the list of protocol loaded into this ORB instance. + CORBA::Object_ptr implrepo_service_; + // The cached IOR for the Implementation Repository. + // @@ If this is a _var, where should it get deleted? (brunsch) + + int use_implrepo_; + // Flag for whether the implrepo support is enabled or not. + CORBA::ORB_var orb_; // @@ Should we keep a single ORB pointer? This is good because // multiple calls to ORB_init() with the same ORBid can use the @@ -514,7 +525,7 @@ protected: CORBA::ULong collocation_strategy_; // Default collocation policy. This should never be ORB_CONTROL. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager_; // The Policy_Manager for this ORB. @@ -523,7 +534,7 @@ protected: TAO_Policy_Current *policy_current_; // Policy current. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_POA_Current *poa_current_; // POA current. @@ -580,15 +591,12 @@ protected: TAO_Priority_Mapping *priority_mapping_; // The priority mapping. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_None_Sync_Strategy *none_sync_strategy_; // This strategy will buffer messages. - TAO_Flush_Sync_Strategy *flush_sync_strategy_; - // This strategy will flush any buffered messages. - -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy *transport_sync_strategy_; // This strategy will sync with the transport. @@ -662,14 +670,14 @@ public: // If the user (or library) provides no environment the ORB_Core // still holds one. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Current_Impl initial_policy_current_; // The initial PolicyCurrent for this thread. Should be a TSS // resource. TAO_Policy_Current_Impl *policy_current_; // This pointer is reset by the POA on each upcall. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ }; // @@ Must go away.... diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 2eb119c84b0..6569fead04c 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -125,7 +125,7 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = @@ -152,7 +152,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ virtual CORBA::ULong _hash (CORBA::ULong maximum, CORBA_Environment &ACE_TRY_ENV = diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h index 514fdcba836..5c3b871af7f 100644 --- a/TAO/tao/ObjectIDList.h +++ b/TAO/tao/ObjectIDList.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 9f5984acd67..b96ec311aa8 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -1,4 +1,5 @@ // $Id$ + // // ============================================================================ // @@ -270,7 +271,7 @@ TAO_NAMESPACE PortableServer{ SINGLE_THREAD_MODEL }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) typedef ThreadPolicyValue &ThreadPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue; @@ -374,7 +375,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicy; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ enum LifespanPolicyValue { @@ -709,7 +710,7 @@ TAO_NAMESPACE PortableServer{ NO_IMPLICIT_ACTIVATION }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; @@ -815,7 +816,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ enum ServantRetentionPolicyValue { @@ -823,7 +824,7 @@ TAO_NAMESPACE PortableServer{ NON_RETAIN }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; @@ -929,7 +930,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ enum RequestProcessingPolicyValue { @@ -938,7 +939,7 @@ TAO_NAMESPACE PortableServer{ USE_SERVANT_MANAGER }; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; @@ -1044,7 +1045,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_) #define _PORTABLESERVER_POAMANAGER___PTR_CH_ @@ -1164,13 +1165,13 @@ TAO_NAMESPACE PortableServer{ virtual void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -1192,7 +1193,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POAManager; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_ @@ -1586,7 +1587,7 @@ TAO_NAMESPACE PortableServer{ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantLocator; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ @@ -1697,7 +1698,7 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_ @@ -1736,7 +1737,7 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_ @@ -1818,7 +1819,7 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) #if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_) #define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_ @@ -1857,7 +1858,7 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_ @@ -2085,29 +2086,29 @@ TAO_NAMESPACE PortableServer{ virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) virtual AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; @@ -2116,7 +2117,7 @@ TAO_NAMESPACE PortableServer{ virtual Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; @@ -2298,7 +2299,7 @@ TAO_NAMESPACE_CLOSE // POA's policies. -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); @@ -2307,7 +2308,7 @@ operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicy_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicy_ptr &); -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); @@ -2328,7 +2329,7 @@ operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicy_ptr ); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicy_ptr &); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); @@ -2349,20 +2350,20 @@ operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicy_ptr ) TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicy_ptr &); -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ // POA's exceptions. TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterInactive &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterInactive*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::AdapterInactive *&); -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version @@ -2371,13 +2372,13 @@ TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPol TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); -#if !defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_MINIMUM_POA == 0) TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); -#endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* TAO_HAS_MINIMUM_POA == 0 */ TAO_Export void operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version TAO_Export void operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index bf8c98a3036..a1b9f1ba5f3 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -39,9 +39,9 @@ #include "tao/DynAnyC.h" #include "tao/DomainC.h" #include "tao/Servant_Base.h" -#if defined(TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) #include "tao/PollableC.h" -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -424,7 +424,7 @@ public: // **************************************************************** -#if defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_AMI_POLLER == 1) class Pollable; typedef Pollable *Pollable_ptr; @@ -763,7 +763,7 @@ public: private: PollableSet_ptr servant_; }; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ // **************************************************************** diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index 5bc1d6dd2e8..acd0282eefd 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -1,5 +1,7 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -53,11 +55,11 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Transport_Buffering_Queue; class TAO_Export TAO_Transport { // = TITLE - // Generic definitions for the new Transport class. + // Generic definitions for the Transport class. // // = DESCRIPTION // The transport object is created in the Service handler - // constructor and deleted in the service handlers destructor!! + // constructor and deleted in the Service Handler's destructor!! public: TAO_Transport (CORBA::ULong tag, @@ -70,7 +72,7 @@ public: CORBA::ULong tag (void) const; // The tag, each concrete class will have a specific tag value. - virtual void close_connection() = 0; + virtual void close_connection (void) = 0; // Call the corresponding connection handler's <close> // method. @@ -86,6 +88,7 @@ public: // handler used by the reactor. virtual ssize_t send (TAO_Stub *stub, + int two_way, const ACE_Message_Block *mblk, const ACE_Time_Value *s = 0) = 0; virtual ssize_t send (const ACE_Message_Block *mblk, @@ -168,8 +171,8 @@ public: // Strategy if Reactor is used for that strategy. Default // implementation out here returns -1 setting <errno> to ENOTSUP. - // = Setting the Transport object in Idle state. Theese methods are - // routed the TMS object. The TMS starategies implement the + // = Setting the Transport object in Idle state. These methods are + // routed through the TMS object. The TMS strategies implement the // methods accordingly. virtual int idle_after_send (void); @@ -204,6 +207,13 @@ protected: void reset_queued_message (ACE_Message_Block *message_block, size_t bytes_delivered); + void reset_sent_message (ACE_Message_Block *message_block, + size_t bytes_delivered); + + void reset_message (ACE_Message_Block *message_block, + size_t bytes_delivered, + int queued_message); + CORBA::ULong tag_; // IOP protocol tag. diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index 9a916317d5b..b6c29df989b 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -48,7 +48,8 @@ public: virtual int send_message (TAO_Transport *transport, TAO_OutputCDR &stream, ACE_Time_Value *max_wait_time = 0, - TAO_Stub *stub = 0) = 0; + TAO_Stub *stub = 0, + int two_way = 1) = 0; // This is a complement of the previous method. This method sends // the CDR through the transport layer diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index f8a322082d8..43cf2b6cc92 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // $Id$ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO ORB and the TAO IDL Compiler have been developed by Washington // University Computer Science's Distributed Object Computing Group. diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index e28e71ba831..569dd978c87 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -22,7 +22,7 @@ #include "tao/orbconf.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/POA_CORBA.h" @@ -31,7 +31,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ // Forward declarations. -class TAO_RelativeRoundtripTimeoutPolicy_i; +class TAO_RelativeRoundtripTimeoutPolicy; class TAO_Client_Priority_Policy; class TAO_Sync_Scope_Policy; class TAO_Buffering_Constraint_Policy; @@ -87,7 +87,7 @@ public: // = Direct accesors to the policy implementations, for speedy // lookups. - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *client_priority (void) const; @@ -107,7 +107,7 @@ private: // The known policies are kept as pointers to the implementation // objects, this allow us to query the supported policies really // fast, without memory allocations. - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout_; + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout_; TAO_Client_Priority_Policy *client_priority_; @@ -150,7 +150,7 @@ public: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *client_priority (void) const; @@ -188,7 +188,7 @@ public: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *client_priority (void) const; @@ -229,7 +229,7 @@ public: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *client_priority (void) const; @@ -246,6 +246,6 @@ public: # include "tao/Policy_Manager.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* TAO_POLICY_MANAGER_H */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 56c273f8cd1..654cbdd3aa8 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // // $Id$ + // // ================================================================ // @@ -22,7 +23,7 @@ #include "tao/corbafwd.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/Object.h" #include "tao/Exception.h" @@ -440,6 +441,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ #endif /* TAO_IDL_POLLABLEC_H */ diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index cd0c8e5ebd3..abc0d4c079a 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -22,7 +22,7 @@ #include "tao/PollableC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_HAS_AMI_POLLER) +#if (TAO_HAS_CORBA_MESSAGING == 1) && (TAO_HAS_AMI_POLLER == 1) #include "tao/POA_CORBA.h" @@ -236,6 +236,6 @@ TAO_NAMESPACE_CLOSE #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 && TAO_HAS_AMI_POLLER == 1 */ #endif /* ifndef */ diff --git a/TAO/tao/Pool_Per_Endpoint.h b/TAO/tao/Pool_Per_Endpoint.h index 7588b52d67e..21159984c6d 100644 --- a/TAO/tao/Pool_Per_Endpoint.h +++ b/TAO/tao/Pool_Per_Endpoint.h @@ -1,5 +1,6 @@ // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index a861fa4fbb3..ba3b1b5bbd4 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 2898177f2e7..c803a1dd73f 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -55,7 +56,7 @@ public: virtual int requires_explicit_endpoint (void) const = 0; // Some protocols should not create a default endpoint unless the - // user specifies a -ORBendpoint option. For example, local IPC + // user specifies a -ORBEndpoint option. For example, local IPC // (aka UNIX domain sockets) is unable to remove the rendesvouz // point if the server crashes. For those protocols is better to // create the endpoint only if the user requests one. diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index a13749cc275..ec7711d10ed 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -143,9 +144,9 @@ private: // ********************************************************************* -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) -# if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) class TAO_Export TAO_Asynch_Reply_Dispatcher : public TAO_Reply_Dispatcher { @@ -209,9 +210,9 @@ private: // Reply Handler passed in the Asynchronous Invocation. }; -# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ +# endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ********************************************************************* diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index c8df3592bde..bf1c3f34bd7 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -40,13 +40,13 @@ #include "tao/MProfile.h" #include "tao/ORB.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) // Forward declarations. -class TAO_RelativeRoundtripTimeoutPolicy_i; +class TAO_RelativeRoundtripTimeoutPolicy; class TAO_Client_Priority_Policy; class TAO_Sync_Scope_Policy; class TAO_Buffering_Constraint_Policy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ class TAO_Sync_Strategy; class TAO_GIOP_Invocation; @@ -278,14 +278,14 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - TAO_RelativeRoundtripTimeoutPolicy_i *relative_roundtrip_timeout (void); + TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void); TAO_Client_Priority_Policy *client_priority (void); @@ -314,7 +314,7 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Sync_Strategy &sync_strategy (void); // Return the sync strategy to be used in by the transport. @@ -512,11 +512,11 @@ private: // 2. we can search for the servant/POA's status starting from // the ORB's RootPOA. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager_Impl *policies_; // The policy overrides in this object, if nil then use the default // policies. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // = Disallow copy constructor and assignment operator ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h index b4cb70e0e4b..028fa194df2 100644 --- a/TAO/tao/Sync_Strategies.h +++ b/TAO/tao/Sync_Strategies.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -49,7 +50,7 @@ public: const ACE_Time_Value *max_wait_time); }; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class TAO_Export TAO_None_Sync_Strategy : public TAO_Sync_Strategy { @@ -69,15 +70,7 @@ public: ACE_Time_Value time_conversion (const TimeBase::TimeT &time); }; -class TAO_Export TAO_Flush_Sync_Strategy : public TAO_None_Sync_Strategy -{ -public: - virtual int buffering_constraints_reached (TAO_Transport &transport, - TAO_Stub &stub, - TAO_Transport_Buffering_Queue &buffering_queue); -}; - -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (__ACE_INLINE__) # include "tao/Sync_Strategies.i" diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 8684609d3e5..c0daffa336d 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. @@ -17,12 +18,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/PolicyC.h" #include "tao/TimeBaseC.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -44,7 +45,7 @@ TAO_NAMESPACE TAO { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) typedef CORBA::Short PrioritySelectionMode; typedef CORBA::Short_out PrioritySelectionMode_out; @@ -223,7 +224,7 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy typedef CORBA::UShort_out BufferingConstraintMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; - TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_NONE; + TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_FLUSH; TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort BUFFER_TIMEOUT; @@ -396,10 +397,10 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // It seems easier to have copies of these here than to use - // #if defined (TAO_HAS_CORBA_MESSAGING) everywhere or to + // #if (TAO_HAS_CORBA_MESSAGING == 1) everywhere or to // define a new class TAO_GIOP_Reliable_Oneway_Invocation typedef CORBA::Short SyncScope; @@ -410,12 +411,10 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER; TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET; - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_FLUSH; } TAO_NAMESPACE_CLOSE // module TAO -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export void operator<<= (CORBA::Any &, const TAO::PrioritySpecification &); // copying version TAO_Export void operator<<= (CORBA::Any &, TAO::PrioritySpecification*); // noncopying version @@ -430,18 +429,18 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstra void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy *&); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #ifndef __ACE_INLINE__ -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::PrioritySpecification &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h index 178421db89b..e4099dd5f00 100644 --- a/TAO/tao/TAOS.h +++ b/TAO/tao/TAOS.h @@ -1,5 +1,6 @@ /* -*- C++ -*- $Id$ */ + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* // TAO and the TAO IDL Compiler have been developed by the Center for // Distributed Object Computing at Washington University, St. Louis. @@ -12,11 +13,11 @@ #include "tao/TAOC.h" -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/POA_CORBA.h" -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +33,7 @@ TAO_NAMESPACE POA_TAO { -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class ClientPriorityPolicy; typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; @@ -166,10 +167,8 @@ TAO_NAMESPACE POA_TAO CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual TAO::BufferingConstraint buffering_constraint ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + virtual TAO::BufferingConstraint buffering_constraint (CORBA::Environment &ACE_TRY_ENV); + virtual TAO::BufferingConstraint buffering_constraint (void); private: @@ -180,7 +179,7 @@ TAO_NAMESPACE POA_TAO #endif /* end #if !defined */ -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } TAO_NAMESPACE_CLOSE diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index 843f1a17bb9..c05e300be1a 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -1,6 +1,7 @@ /* -*- C++ -*- */ // // $Id$ + // // ================================================================ // diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h index 0cd7886c165..170ab0f8f7e 100644 --- a/TAO/tao/UIOP_Acceptor.h +++ b/TAO/tao/UIOP_Acceptor.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -28,7 +29,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -# if defined (TAO_HAS_UIOP) +# if TAO_HAS_UIOP == 1 #include "ace/Acceptor.h" #include "ace/LSOCK_Acceptor.h" @@ -106,6 +107,6 @@ private: // occurs. }; -# endif /* TAO_HAS_UIOP */ +# endif /* TAO_HAS_UIOP == 1 */ #endif /* TAO_UIOP_ACCEPTOR_H */ diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h index 654f84f678d..bee36b86097 100644 --- a/TAO/tao/UIOP_Connect.h +++ b/TAO/tao/UIOP_Connect.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -19,7 +20,7 @@ #include "tao/UIOP_Transport.h" -#if defined (TAO_HAS_UIOP) +#if TAO_HAS_UIOP == 1 #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -189,6 +190,6 @@ protected: #include "tao/UIOP_Connect.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_UIOP */ +#endif /* TAO_HAS_UIOP == 1 */ #endif /* TAO_UIOP_CONNECT_H */ diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h index 9398dad40c3..9a4c1749a5a 100644 --- a/TAO/tao/UIOP_Profile.h +++ b/TAO/tao/UIOP_Profile.h @@ -27,7 +27,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -# if defined (TAO_HAS_UIOP) +# if TAO_HAS_UIOP == 1 #include "tao/Object_KeyC.h" #include "tao/UIOP_Connect.h" @@ -47,7 +47,8 @@ class TAO_Export TAO_UIOP_Profile : public TAO_Profile // = DESCRIPTION // This class defines the UIOP profile. public: - static const char object_key_delimiter; + static const char object_key_delimiter_; + virtual char object_key_delimiter (void) const; // The object key delimiter that UIOP uses or expects. static const char *prefix (void); @@ -163,6 +164,6 @@ private: # include "tao/UIOP_Profile.i" #endif /* __ACE_INLINE__ */ -# endif /* TAO_HAS_UIOP */ +# endif /* TAO_HAS_UIOP == 1 */ #endif /* TAO_UIOP_PROFILE_H */ diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h index 8326e6152b2..3f97b41970a 100644 --- a/TAO/tao/UIOP_Transport.h +++ b/TAO/tao/UIOP_Transport.h @@ -1,5 +1,7 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -33,7 +35,7 @@ -# if defined (TAO_HAS_UIOP) +# if TAO_HAS_UIOP == 1 // Forward decls. class TAO_UIOP_Handler_Base; @@ -69,6 +71,7 @@ public: virtual ACE_HANDLE handle (void); virtual ACE_Event_Handler *event_handler (void); virtual ssize_t send (TAO_Stub *stub, + int two_way, const ACE_Message_Block *mblk, const ACE_Time_Value *s = 0); virtual ssize_t send (const ACE_Message_Block *mblk, @@ -211,6 +214,6 @@ public: // This would be server side messaging protocol }; -# endif /* TAO_HAS_UIOP */ +# endif /* TAO_HAS_UIOP == 1 */ #endif /* TAO_UIOP_TRANSPORT_H */ diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 0c4b93b126e..cb4ed2e0458 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1,6 +1,7 @@ // -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -62,14 +63,11 @@ // configure fixed one-byte alignment policy, since some fixed policy // needs to apply throughout an ORB. -#if defined (_MSC_VER) -//# pragma pack (push, 1) // VC++, stack 1-byte alignment policy +#if defined (_MSC_VER) || defined (__BORLANDC__) # ifdef _DEBUG // convert from VC++ convention ... # define TAO_DEBUG // ... to normal convention # endif -#elif defined (__BORLANDC__) -# pragma option -a // BC++, use 1 byte alignment -#endif /* _MSC_VER */ +#endif /* _MSC_VER || __BORLANDC__ */ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -1106,7 +1104,7 @@ TAO_NAMESPACE CORBA typedef CORBA_EnumMemberSeq *EnumMemberSeq_ptr; typedef CORBA_EnumMemberSeq_out EnumMemberSeq_out; typedef CORBA_EnumMemberSeq_var EnumMemberSeq_var; -#endif /* TAO_HAS_INTERFACE_REPOSITORY */ +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ typedef CORBA_Bounds Bounds; typedef CORBA_Bounds *Bounds_ptr; diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 5ad2e5147be..cc92e0498e0 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // @ (#) $Id$ + // ============================================================================ // // = LIBRARY @@ -356,23 +357,171 @@ enum MCAST_SERVICEID // OBV is in experimental stage #define TAO_HAS_VALUETYPE -// UIOP support (GIOP over UNIX domain sockets) -// #define TAO_HAS_UIOP - // Minimum CORBA // #define TAO_HAS_MINIMUM_CORBA -// INTERFACE_REPOSITORY -//#define TAO_HAS_INTERFACE_REPOSITORY -// Without Minimum CORBA, the user will get regular (no locality -// constraints) policies by default. With Minimum CORBA, the user -// will get locality constraint policies by default. -// -// If #define TAO_HAS_REMOTE_POLICIES 0, then the user will always get -// locality constraint policies (regardless of Minimum CORBA). -// -// If #define TAO_HAS_REMOTE_POLICIES 1, then the user will always get -// regular policies (regardless of Minimum CORBA). +// UIOP support is enabled by default if the platform supports UNIX +// domain sockets, and TAO is not configured for minimum CORBA. +// If TAO is configured for minimum CORBA, then UIOP will be disabled +// by default. +// To explicitly enable UIOP support uncomment the following +// #define TAO_HAS_UIOP 1 +// To explicitly disable UIOP support uncomment the following +// #define TAO_HAS_UIOP 0 + +// Default UIOP settings +#if !defined (TAO_HAS_UIOP) +# if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) +# define TAO_HAS_UIOP 0 +# elif defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_UIOP 0 +# else +# define TAO_HAS_UIOP 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_UIOP */ + +// RT_CORBA support is enabled by default if TAO is not configured for +// minimum CORBA. If TAO is configured for minimum CORBA, then +// RT_CORBA will be disabled by default. +// To explicitly enable RT_CORBA support uncomment the following +// #define TAO_HAS_RT_CORBA 1 +// To explicitly disable RT_CORBA support uncomment the following +// #define TAO_HAS_RT_CORBA 0 + +// Default RT_CORBA settings +#if !defined (TAO_HAS_RT_CORBA) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_RT_CORBA 0 +# else +# define TAO_HAS_RT_CORBA 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_RT_CORBA */ + +// MINIMUM_POA support is disabled by default if TAO is not +// configured for minimum CORBA. If TAO is configured for minimum +// CORBA, then MINIMUM_POA will be enabled by default. +// To explicitly enable MINIMUM_POA support uncomment the following +// #define TAO_HAS_MINIMUM_POA 1 +// To explicitly disable MINIMUM_POA support uncomment the following +// #define TAO_HAS_MINIMUM_POA 0 + +// Default MINIMUM_POA settings +#if !defined (TAO_HAS_MINIMUM_POA) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_MINIMUM_POA 1 +# else +# define TAO_HAS_MINIMUM_POA 0 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_MINIMUM_POA */ + +// MINIMUM_POA_MAPS support is disabled by default if TAO is not +// configured for minimum POA. If TAO is configured for minimum +// POA, then MINIMUM_POA_MAPS will be enabled by default. +// To explicitly enable MINIMUM_POA_MAPS support uncomment the following +// #define TAO_HAS_MINIMUM_POA_MAPS 1 +// To explicitly disable MINIMUM_POA_MAPS support uncomment the following +// #define TAO_HAS_MINIMUM_POA_MAPS 0 + +// Default MINIMUM_POA_MAPS settings +#if !defined (TAO_HAS_MINIMUM_POA_MAPS) +# if (TAO_HAS_MINIMUM_POA == 1) +# define TAO_HAS_MINIMUM_POA_MAPS 1 +# else +# define TAO_HAS_MINIMUM_POA_MAPS 0 +# endif /* TAO_HAS_MINIMUM_POA */ +#endif /* !TAO_HAS_MINIMUM_POA_MAPS */ + +// CORBA_MESSAGING support is enabled by default if TAO is not +// configured for minimum CORBA. If TAO is configured for minimum +// CORBA, then CORBA_MESSAGING will be disabled by default. +// To explicitly enable CORBA_MESSAGING support uncomment the following +// #define TAO_HAS_CORBA_MESSAGING 1 +// To explicitly disable CORBA_MESSAGING support uncomment the following +// #define TAO_HAS_CORBA_MESSAGING 0 + +// Default CORBA_MESSAGING settings +#if !defined (TAO_HAS_CORBA_MESSAGING) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_CORBA_MESSAGING 0 +# else +# define TAO_HAS_CORBA_MESSAGING 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_CORBA_MESSAGING */ + +// AMI support is disabled by default, irrespective of whether TAO is +// configured for minimum CORBA. +// To explicitly enable AMI support uncomment the following +// #define TAO_HAS_AMI 1 +// To explicitly disable AMI support uncomment the following +// #define TAO_HAS_AMI 0 + +// Default AMI settings +#if !defined (TAO_HAS_AMI) +# define TAO_HAS_AMI 0 +#endif /* !TAO_HAS_AMI */ + +// AMI_POLLER support is disabled by default if TAO is not configured +// for AMI. If TAO is configured for AMI, then AMI_POLLER will be +// enabled by default. +// To explicitly enable AMI_POLLER support uncomment the following +// #define TAO_HAS_AMI_POLLER 1 +// To explicitly disable AMI_POLLER support uncomment the following +// #define TAO_HAS_AMI_POLLER 0 + +// Default AMI_POLLER settings +#if !defined (TAO_HAS_AMI_POLLER) +# if (TAO_HAS_AMI == 1) +# define TAO_HAS_AMI_POLLER 1 +# else +# define TAO_HAS_AMI_POLLER 0 +# endif /* TAO_HAS_AMI == 1 */ +#endif /* !TAO_HAS_AMI_POLLER */ + +// AMI_CALLBACK support is disabled by default if TAO is not configured +// for AMI. If TAO is configured for AMI, then AMI_CALLBACK will be +// enabled by default. +// To explicitly enable AMI_CALLBACK support uncomment the following +// #define TAO_HAS_AMI_CALLBACK 1 +// To explicitly disable AMI_CALLBACK support uncomment the following +// #define TAO_HAS_AMI_CALLBACK 0 + +// Default AMI_CALLBACK settings +#if !defined (TAO_HAS_AMI_CALLBACK) +# if (TAO_HAS_AMI == 1) +# define TAO_HAS_AMI_CALLBACK 1 +# else +# define TAO_HAS_AMI_CALLBACK 0 +# endif /* TAO_HAS_AMI == 1 */ +#endif /* !TAO_HAS_AMI_CALLBACK */ + +// INTERFACE_REPOSITORY support is disabled by default, irrespective +// of whether TAO is configured for minimum CORBA. +// To explicitly enable INTERFACE_REPOSITORY support uncomment the following +// #define TAO_HAS_INTERFACE_REPOSITORY 1 +// To explicitly disable INTERFACE_REPOSITORY support uncomment the following +// #define TAO_HAS_INTERFACE_REPOSITORY 0 + +// Default INTERFACE_REPOSITORY settings +#if !defined (TAO_HAS_INTERFACE_REPOSITORY) +# define TAO_HAS_INTERFACE_REPOSITORY 0 +#endif /* !TAO_HAS_INTERFACE_REPOSITORY */ + +// REMOTE_POLICIES support is enabled by default if TAO is not +// configured for minimum CORBA. If TAO is configured for minimum +// CORBA, then REMOTE_POLICIES will be disabled by default. +// To explicitly enable REMOTE_POLICIES support uncomment the following +// #define TAO_HAS_REMOTE_POLICIES 1 +// To explicitly disable REMOTE_POLICIES support uncomment the following +// #define TAO_HAS_REMOTE_POLICIES 0 + +// Default REMOTE_POLICIES settings +#if !defined (TAO_HAS_REMOTE_POLICIES) +# if defined (TAO_HAS_MINIMUM_CORBA) +# define TAO_HAS_REMOTE_POLICIES 0 +# else +# define TAO_HAS_REMOTE_POLICIES 1 +# endif /* TAO_HAS_MINIMUM_CORBA */ +#endif /* !TAO_HAS_REMOTE_POLICIES */ // TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro and // should not be set by the user. @@ -382,57 +531,22 @@ enum MCAST_SERVICEID and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead. #endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ -#if defined (TAO_HAS_MINIMUM_CORBA) +#if (TAO_HAS_REMOTE_POLICIES == 0) +# define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES +#endif /* TAO_HAS_REMOTE_POLICIES */ +#if defined (TAO_HAS_MINIMUM_CORBA) // With minimum CORBA, we don't have the ForwardRequest exception. // Therefore, we can't support the INS forwarding agent. # if !defined (TAO_NO_IOR_TABLE) # define TAO_NO_IOR_TABLE # endif /* TAO_NO_IOR_TABLE */ - -# if !defined (TAO_HAS_REMOTE_POLICIES) -# define TAO_HAS_REMOTE_POLICIES 0 -# endif /* TAO_HAS_REMOTE_POLICIES */ - #else - -// Interceptors is supported by default if we are not building -// for MinimumCORBA. -#define TAO_HAS_INTERCEPTORS - +// Interceptors is supported by default if we are not building for +// MinimumCORBA. +# define TAO_HAS_INTERCEPTORS #endif /* TAO_HAS_MINIMUM_CORBA */ -#if !defined (TAO_DISABLE_RT_CORBA) && !defined (TAO_HAS_MINIMUM_CORBA) -# define TAO_HAS_RT_CORBA -#endif /* !TAO_HAS_RT_CORBA && !TAO_HAS_MINIMUM_CORBA */ - -// If the user has not already specified TAO_HAS_UIOP, and the -// platform supports UNIX domain sockets, and minimum CORBA is not -// defined, we turn on TAO_HAS_UIOP by default. Note that even with -// minimum CORBA, the user can still get UIOP support simply be -// defining TAO_HAS_UIOP before reaching this code. -#if !defined (TAO_HAS_UIOP) && \ - !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && \ - !defined (TAO_HAS_MINIMUM_CORBA) -# define TAO_HAS_UIOP -#endif /* !TAO_HAS_UIOP && - !ACE_LACKS_UNIX_DOMAIN_SOCKETS && - !TAO_HAS_MINIMUM_CORBA */ - -// Policies are not locality constraint by default. -#if !defined (TAO_HAS_REMOTE_POLICIES) -# define TAO_HAS_REMOTE_POLICIES 1 -#endif /* TAO_HAS_REMOTE_POLICIES */ - -#if (TAO_HAS_REMOTE_POLICIES == 0) -# define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES -#endif /* TAO_HAS_REMOTE_POLICIES */ - -// CORBA Messaging -#if !defined (TAO_HAS_CORBA_MESSAGING) -# define TAO_HAS_CORBA_MESSAGING -#endif /* TAO_HAS_CORBA_MESSAGING */ - // Define the policy types as literals, so they can be used in switch // statements diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 02b67e32e83..aa1821ae967 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -38,57 +38,17 @@ class TAO_IOR_LookupTable; // #define TAO_LOCAL_INLINE ACE_INLINE // #endif /* ! __ACE_INLINE__ */ -typedef ACE_Unbounded_Set<ACE_CString> TAO_EndpointSet; -typedef ACE_Unbounded_Set_Iterator<ACE_CString> TAO_EndpointSetIterator; -// @@ Using an ACE_Unbounded_Queue to contain the preconnects may not -// be the best container to use. However, it will only be used -// during client side initialization. Also, a template +// @@ Using an ACE_Unbounded_Queue to contain the endpoints and +// preconnects may not be the best container to use. However, it +// will only be used during ORB bootstrapping. Also, a template // instantiation of ACE_Unbounded_Queue<ACE_CString> already exists // in ACE so we do not have to worry about increasing TAO's // footprint by using this container. -typedef ACE_Unbounded_Queue<ACE_CString> TAO_PreconnectSet; -typedef ACE_Unbounded_Queue_Iterator<ACE_CString> TAO_PreconnectSetIterator; +typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet; +typedef ACE_Unbounded_Queue_Iterator<ACE_CString> TAO_EndpointSetIterator; // ------------------------------------------------------------------- -// The following utility classes are used to insert endpoints and -// preconnects into their corresponding containers, but at the same -// time allow the same parsing code to be used for endpoints and -// preconnects. - -// Base class that provides interface for insertion of -class TAO_Base_Endpoint_Insertion_Strategy -{ -public: - virtual int insert (const ACE_CString &endpoint) = 0; -}; - -// Utility class to insert endpoints into endpoint container. -class TAO_Endpoint_Insertion_Strategy - : public TAO_Base_Endpoint_Insertion_Strategy -{ -public: - TAO_Endpoint_Insertion_Strategy (TAO_EndpointSet &endpoint_set); - - virtual int insert (const ACE_CString &endpoint); - -private: - TAO_EndpointSet &endpoints_; -}; - -// Utility class to insert preconnects into preconnect container. -class TAO_Preconnect_Insertion_Strategy - : public TAO_Base_Endpoint_Insertion_Strategy -{ -public: - TAO_Preconnect_Insertion_Strategy (TAO_PreconnectSet &preconnect_set); - - virtual int insert (const ACE_CString &preconnect); - -private: - TAO_PreconnectSet &preconnects_; -}; -// ------------------------------------------------------------------- class TAO_Export TAO_ORB_Parameters // = TITLE @@ -110,7 +70,7 @@ public: // Destructor. int preconnects (ACE_CString &preconnects); - TAO_PreconnectSet &preconnects (void); + TAO_EndpointSet &preconnects (void); void add_preconnect (ACE_CString &preconnect); // Specifies the endpoints to pre-establish connections on. @@ -194,21 +154,15 @@ private: // All preconnect or endpoint strings should be of the above form(s). int parse_endpoints (ACE_CString &endpoints, - TAO_Base_Endpoint_Insertion_Strategy &endpoints_list); + TAO_EndpointSet &endpoints_list); - TAO_PreconnectSet preconnects_list_; + TAO_EndpointSet preconnects_list_; // List of endpoints used to pre-establish connections. - TAO_Preconnect_Insertion_Strategy preconnect_insertion_strategy_; - // Strategy used to insert endpoints into the endpoint container. - TAO_EndpointSet endpoints_list_; // List of endpoints this server is willing to accept requests // on. - TAO_Endpoint_Insertion_Strategy endpoint_insertion_strategy_; - // Strategy used to insert endpoints into the endpoint container. - CORBA::UShort service_port_[NO_OF_MCAST_SERVICES]; // Port numbers of the configured services. |