ChangeLogTag: Wed Jul 07 16:06:45 1999 David L. Levine <levine@cs.wustl.edu>

2 files changed, 85 insertions, 67 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 6e58a7265b6..3f8e59e92dd 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,29 +1,36 @@
+Wed Jul 07 16:06:45 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * tests/Recursive_Mutex_Test.cpp: explicitly set the
+          stack size.  This solves the problem on LynxOS/PPC,
+          below, so the 65-iteration workaround was removed.
+          Thanks to Doug for this suggestion.
+
 Wed Jul  7 13:27:53 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/Malloc[_T]: Cleaned up the code so that we can use the 
-	  ACE_Based_Pointer<> consistently when
- 	  ACE_HAS_POSITION_INDEPENDENT_MALLOC is enabled and disable.
-	
-	* ace/Malloc.h: By default, ACE_MALLOC_PADDING is set to 1 so that
-	  we don't get "divide by zero" errors.  However, it's only used
- 	  in the computation of the ACE_Malloc_Header if it's > 1.
-
-	* config-aix-4.x.h,
-	  config-lynxos.h,
-	  config-psos-diab-mips.h,
-	  config-psos-diab-ppc.h,
-	  config-psos-diab.h,
-	  config-psos-tm.h,
-	  config-psosim-g++.h,
-	  config-sunos5.5.h:
-	  Removed the ACE_MALLOC_ALIGN macro since it should no longer
-	  be necessary.
-
-	* ace/Malloc.h: Renamed the macro ACE_MALLOC_ALIGN to
-	  ACE_MALLOC_PADDING, which is more descriptive.  However, I've
- 	  retained ACE_MALLOC_ALIGN for backwards compatibility to keep
- 	  Steve Huston happy ;-).
-  
+        * ace/Malloc[_T]: Cleaned up the code so that we can use the
+          ACE_Based_Pointer<> consistently when
+          ACE_HAS_POSITION_INDEPENDENT_MALLOC is enabled and disable.
+
+        * ace/Malloc.h: By default, ACE_MALLOC_PADDING is set to 1 so that
+          we don't get "divide by zero" errors.  However, it's only used
+          in the computation of the ACE_Malloc_Header if it's > 1.
+
+        * config-aix-4.x.h,
+          config-lynxos.h,
+          config-psos-diab-mips.h,
+          config-psos-diab-ppc.h,
+          config-psos-diab.h,
+          config-psos-tm.h,
+          config-psosim-g++.h,
+          config-sunos5.5.h:
+          Removed the ACE_MALLOC_ALIGN macro since it should no longer
+          be necessary.
+
+        * ace/Malloc.h: Renamed the macro ACE_MALLOC_ALIGN to
+          ACE_MALLOC_PADDING, which is more descriptive.  However, I've
+          retained ACE_MALLOC_ALIGN for backwards compatibility to keep
+          Steve Huston happy ;-).
+
         * Fixed a typo in the TAO-mail.html program where ace-*
           should have been tao-*.  Thanks to Pedro Alves Ferreira
           <pedro.ferreira@inescn.pt> for reporting this.
@@ -33,20 +40,20 @@ Wed Jul  7 13:27:53 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
           for reporting this.
 
 Wed Jul  7 15:46:20 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-  
-	* tests/Cached_Conn_Test.cpp (parse_args): 
-	* tests/Cache_Map_Manager_Test (parse_args):
-  	  Runtime selection of different caching strategies
-	  (lru/lfu/fifo/null) made possible.
 
-	* Caching_Strategies_T.{i,cpp}:
+        * tests/Cached_Conn_Test.cpp (parse_args):
+        * tests/Cache_Map_Manager_Test (parse_args):
+          Runtime selection of different caching strategies
+          (lru/lfu/fifo/null) made possible.
+
+        * Caching_Strategies_T.{i,cpp}:
           Removed typos and also definied the virtual destructor for
-	  ACE_Caching_Strategy.
-	
-	* tests/Map_Manager_Test.cpp (test_cache_map_manager): 
-	  Added <null_caching_strategy> to the construction of
-	  <cache_map_manager> and <hash_cache_map_manager> objects to make
-	  it in sync with the changes made below.
+          ACE_Caching_Strategy.
+
+        * tests/Map_Manager_Test.cpp (test_cache_map_manager):
+          Added <null_caching_strategy> to the construction of
+          <cache_map_manager> and <hash_cache_map_manager> objects to make
+          it in sync with the changes made below.
 
 Wed Jul 07 12:27:32 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -65,39 +72,39 @@ Wed Jul  7 09:05:32 1999  Steve Huston  <shuston@riverace.com>
 
 Tue Jul  6 17:54:52 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-	* ace/Caching_Strategies_T.{h,i,cpp}: Added Abstract Base class
-	  called ACE_Caching_Strategy and ACE_Caching_Strategy_Adaptor
-	  which facilitate changing of caching strategies at runtime using
-	  the External Polymorphism pattern.
-	
-	* ace/Cached_Connect_Strategy_T.{h, cpp}: Changed the signature of 
-	  the constructor and also removed the <caching_strategy_> member.
-
-	* ace/Cache_Map_Manager_T.{h, cpp}: 
- 	* ace/Hash_Cache_Map_Manager_T.{h,cpp}:
-	  Changed the signature of the constructor.This was needed to be
-	  able to use the External Polymorphism pattern.
-
-	* tests/Cache_Map_Manager_Test.cpp:
-	* tests/Cached_Conn_Test.cpp:
-	  Made necessary changes to reflect the changes above. 
-	  Thanks to Irfan of the DOC group for helping with this.
-	
+        * ace/Caching_Strategies_T.{h,i,cpp}: Added Abstract Base class
+          called ACE_Caching_Strategy and ACE_Caching_Strategy_Adaptor
+          which facilitate changing of caching strategies at runtime using
+          the External Polymorphism pattern.
+
+        * ace/Cached_Connect_Strategy_T.{h, cpp}: Changed the signature of
+          the constructor and also removed the <caching_strategy_> member.
+
+        * ace/Cache_Map_Manager_T.{h, cpp}:
+        * ace/Hash_Cache_Map_Manager_T.{h,cpp}:
+          Changed the signature of the constructor.This was needed to be
+          able to use the External Polymorphism pattern.
+
+        * tests/Cache_Map_Manager_Test.cpp:
+        * tests/Cached_Conn_Test.cpp:
+          Made necessary changes to reflect the changes above.
+          Thanks to Irfan of the DOC group for helping with this.
+
 Tue Jul  6 17:34:52 1999  Steve Huston  <shuston@riverace.com>
 
         * ace/config-aix-4.x.h: Enabled ACE_HAS_PTHREADS_UNIX98_EXT and
           removed ACE_LACKS_RWLOCK_T for AIX 4.3. Moved some other
- 	  ACE_LACKS settings to the pre-4.3 threads section to allow
- 	  taking advantage of more capability on AIX 4.3.
+          ACE_LACKS settings to the pre-4.3 threads section to allow
+          taking advantage of more capability on AIX 4.3.
 
 Tue Jul 06 16:29:32 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/OS.h: Moved the string conversion macros before including
-	  OS.i because we also use them in the file.  Thanks to Carlos for
-	  reporting this.
+        * ace/OS.h: Moved the string conversion macros before including
+          OS.i because we also use them in the file.  Thanks to Carlos for
+          reporting this.
 
-	* OS.{h,i,cpp}:
-	* Parse_Node.cpp: Windows CE fixes.
+        * OS.{h,i,cpp}:
+        * Parse_Node.cpp: Windows CE fixes.
 
 Tue Jul 06 15:56:19 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index 46ea477022a..999525d2b3e 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -36,13 +36,12 @@ USELIB("..\ace\aced.lib");
 #if defined (CHORUS)
   // Chorus can't handle 100 iterations:
   //   [amThrd.C:154]: Failed to allocate an AmActor
+  // NOTE: this was before we set the stack size, below.  It
+  //   might work with the default n_iterations now.
   static size_t n_iterations = 45;
-#elif defined (__Lynx__)  &&  defined (__powerpc__)
-  // The test hangs after 68 iterations on our LynxOS/PPC host.
-  static size_t n_iterations = 65;
-#else  /* ! CHORUS  &&  ! (__Lynx__ && __powerpc__) */
+#else  /* ! CHORUS */
   static size_t n_iterations = 100;
-#endif /* ! CHORUS  &&  ! (__Lynx__ && __powerpc__) */
+#endif /* ! CHORUS */
 static size_t n_threads = ACE_MAX_THREADS;
 
 static void
@@ -87,9 +86,21 @@ main (int, ASYS_TCHAR *[])
 
 #if defined (ACE_HAS_THREADS)
   ACE_Recursive_Thread_Mutex rm;
+
+  size_t stack_sizes [ACE_MAX_THREADS];
+  for (unsigned int i = 0; i < ACE_MAX_THREADS; ++i)
+    stack_sizes[i] = 100000;
+
   ACE_Thread_Manager::instance ()->spawn_n (n_threads,
                                             ACE_THR_FUNC (worker),
-                                            (void *) &rm);
+                                            (void *) &rm,
+                                            THR_NEW_LWP | THR_JOINABLE,
+                                            ACE_DEFAULT_THREAD_PRIORITY,
+                                            -1, /* grp_id */
+                                            0,  /* task base */
+                                            0,  /* thread handles array */
+                                            0,  /* stack array */
+                                            stack_sizes);
   ACE_Thread_Manager::instance ()->wait ();
 #else
   ACE_ERROR ((LM_ERROR,