[Git][NTPsec/ntpsec][master] Remove empty macros formerly required because of signaled I/O.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
a037b3d3 by Eric S. Raymond at 2016-08-29T06:55:33-04:00
Remove empty macros formerly required because of signaled I/O.

- - - - -


2 changed files:

- include/ntpd.h
- ntpd/ntpd.c


Changes:

=====================================
include/ntpd.h
=====================================
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -131,8 +131,6 @@ extern	void	sendpkt 	(sockaddr_u *, struct interface *, int, void *, int);
 #ifdef DEBUG
 extern	void	collect_timing  (struct recvbuf *, const char *, int, l_fp *);
 #endif
-#define	UNBLOCK_IO_AND_ALARM()	do {} while (0)
-#define	BLOCK_IO_AND_ALARM()	do {} while (0)
 #define		latoa(pif)	localaddrtoa(pif)
 extern const char * localaddrtoa(endpt *);
 


=====================================
ntpd/ntpd.c
=====================================
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -959,7 +959,6 @@ static void mainloop(void)
 		GetReceivedBuffers();
 # else /* normal I/O */
 
-	BLOCK_IO_AND_ALARM();
 	was_alarmed = false;
 
 	for (;;) {
@@ -985,14 +984,12 @@ static void mainloop(void)
 		}
 
 		if (was_alarmed) {
-			UNBLOCK_IO_AND_ALARM();
 			/*
 			 * Out here, signals are unblocked.  Call timer routine
 			 * to process expiry.
 			 */
 			timer();
 			was_alarmed = false;
-			BLOCK_IO_AND_ALARM();
 		}
 
 # endif		/* !HAVE_IO_COMPLETION_PORT */
@@ -1012,7 +1009,6 @@ static void mainloop(void)
 					was_alarmed = true;
 					alarm_flag = false;
 				}
-				UNBLOCK_IO_AND_ALARM();
 
 				if (was_alarmed) {
 					/* avoid timer starvation during lengthy I/O handling */



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/a037b3d32296601d6825a4c10c158ec63300017a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160829/d5eb62f5/attachment.html>