[Bug 3786] Timer starvation on high-load Windows ntpd.

bk: 63f3a868Te7OsfOxfl2eiKTBSL8gHw

diff --git a/ChangeLog b/ChangeLog
index 59a5dfe74f8f265ddde4194ac2bc8a0afe6b5bbb..0ba366ce1f70dd6699e9802bb6df01488fd67667 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
-* [Bug 2410] syslog an error message on panic exceeded.
+* [Bug 3786] Timer starvation on high-load Windows ntpd. <hart@ntp.org>
+* [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 * [Bug 3784] high-load ntpd on Windows deaf after enough ICMP TTL exceeded <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 

diff --git a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c
index 960e1abacb22f41c1312f486e1af03fb3df2dc1b..a190cedf00f962ae174e3671ce825bfda49ee55a 100644 (file)
--- a/ports/winnt/ntpd/ntp_iocompletionport.c
+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
@@ -1865,17 +1865,17 @@ GetReceivedBuffers(void)
                        FALSE, INFINITE, TRUE);
                switch (index) {
 
-               case WAIT_OBJECT_0 + 0: /* Io event */
-                       DPRINTF(4, ("IoEvent occurred\n"));
-                       have_packet = TRUE;
+               case WAIT_OBJECT_0 + 0: /* timer */
+                       timer();
                        break;
 
                case WAIT_OBJECT_0 + 1: /* exit request */
                        exit(0);
                        break;
 
-               case WAIT_OBJECT_0 + 2: /* timer */
-                       timer();
+               case WAIT_OBJECT_0 + 2: /* Io event */
+                       DPRINTF(7, ("IoEvent occurred\n"));
+                       have_packet = TRUE;
                        break;
 
                case WAIT_IO_COMPLETION: /* there might be something after APC */