[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Wed Oct 5 08:46:41 UTC 2011


#### ChangeSet ####
2011-10-05 08:34:46+00:00, davehart at shiny.ad.hartbrothers.com
  Keep add_full_recv_buffer() and SetEvent(WaitableIoEventHandle) 1:1

==== include/ntp_refclock.h ====
2011-10-05 08:34:44+00:00, davehart at shiny.ad.hartbrothers.com +4 -0
  Keep add_full_recv_buffer() and SetEvent(WaitableIoEventHandle) 1:1

--- 1.31/include/ntp_refclock.h	2011-10-05 03:49:11 -04:00
+++ 1.32/include/ntp_refclock.h	2011-10-05 04:34:44 -04:00
@@ -120,6 +120,10 @@ struct refclockbug {
 	l_fp	times[NCLKBUGTIMES]; /* real times */
 };
 
+#ifdef HAVE_IO_COMPLETION_PORT
+extern	HANDLE	WaitableIoEventHandle;
+#endif
+
 /*
  * Structure interface between the reference clock support
  * ntp_refclock.c and the driver utility routines

==== ntpd/ntp_refclock.c ====
2011-10-05 08:34:44+00:00, davehart at shiny.ad.hartbrothers.com +3 -1
  Keep add_full_recv_buffer() and SetEvent(WaitableIoEventHandle) 1:1

--- 1.108/ntpd/ntp_refclock.c	2011-10-05 03:49:12 -04:00
+++ 1.109/ntpd/ntp_refclock.c	2011-10-05 04:34:44 -04:00
@@ -674,7 +674,9 @@ indicate_refclock_packet(
 		return TRUE;
 	}
 	add_full_recv_buffer(rb);
-
+#ifdef HAVE_IO_COMPLETION_PORT
+	SetEvent(WaitableIoEventHandle);
+#endif
 	return FALSE;
 }
 

==== ntpd/refclock_parse.c ====
2011-10-05 08:34:44+00:00, davehart at shiny.ad.hartbrothers.com +3 -0
  Keep add_full_recv_buffer() and SetEvent(WaitableIoEventHandle) 1:1

--- 1.60/ntpd/refclock_parse.c	2011-10-05 03:49:12 -04:00
+++ 1.61/ntpd/refclock_parse.c	2011-10-05 04:34:44 -04:00
@@ -2323,6 +2323,9 @@ local_input(
 					parse->generic->io.recvcount++;
 					packets_received++;
 					add_full_recv_buffer(buf);
+#ifdef HAVE_IO_COMPLETION_PORT
+					SetEvent(WaitableIoEventHandle);
+#endif
 				}
 				parse_iodone(&parse->parseio);
 			}

==== ports/winnt/ntpd/ntp_iocompletionport.c ====
2011-10-05 08:34:44+00:00, davehart at shiny.ad.hartbrothers.com +2 -4
  Keep add_full_recv_buffer() and SetEvent(WaitableIoEventHandle) 1:1

--- 1.59/ports/winnt/ntpd/ntp_iocompletionport.c	2011-10-05 03:49:12 -04:00
+++ 1.60/ports/winnt/ntpd/ntp_iocompletionport.c	2011-10-05 04:34:44 -04:00
@@ -88,8 +88,8 @@ static HANDLE hHeapHandle = NULL;
 #endif
 
 	HANDLE WaitableExitEventHandle;
-static	HANDLE hIoCompletionPort = NULL;
-static	HANDLE WaitableIoEventHandle = NULL;
+	HANDLE WaitableIoEventHandle;
+static	HANDLE hIoCompletionPort;
 
 #ifdef NTPNEEDNAMEDHANDLE
 #define WAITABLEIOEVENTHANDLE "WaitableIoEventHandle"
@@ -616,7 +616,6 @@ OnSerialReadComplete(
 			if (!consumed) {
 				packets_received++;
 				handler_pkts++;
-				SetEvent(WaitableIoEventHandle);
 			}
 			buff = get_free_recv_buffer_alloc();
 		}
@@ -688,7 +687,6 @@ OnRawSerialReadComplete(
 			rio->recvcount++;
 			packets_received++;
 			handler_pkts++;
-			SetEvent(WaitableIoEventHandle);
 		}
 		rbufp = get_free_recv_buffer_alloc();
 	}


More information about the bk-ntp-dev-send mailing list