ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'jdk7' of oss.readytalk.com:/var/local/git/avian into jdk7

Browse Source
This commit is contained in:
Joel Dice 2012-04-29 13:20:22 -06:00
commit 577df3cb04
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/classpath-openjdk.cpp
View File

@ -2739,12 +2739,15 @@ Avian_sun_misc_Unsafe_park
if (time <= 0) { if (time <= 0) {
return; return;
} }
} else { } else if (time) {
time /= 1000 * 1000; // if not absolute, interpret time as nanoseconds, but make sure
// it doesn't become zero when we convert to milliseconds, since
// zero is interpreted as infinity below
time = (time / (1000 * 1000)) + 1;
} }
monitorAcquire(t, local::interruptLock(t, t->javaThread)); monitorAcquire(t, local::interruptLock(t, t->javaThread));
while (time > 0 while (time >= 0
and (not (threadUnparked(t, t->javaThread) and (not (threadUnparked(t, t->javaThread)
or monitorWait or monitorWait
(t, local::interruptLock(t, t->javaThread), time)))) (t, local::interruptLock(t, t->javaThread), time))))
@ -2752,6 +2755,10 @@ Avian_sun_misc_Unsafe_park
int64_t now = t->m->system->now(); int64_t now = t->m->system->now();
time -= now - then; time -= now - then;
then = now; then = now;
if (time == 0) {
break;
}
} }
threadUnparked(t, t->javaThread) = false; threadUnparked(t, t->javaThread) = false;
monitorRelease(t, local::interruptLock(t, t->javaThread)); monitorRelease(t, local::interruptLock(t, t->javaThread));