65b8e87409
2003-01-28 Ranjit Mathew <rmathew@hotmail.com> Fixes PR java/9254: * include/win32-threads.h (_Jv_Mutex_t): Convert to a struct additionally containing id of the owner thread as well as the number of nested times the thread has acquired the mutex. (_Jv_MutexInit): Initialise owner thread id and refcount to 0. (_Jv_MutexDestroy): Reset owner thread id and refcount to 0. (_Jv_MutexUnlock): Check if really the owner thread, reset owner thread id to 0 before leaving, if leaving for the last time. (_Jv_MutexLock): Set owner thread id in the mutex and increment refcount. (_Jv_ThreadYield): Yield using a call to Sleep(0). * win32-threads.cc (_Jv_CondWait): Check if really owner of the passed mutex. Pass handle of the broadcast event, instead of a pointer to it in Win32 ResetEvent( ) call. Remove incorrect return values. (_Jv_CondDestroy): Close both event handles and delete critical section. (_Jv_CondNotify): Check if really the owner thread. (_Jv_CondNotifyAll): Check if really the owner thread. (_Jv_InitThreads): Change daemon_cond to a manual-reset event. (really_start): Use SetEvent( ) to signal daemon_cond. (_Jv_ThreadWait): Remove SignalObjectAndWait( ) and use WaitForSingleObject( ) instead to wait for daemon_cond to be signalled. From-SVN: r62033
166 lines
3.6 KiB
C++
166 lines
3.6 KiB
C++
// -*- c++ -*-
|
|
// win32-threads.h - Defines for using Win32 threads.
|
|
|
|
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
|
|
Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __JV_WIN32_THREADS__
|
|
#define __JV_WIN32_THREADS__
|
|
|
|
#include <windows.h>
|
|
|
|
//
|
|
// Typedefs.
|
|
//
|
|
|
|
typedef struct
|
|
{
|
|
// ev[0] (signal) is a Win32 auto-reset event for _Jv_CondNotify
|
|
// ev[1] (broadcast) is a Win32 manual-reset event for _Jv_CondNotifyAll
|
|
HANDLE ev[2];
|
|
|
|
// Number of threads waiting on this condition variable
|
|
int blocked_count;
|
|
|
|
// Protects access to the blocked_count variable
|
|
CRITICAL_SECTION count_mutex;
|
|
|
|
} _Jv_ConditionVariable_t;
|
|
|
|
typedef struct
|
|
{
|
|
// The thread-id of the owner thread if any, 0 otherwise
|
|
DWORD owner;
|
|
|
|
// Track nested mutex acquisitions by the same thread
|
|
int refcount;
|
|
|
|
// The actual Windows construct used to implement this mutex
|
|
CRITICAL_SECTION cs;
|
|
|
|
} _Jv_Mutex_t;
|
|
|
|
typedef struct
|
|
{
|
|
int flags; // Flags are defined in implementation.
|
|
HANDLE handle; // Actual handle to the thread
|
|
java::lang::Thread *thread_obj;
|
|
} _Jv_Thread_t;
|
|
|
|
typedef DWORD _Jv_ThreadId_t;
|
|
|
|
inline _Jv_ThreadId_t
|
|
_Jv_ThreadSelf (void)
|
|
{
|
|
return GetCurrentThreadId();
|
|
}
|
|
|
|
typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
|
|
|
|
//
|
|
// Condition variables.
|
|
//
|
|
|
|
int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos);
|
|
void _Jv_CondInit (_Jv_ConditionVariable_t *cv);
|
|
void _Jv_CondDestroy (_Jv_ConditionVariable_t *cv);
|
|
int _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *);
|
|
int _Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *);
|
|
|
|
//
|
|
// Mutexes.
|
|
// We use CRITICAL_SECTIONs instead of CreateMutex() for better performance
|
|
//
|
|
|
|
inline void _Jv_MutexInit (_Jv_Mutex_t *mu)
|
|
{
|
|
mu->owner = 0UL;
|
|
mu->refcount = 0;
|
|
InitializeCriticalSection (&(mu->cs));
|
|
}
|
|
|
|
#define _Jv_HaveMutexDestroy
|
|
inline void _Jv_MutexDestroy (_Jv_Mutex_t *mu)
|
|
{
|
|
mu->owner = 0UL;
|
|
mu->refcount = 0;
|
|
DeleteCriticalSection (&(mu->cs));
|
|
mu = NULL;
|
|
}
|
|
|
|
inline int _Jv_MutexUnlock (_Jv_Mutex_t *mu)
|
|
{
|
|
if (mu->owner == GetCurrentThreadId ( ))
|
|
{
|
|
mu->refcount--;
|
|
if (mu->refcount == 0)
|
|
mu->owner = 0UL;
|
|
LeaveCriticalSection (&(mu->cs));
|
|
return 0;
|
|
}
|
|
else
|
|
return 1;
|
|
}
|
|
|
|
inline int _Jv_MutexLock (_Jv_Mutex_t *mu)
|
|
{
|
|
EnterCriticalSection (&(mu->cs));
|
|
mu->owner = GetCurrentThreadId ( );
|
|
mu->refcount++;
|
|
return 0;
|
|
}
|
|
|
|
//
|
|
// Thread creation and manipulation.
|
|
//
|
|
|
|
void _Jv_InitThreads (void);
|
|
_Jv_Thread_t *_Jv_ThreadInitData (java::lang::Thread *thread);
|
|
void _Jv_ThreadDestroyData (_Jv_Thread_t *data);
|
|
|
|
inline java::lang::Thread* _Jv_ThreadCurrent (void)
|
|
{
|
|
extern DWORD _Jv_ThreadKey;
|
|
return (java::lang::Thread *) TlsGetValue(_Jv_ThreadKey);
|
|
}
|
|
|
|
inline _Jv_Thread_t *_Jv_ThreadCurrentData(void)
|
|
{
|
|
extern DWORD _Jv_ThreadDataKey;
|
|
return (_Jv_Thread_t *) TlsGetValue(_Jv_ThreadDataKey);
|
|
}
|
|
|
|
inline void _Jv_ThreadYield (void)
|
|
{
|
|
Sleep (0);
|
|
}
|
|
|
|
void _Jv_ThreadRegister (_Jv_Thread_t *data);
|
|
void _Jv_ThreadUnRegister ();
|
|
|
|
void _Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio);
|
|
void _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data,
|
|
_Jv_ThreadStartFunc *meth);
|
|
void _Jv_ThreadWait (void);
|
|
void _Jv_ThreadInterrupt (_Jv_Thread_t *data);
|
|
|
|
// Remove defines from <windows.h> that conflict with various things in libgcj code
|
|
|
|
#undef TRUE
|
|
#undef FALSE
|
|
#undef MAX_PRIORITY
|
|
#undef MIN_PRIORITY
|
|
#undef min
|
|
#undef max
|
|
#undef interface
|
|
#undef STRICT
|
|
#undef VOID
|
|
|
|
#endif /* __JV_WIN32_THREADS__ */
|