ChangeLogTag: Thu Oct 21 17:55:19 2004 Irfan Pyarali <irfan@oomworks.com>

1 files changed, 17 insertions, 10 deletions

diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 2394f5ee9e9..186f11360f4 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -16,6 +16,8 @@
 
 #include /**/ "ace/pre.h"
 #include "ace/Unbounded_Queue.h"
+#include "ace/Hash_Map_Manager.h"
+#include "ace/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,7 +40,13 @@ class TAO_Reverse_Active_Object_Map_Impl;
 //    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_EndpointSet;
-typedef ACE_Unbounded_Queue_Iterator<ACE_CString> TAO_EndpointSetIterator;
+typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
+typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
+                                ACE_CString,
+                                ACE_Hash<ACE_CString>,
+                                ACE_Equal_To<ACE_CString>,
+                                ACE_Null_Mutex>
+  TAO_EndpointMap;
 
 
 // -------------------------------------------------------------------
@@ -66,9 +74,10 @@ public:
 
   /// Specifies the endpoints on which this server is willing to
   /// listen for requests.
-  int endpoints (ACE_CString &endpoints);
-  TAO_EndpointSet &endpoints (void);
-  void add_endpoint (ACE_CString &endpoint);
+  int add_endpoints (const ACE_CString &lane,
+                     const ACE_CString &endpoints);
+  void get_endpoint_set (const ACE_CString &lane,
+                         TAO_EndpointSet &endpoint_set);
 
   /// Set/Get the port of services locatable through multicast.
   CORBA::UShort service_port (TAO_MCAST_SERVICEID service_id) const;
@@ -176,16 +185,14 @@ private:
   //   iiop://space:2001,odyssey:2010;uiop://foo,bar
   //
   // All preconnect or endpoint strings should be of the above form(s).
-
-  int parse_endpoints (ACE_CString &endpoints,
-                       TAO_EndpointSet &endpoints_list);
+  int parse_and_add_endpoints (const ACE_CString &endpoints,
+                               TAO_EndpointSet &endpoint_set);
 
   /// List of endpoints used to pre-establish connections.
   // TAO_EndpointSet preconnects_list_;
 
-  /// List of endpoints this server is willing to accept requests
-  /// on.
-  TAO_EndpointSet endpoints_list_;
+  /// Map of endpoints this server is willing to accept requests on.
+  TAO_EndpointMap endpoints_map_;
 
   /// Port numbers of the configured services.
   CORBA::UShort service_port_[TAO_NO_OF_MCAST_SERVICES];