ChangeLogTag:Wed Apr 10 17:15:08 2002 Ossama Othman <ossama@uci.edu>

4 files changed, 52 insertions, 17 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index d4494b76a13..f6f09f0cc9d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,29 @@
+Wed Apr 10 17:15:08 2002  Ossama Othman  <ossama@uci.edu>
+
+	Run-time memory requirement reductions:
+
+	* tao/orbconf.h (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE):
+	  (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE):
+
+	  New constants that specify the default size of TAO's
+	  PolicyFactory registry and initial object reference table
+	  (i.e. the one used by the
+	  CORBA::ORB::register_initial_reference()) method, respectively.
+	  Both of these are less than ACE_DEFAULT_MAP_SIZE (1024) by
+	  default.
+
+	* tao/PolicyFactory_Registry.cpp (TAO_PolicyFactory_Registry):
+
+	  Initialize the underlying ACE_Map_Manager to have a size of
+	  TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE (<< 1024) instead of
+	  ACE_DEFAULT_MAP_SIZE (1024).
+
+	* tao/Object_Ref_Table.cpp (TAO_Object_Ref_Table):
+
+	  Initialize the underlying ACE_Hash_Map_Manager_Ex table to have
+	  a size of TAO_DEFAULT_OBJECT_REF_TABLE_SIZE (< 1024) instead of
+	  ACE_DEFAULT_MAP_SIZE (1024).
+
 Wed Apr 10 14:26:05 2002  Ossama Othman  <ossama@uci.edu>
 
 	* tao/ValueBase.h:
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index 00a130ed689..2ed94778f87 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -1,8 +1,3 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
 #include "Object_Ref_Table.h"
 #include "Object.h"
 #include "Exception.h"
@@ -14,11 +9,10 @@ ACE_RCSID (tao,
            Object_Ref_Table,
            "$Id$")
 
-
 // ****************************************************************
 
 TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
-  : table_ ()
+  : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
 {
 }
 
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index bb117836e1b..1c7977260cf 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -1,15 +1,14 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
 #include "PolicyFactory_Registry.h"
 
-ACE_RCSID(tao, PolicyFactory_Registry, "$Id$")
+ACE_RCSID (tao,
+           PolicyFactory_Registry,
+           "$Id$")
+
 
+// ****************************************************************
 
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
-  : factories_ ()
+  : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
 }
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 3771227ab73..7e0c7b6a6b4 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -9,8 +9,8 @@
  *  Build configuration file.
  *
  *  @author  Copyright 1995 by Sun Microsystems, Inc.
- *  @author  TAO-specific changes by Chris Cleeland
- *  @author  and Douglas C. Schmidt
+ *  @author  Chris Cleeland
+ *  @author  Douglas C. Schmidt
  */
 //=============================================================================
 
@@ -54,7 +54,7 @@
 
 // Define this if you don't want POA timestamps in the IOR.  Remember,
 // without timestamps, transient and persistent POA cannot be
-// distinguished
+// distinguished.
 #if !defined (POA_NO_TIMESTAMP)
 # define POA_NO_TIMESTAMP 0
 #endif /* POA_NO_TIMESTAMP */
@@ -73,6 +73,22 @@
 const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16;
 #endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
 
+// The default size of TAO's policy factory registry, i.e. the map
+// used as the underlying implementation for the
+// PortableInterceptor::ORBInitInfo::register_policy_factory() method.
+#if !defined (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
+const size_t TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE = 64;
+#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
+
+// The default size of TAO's initial object reference table, i.e. the
+// one used as the underlying implementation for the
+// CORBA::ORB::register_initial_reference() and
+// PortableInterceptor::ORBInitInfo::register_initial_reference()
+// methods.
+#if !defined (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
+const size_t TAO_DEFAULT_OBJECT_REF_TABLE_SIZE = 256;
+#endif  /* !TAO_DEFAULT_ORB_TABLE_SIZE */
+
 // The default size of TAO's server active object map.
 #if !defined (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE)
 # if defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)