diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-01 15:21:10 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-01 15:21:10 +0000 |
| commit | a3a9a003927caedf4f52d9dd598c207f47480bbe (patch) | |
| tree | a3674791da8b68f4facc5a5dbe936601f54ca991 /tests/TSS_Test.cpp | |
| parent | 67318c77a8c07e825188fbb2de40949172b64cdb (diff) | |
| download | ATCD-a3a9a003927caedf4f52d9dd598c207f47480bbe.tar.gz | |
(cleanup, worker): with ACE_HAS_PTHREADS_DRAFT4, delete the tss instances in cleanup instead of worker
Diffstat (limited to 'tests/TSS_Test.cpp')
| -rw-r--r-- | tests/TSS_Test.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp index bcaf8a0728a..4ea05d0624f 100644 --- a/tests/TSS_Test.cpp +++ b/tests/TSS_Test.cpp @@ -74,12 +74,15 @@ cleanup (void *ptr) // old value is replaced. This function is intended to be // used with Draft 6 and later threads, where it is called // on thread termination with the thread-specific value. + + // Anyways, for whatever reason, the ACE_DEBUG causes a + // core dump on LynxOS 2.5.0. ACE_UNUSED_ARG (ptr); #else /* ! ACE_HAS_PTHREADS_DRAFT4 */ ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) in cleanup, ptr = %x\n"), ptr)); +#endif /* ! ACE_HAS_PTHREADS_DRAFT4 */ operator delete (ptr); -#endif /* ! ACE_HAS_PTHREADS_DRAFT4 */ } // This worker function is the entry point for each thread. @@ -139,7 +142,10 @@ worker (void *c) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"), ASYS_TEXT ("ACE_Thread::setspecific"))); +#if ! defined (ACE_HAS_PTHREADS_DRAFT4) + // See comment in cleanup () above. delete ip; +#endif /* ! ACE_HAS_PTHREADS_DRAFT4 */ if (ACE_Thread::keyfree (key) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"), @@ -206,7 +212,10 @@ worker (void *c) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"), ASYS_TEXT ("ACE_Thread::setspecific"))); +#if ! defined (ACE_HAS_PTHREADS_DRAFT4) + // See comment in cleanup () above. delete ip; +#endif /* ! ACE_HAS_PTHREADS_DRAFT4 */ if (ACE_Thread::keyfree (key) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"), @@ -272,9 +281,7 @@ main (int, ASYS_TCHAR *[]) ACE_Thread_Manager::instance ()->wait (); delete u; - u = 0; delete tss_error; - tss_error = 0; Errno::deallocate_lock (); #else |