summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorratchov <ratchov@openbsd.org>2016-05-25 05:37:12 +0000
committerratchov <ratchov@openbsd.org>2016-05-25 05:37:12 +0000
commit9c0af79a156319aebfd3ca8d421bfba5dab419b3 (patch)
tree94ad6db45ea8f709b262a4125c363aa40540cc43
parentSet initial mixer slot name to "prog" to make all slots visible in (diff)
downloadwireguard-openbsd-9c0af79a156319aebfd3ca8d421bfba5dab419b3.tar.xz
wireguard-openbsd-9c0af79a156319aebfd3ca8d421bfba5dab419b3.zip
Log files skipped during poll() as well, and flush the log buffer
right before we call poll().
-rw-r--r--usr.bin/sndiod/file.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/sndiod/file.c b/usr.bin/sndiod/file.c
index cf922a3c659..9c31d3dfc19 100644
--- a/usr.bin/sndiod/file.c
+++ b/usr.bin/sndiod/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.20 2016/01/18 11:41:13 ratchov Exp $ */
+/* $OpenBSD: file.c,v 1.21 2016/05/25 05:37:12 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -318,8 +318,6 @@ file_poll(void)
long long delta_nsec;
int nfds, res, timo;
- log_flush();
-
/*
* cleanup zombies
*/
@@ -355,8 +353,6 @@ file_poll(void)
log_puts("poll:");
pfd = pfds;
for (f = file_list; f != NULL; f = f->next) {
- if (f->nfds == 0)
- continue;
log_puts(" ");
log_puts(f->ops->name);
log_puts(":");
@@ -396,6 +392,7 @@ file_poll(void)
timo = TIMER_MSEC;
} else
timo = -1;
+ log_flush();
res = poll(pfds, nfds, timo);
if (res < 0) {
if (errno != EINTR) {