diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-07 20:32:19 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-07 20:32:19 +0000 |
| commit | ce9af6b609af73ab07102bab65ea1f89d3df70d3 (patch) | |
| tree | e4fc02fc0e783fd293ccaacec6b82123f04014e4 | |
| parent | bee41f4cf36dd5299c9c2942d20b12510c106d1e (diff) | |
| download | ATCD-ce9af6b609af73ab07102bab65ea1f89d3df70d3.tar.gz | |
ChangeLogTag: Wed Jul 07 15:31:18 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 38 | ||||
| -rw-r--r-- | tests/Recursive_Mutex_Test.cpp | 9 |
2 files changed, 28 insertions, 19 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index a7b3982d365..c0bd77ce840 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Wed Jul 07 15:31:18 1999 David L. Levine <levine@cs.wustl.edu> + + * tests/Recursive_Mutex_Test.cpp: on LynxOS/PPC only, + just do 65 iterations instead of the default of 100. + The test then passes on our LynxOS/PPC host. + Wed Jul 7 14:03:31 1999 Steve Huston <shuston@riverace.com> * ace/Caching_Strategies_T.h: @@ -8,22 +14,22 @@ Wed Jul 7 14:03:31 1999 Steve Huston <shuston@riverace.com> Wed Jul 7 13:27:53 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * 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: - Changed ACE_MALLOC_ALIGN to ACE_MALLOC_PADDING. It's not clear - if these macros are still needed however. - - * 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 ;-). - + * 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: + Changed ACE_MALLOC_ALIGN to ACE_MALLOC_PADDING. It's not clear + if these macros are still needed however. + + * 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. diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp index 07642ee03d4..46ea477022a 100644 --- a/tests/Recursive_Mutex_Test.cpp +++ b/tests/Recursive_Mutex_Test.cpp @@ -37,9 +37,12 @@ USELIB("..\ace\aced.lib"); // Chorus can't handle 100 iterations: // [amThrd.C:154]: Failed to allocate an AmActor static size_t n_iterations = 45; -#else /* ! CHORUS */ +#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__) */ static size_t n_iterations = 100; -#endif /* ! CHORUS */ +#endif /* ! CHORUS && ! (__Lynx__ && __powerpc__) */ static size_t n_threads = ACE_MAX_THREADS; static void @@ -69,7 +72,7 @@ static void * worker (void *arg) { ACE_Recursive_Thread_Mutex *rm = - ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *, + ACE_reinterpret_cast (ACE_Recursive_Thread_Mutex *, arg); recursive_worker (0, rm); return 0; |