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

gc.h: (GC_CreateThread) This function is now exposed on all Win32 platforms. 

2002-02-06  Adam Megacz <adam@xwt.org>

        * boehm-gc/include/gc.h: (GC_CreateThread) This function is
        now exposed on all Win32 platforms.
        * boehm-gc/win32_threads.c: (GC_CreateThread) This now
        compiles on Win32; it invokes CreateThread() if GC is built
        as a DLL; otherwise it registers the thread.
        * boehm-gc/misc.c (GC_init): Initialize GC_allocate_ml in case
        libgcjgc was not built as a DLL.

From-SVN: r49563
This commit is contained in:
Adam Megacz 2002-02-07 03:56:40 +00:00 committed by Adam Megacz
parent b5ee195f1e
commit b1d246853d
4 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boehm-gc/ChangeLog
View File

@ -1,3 +1,13 @@
2002-02-06 Adam Megacz <adam@xwt.org>
* boehm-gc/include/gc.h: (GC_CreateThread) This function is
now exposed on all Win32 platforms.
* boehm-gc/win32_threads.c: (GC_CreateThread) This now
compiles on Win32; it invokes CreateThread() if GC is built
as a DLL; otherwise it registers the thread.
* boehm-gc/misc.c (GC_init): Initialize GC_allocate_ml in case
libgcjgc was not built as a DLL.
2002-02-01 Adam Megacz <adam@xwt.org> 2002-02-01 Adam Megacz <adam@xwt.org>
* boehm-gc on win32 now automatically detects if it is being built * boehm-gc on win32 now automatically detects if it is being built

32
boehm-gc/include/gc.h
View File

@ -849,9 +849,19 @@ extern void GC_thr_init(); /* Needed for Solaris/X86 */
#endif /* THREADS && !SRC_M3 */ #endif /* THREADS && !SRC_M3 */
#if defined(GC_WIN32_THREADS) && defined(_WIN32_WCE) #if defined(GC_WIN32_THREADS)
# include <windows.h> # include <windows.h>
/*
* All threads must be created using GC_CreateThread, so that they will be
* recorded in the thread table.
*/
HANDLE WINAPI GC_CreateThread(
LPSECURITY_ATTRIBUTES lpThreadAttributes,
DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress,
LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId );
# if defined(_WIN32_WCE)
/* /*
* win32_threads.c implements the real WinMain, which will start a new thread * win32_threads.c implements the real WinMain, which will start a new thread
* to call GC_WinMain after initializing the garbage collector. * to call GC_WinMain after initializing the garbage collector.
@ -862,21 +872,13 @@ extern void GC_thr_init(); /* Needed for Solaris/X86 */
LPWSTR lpCmdLine, LPWSTR lpCmdLine,
int nCmdShow ); int nCmdShow );
/* # ifndef GC_BUILD
* All threads must be created using GC_CreateThread, so that they will be # define WinMain GC_WinMain
* recorded in the thread table. # define CreateThread GC_CreateThread
*/ # endif
HANDLE WINAPI GC_CreateThread( # endif /* defined(_WIN32_WCE) */
LPSECURITY_ATTRIBUTES lpThreadAttributes,
DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress,
LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId );
# ifndef GC_BUILD #endif /* defined(GC_WIN32_THREADS) */
# define WinMain GC_WinMain
# define CreateThread GC_CreateThread
# endif
#endif
/* /*
* If you are planning on putting * If you are planning on putting

5
boehm-gc/misc.c
View File

@ -436,6 +436,11 @@ void GC_init()
DCL_LOCK_STATE; DCL_LOCK_STATE;
DISABLE_SIGNALS(); DISABLE_SIGNALS();
#ifdef MSWIN32
if (!GC_is_initialized) InitializeCriticalSection(&GC_allocate_ml);
#endif /* MSWIN32 */
LOCK(); LOCK();
GC_init_inner(); GC_init_inner();
UNLOCK(); UNLOCK();

15
boehm-gc/win32_threads.c
View File

@ -331,8 +331,18 @@ void GC_get_next_stack(char *start, char **lo, char **hi)
if (*lo < start) *lo = start; if (*lo < start) *lo = start;
} }
#if !defined(MSWINCE) && !(defined(__MINGW32__) && !defined(_DLL))
# ifdef MSWINCE HANDLE WINAPI GC_CreateThread(
LPSECURITY_ATTRIBUTES lpThreadAttributes,
DWORD dwStackSize, LPTHREAD_START_ROUTINE lpStartAddress,
LPVOID lpParameter, DWORD dwCreationFlags, LPDWORD lpThreadId )
{
return CreateThread(lpThreadAttributes, dwStackSize, lpStartAddress,
lpParameter, dwCreationFlags, lpThreadId);
}
#else /* !defined(MSWINCE) && !(defined(__MINGW32__) && !defined(_DLL))
typedef struct { typedef struct {
HANDLE child_ready_h, parent_ready_h; HANDLE child_ready_h, parent_ready_h;
@ -450,6 +460,9 @@ static DWORD WINAPI thread_start(LPVOID arg)
return ret; return ret;
} }
#endif /* !defined(MSWINCE) && !(defined(__MINGW32__) && !defined(_DLL))
#ifdef MSWINCE
typedef struct { typedef struct {
HINSTANCE hInstance; HINSTANCE hInstance;