[PATCH v7 09/16] daemon: use full buffered mode for stderr

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Erik Faye-Lund
Date: Wednesday, November 3, 2010 - 6:35 pm

Windows doesn't support line buffered mode for file
streams, so let's just use full buffered mode with
a big buffer ("4096 should be enough for everyone")
and add explicit flushing.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
 daemon.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/daemon.c b/daemon.c
index 4059593..941c095 100644
--- a/daemon.c
+++ b/daemon.c
@@ -67,12 +67,14 @@ static void logreport(int priority, const char *err, va_list params)
 		syslog(priority, "%s", buf);
 	} else {
 		/*
-		 * Since stderr is set to linebuffered mode, the
+		 * Since stderr is set to buffered mode, the
 		 * logging of different processes will not overlap
+		 * unless they overflow the (rather big) buffers.
 		 */
 		fprintf(stderr, "[%"PRIuMAX"] ", (uintmax_t)getpid());
 		vfprintf(stderr, err, params);
 		fputc('\n', stderr);
+		fflush(stderr);
 	}
 }
 
@@ -1117,7 +1119,7 @@ int main(int argc, char **argv)
 		set_die_routine(daemon_die);
 	} else
 		/* avoid splitting a message in the middle */
-		setvbuf(stderr, NULL, _IOLBF, 0);
+		setvbuf(stderr, NULL, _IOFBF, 4096);
 
 	if (inetd_mode && (group_name || user_name))
 		die("--user and --group are incompatible with --inetd");
-- 
1.7.3.2.162.g09d37

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH v7 00/16] daemon-win32, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 01/16] mingw: add network-wrappers for daemon, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 02/16] mingw: implement syslog, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 05/16] mingw: use real pid, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 07/16] mingw: add kill emulation, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 09/16] daemon: use full buffered mode for stderr, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 12/16] mingw: import poll-emulation from gnulib, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 13/16] mingw: use poll-emulation from gnulib, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH v7 14/16] daemon: use socklen_t, Erik Faye-Lund, (Wed Nov 3, 6:35 pm)
[PATCH] daemon: support &lt;directory&gt; arguments again, Jonathan Nieder, (Mon Jan 3, 9:04 pm)