git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR boehm-gc/48299 (FAIL: boehm-gc.c/thread_leak_test.c) 

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.


Co-Authored-By: Patrick Marlier <patrick.marlier@gmail.com>

From-SVN: r184628
This commit is contained in:
Jack Howarth 2012-02-28 15:37:41 +00:00 committed by Patrick Marlier
parent 8eef33ca3d
commit 1d548381aa
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boehm-gc/ChangeLog
View File

@ -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> 2012-02-23 Patrick Marlier <patrick.marlier@gmail.com>
Jack Howarth <howarth@bromo.med.uc.edu> Jack Howarth <howarth@bromo.med.uc.edu>

53
boehm-gc/testsuite/boehm-gc.c/thread_leak_test.c
View File

@ -1,13 +1,22 @@
#define GC_LINUX_THREADS #ifndef GC_THREADS
# define GC_THREADS
#endif
#include "leak_detector.h" #include "leak_detector.h"
#include <pthread.h> #ifdef GC_PTHREADS
# include <pthread.h>
#else
# include <windows.h>
#endif
#include <stdio.h> #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 *p[10];
int i; int i;
GC_find_leak = 1; /* for new collect versions not compiled */
/* with -DFIND_LEAK. */
for (i = 0; i < 10; ++i) { for (i = 0; i < 10; ++i) {
p[i] = malloc(sizeof(int)+i); p[i] = malloc(sizeof(int)+i);
} }
@ -15,23 +24,47 @@ void * test(void * arg) {
for (i = 1; i < 10; ++i) { for (i = 1; i < 10; ++i) {
free(p[i]); free(p[i]);
} }
#ifdef GC_PTHREADS
return arg;
#else
return (DWORD)(GC_word)arg;
#endif
} }
#define NTHREADS 5 #define NTHREADS 5
int main() { int main(void) {
int i; int i;
#ifdef GC_PTHREADS
pthread_t t[NTHREADS]; pthread_t t[NTHREADS];
#else
HANDLE t[NTHREADS];
DWORD thread_id;
#endif
int code; int code;
GC_find_leak = 1; /* for new collect versions not compiled */
GC_INIT();
for (i = 0; i < NTHREADS; ++i) { for (i = 0; i < NTHREADS; ++i) {
if ((code = pthread_create(t + i, 0, test, 0)) != 0) { #ifdef GC_PTHREADS
printf("Thread creation failed %d\n", code); 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) { for (i = 0; i < NTHREADS; ++i) {
if ((code = pthread_join(t[i], 0)) != 0) { #ifdef GC_PTHREADS
printf("Thread join failed %lu\n", code); 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(); CHECK_LEAKS();