archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6751923: JNDI wake up when clock_settime() is called

Browse source 
Ported Chris Phillips' patch from jdk5 to jdk7

Reviewed-by: chrisphi, coleenp
This commit is contained in:
Zhengyu Gu 2010-11-18 14:37:46 -05:00
parent dd078e8562
commit 04b08adf06
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/os/solaris/vm/os_solaris.cpp
View file

@ -3375,7 +3375,12 @@ static int os_sleep(jlong millis, bool interruptible) {
// INTERRUPTIBLE_NORESTART_VM_ALWAYS returns res == OS_INTRPT for
// thread.Interrupt.
if((res == OS_ERR) && (errno == EINTR)) {
// See c/r 6751923. Poll can return 0 before time
// has elapsed if time is set via clock_settime (as NTP does).
// res == 0 if poll timed out (see man poll RETURN VALUES)
// using the logic below checks that we really did
// sleep at least "millis" if not we'll sleep again.
if( ( res == 0 ) || ((res == OS_ERR) && (errno == EINTR))) {
newtime = getTimeMillis();
assert(newtime >= prevtime, "time moving backwards");
/* Doing prevtime and newtime in microseconds doesn't help precision,