OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/12647 ([win32] wait() does not release monitor correctly)

Browse Source 
PR libgcj/12647:
	* win32-threads.cc (_Jv_CondWait): Respect mutex's
	refcount when releasing and reacquiring it.

From-SVN: r73118
This commit is contained in:
Mohan Embar 2003-10-31 03:36:38 +00:00 committed by Mohan Embar
parent 748e241eab
commit d6bc9793de
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2003-10-30 Mohan Embar <gnustuff@thisiscool.com>
PR libgcj/12647:
* win32-threads.cc (_Jv_CondWait): Respect mutex's
refcount when releasing and reacquiring it.
2003-10-30 Mohan Embar <gnustuff@thisiscool.com>
* win32.cc: (dirExists) Internal helper function to

21
libjava/win32-threads.cc
View File

@ -126,7 +126,18 @@ _Jv_CondWait(_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint na
else if (millis == 0) time = INFINITE;
else time = millis;
_Jv_MutexUnlock (mu);
// Record the current lock depth, so it can be restored
// when we reacquire it.
int count = mu->refcount;
int curcount = count;
// Call _Jv_MutexUnlock repeatedly until this thread
// has completely released the monitor.
while (curcount > 0)
{
_Jv_MutexUnlock (mu);
--curcount;
}
// Set up our array of three events:
// - the auto-reset event (for notify())
@ -164,7 +175,13 @@ _Jv_CondWait(_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint na
if (last_waiter)
ResetEvent (cv->ev[1]);
_Jv_MutexLock (mu);
// Call _Jv_MutexLock repeatedly until the mutex's refcount is the
// same as before we originally released it.
while (curcount < count)
{
_Jv_MutexLock (mu);
++curcount;
}
return interrupted ? _JV_INTERRUPTED : 0;
}