# HG changeset patch
# User zgu
# Date 1290109066 18000
# Node ID 22260322f0be9b68dc87c9118d12a52be0a648b8
# Parent  13fee5052895745096af6ca7e1c92f1e8502e50f
6751923: JNDI wake up when clock_settime() is called
Summary: Ported Chris Phillips' patch from jdk5 to jdk7
Reviewed-by: chrisphi, coleenp

diff -r 13fee5052895 -r 22260322f0be src/os/solaris/vm/os_solaris.cpp
--- a/src/os/solaris/vm/os_solaris.cpp	Wed Nov 17 09:21:51 2010 -0500
+++ b/src/os/solaris/vm/os_solaris.cpp	Thu Nov 18 14:37:46 2010 -0500
@@ -3375,7 +3375,12 @@
     // 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,