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

2 files changed, 50 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 173ad803..da69caf6 100644
--- a/ChangeLog
+++ b/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/testsuite/boehm-gc.c/thread_leak_test.c b/testsuite/boehm-gc.c/thread_leak_test.c
index eb4cb9bd..89014651 100644
--- a/testsuite/boehm-gc.c/thread_leak_test.c
+++ b/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();