diff options
| author | pmarlier <pmarlier@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-28 15:37:41 +0000 |
|---|---|---|
| committer | pmarlier <pmarlier@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-28 15:37:41 +0000 |
| commit | 20b98f28c8aa13d6c67a2aea4539d96127906546 (patch) | |
| tree | 7e7623d8d31253b1520e50eb5e85c092aee12eb4 /boehm-gc | |
| parent | 8b6c56045bb00cbda230830b777596920d19a752 (diff) | |
| download | ppe42-gcc-20b98f28c8aa13d6c67a2aea4539d96127906546.tar.gz ppe42-gcc-20b98f28c8aa13d6c67a2aea4539d96127906546.zip | |
2012-02-27 Jack Howarth <howarth@bromo.med.uc.edu>
Patrick Marlier <patrick.marlier@gmail.com>
PR boehm-gc/48299
testsuite/boehm-gc.c/thread_leak_test.c: Merge upstream changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184628 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 6 | ||||
| -rw-r--r-- | boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c | 55 |
2 files changed, 50 insertions, 11 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 173ad8033e4..da69caf6143 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +2012-02-27 Jack Howarth <howarth@bromo.med.uc.edu> + Patrick Marlier <patrick.marlier@gmail.com> + + PR boehm-gc/48299 + testsuite/boehm-gc.c/thread_leak_test.c: Merge upstream changes. + 2012-02-23 Patrick Marlier <patrick.marlier@gmail.com> Jack Howarth <howarth@bromo.med.uc.edu> diff --git a/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c b/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c index eb4cb9bd018..89014651261 100644 --- a/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c +++ b/boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c @@ -1,13 +1,22 @@ -#define GC_LINUX_THREADS +#ifndef GC_THREADS +# define GC_THREADS +#endif #include "leak_detector.h" -#include <pthread.h> +#ifdef GC_PTHREADS +# include <pthread.h> +#else +# include <windows.h> +#endif #include <stdio.h> -void * test(void * arg) { +#ifdef GC_PTHREADS + void * test(void * arg) +#else + DWORD WINAPI test(LPVOID arg) +#endif +{ int *p[10]; int i; - GC_find_leak = 1; /* for new collect versions not compiled */ - /* with -DFIND_LEAK. */ for (i = 0; i < 10; ++i) { p[i] = malloc(sizeof(int)+i); } @@ -15,23 +24,47 @@ void * test(void * arg) { for (i = 1; i < 10; ++i) { free(p[i]); } -} +#ifdef GC_PTHREADS + return arg; +#else + return (DWORD)(GC_word)arg; +#endif +} #define NTHREADS 5 -int main() { +int main(void) { int i; +#ifdef GC_PTHREADS pthread_t t[NTHREADS]; +#else + HANDLE t[NTHREADS]; + DWORD thread_id; +#endif int code; + GC_find_leak = 1; /* for new collect versions not compiled */ + GC_INIT(); for (i = 0; i < NTHREADS; ++i) { - if ((code = pthread_create(t + i, 0, test, 0)) != 0) { - printf("Thread creation failed %d\n", code); +#ifdef GC_PTHREADS + code = pthread_create(t + i, 0, test, 0); +#else + t[i] = CreateThread(NULL, 0, test, 0, 0, &thread_id); + code = t[i] != NULL ? 0 : (int)GetLastError(); +#endif + if (code != 0) { + printf("Thread creation failed %d\n", code); } } for (i = 0; i < NTHREADS; ++i) { - if ((code = pthread_join(t[i], 0)) != 0) { - printf("Thread join failed %lu\n", code); +#ifdef GC_PTHREADS + code = pthread_join(t[i], 0); +#else + code = WaitForSingleObject(t[i], INFINITE) == WAIT_OBJECT_0 ? 0 : + (int)GetLastError(); +#endif + if (code != 0) { + printf("Thread join failed %d\n", code); } } CHECK_LEAKS(); |
