Changeset 971

Timestamp:

11/10/2006 22:58:41 (5 years ago)

Author:

chris

Message:

• More accurate timing (avoids spin loops of zero wait during the last second of polling)

File:

• box/chris/general/lib/server/SocketStreamTLS.cpp (modified) (2 diffs)

box/chris/general/lib/server/SocketStreamTLS.cpp

@@ -24 +24 @@
 #include "ServerException.h"
 #include "TLSContext.h"
+#include "BoxTime.h"
 
 #include "MemLeakFindOn.h"
@@ -245 +246 @@
         }
         p.revents = 0;
-        switch(::poll(&p, 1, (Timeout == IOStream::TimeOutInfinite)?INFTIM:Timeout))
+
+        int64_t start, end;
+        start = BoxTimeToMilliSeconds(GetCurrentBoxTime());
+        end   = start + Timeout;
+        int result;
+
+        do
+        {
+                int64_t now = BoxTimeToMilliSeconds(GetCurrentBoxTime());
+                int poll_timeout = (int)(end - now);
+                if (poll_timeout < 0) poll_timeout = 0;
+                if (Timeout == IOStream::TimeOutInfinite)
+                {
+                        poll_timeout = INFTIM;
+                }
+                result = ::poll(&p, 1, poll_timeout);
+        }
+        while(result == -1 && errno == EINTR);
+
+        switch(result)
         {
         case -1:
-                // error
-                if(errno == EINTR)
-                {
-                        // Signal. Do "time out"
-                        return false;
-                }
-                else
-                {
-                        // Bad!
-                        THROW_EXCEPTION(ServerException, SocketPollError)
-                }
+                // error - Bad!
+                THROW_EXCEPTION(ServerException, SocketPollError)
                 break;