OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/log: Drop manual log buffering

Browse Source 
This buffering was introduced during the Paleozoic: 9fa3e85353.

There has never been an explanation as to why we may not allow
glibc to allocate the file buffer itself.  We certainly have
many other uses of mmap and malloc during user-only startup,
so presumably whatever the issue was, it has been fixed during
the preceeding 18 years.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220417183019.755276-2-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:29:41 -07:00
parent 40a4b96eb0
commit 54ee5b3da0
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsd-user/main.c
View File

@ -405,7 +405,6 @@ int main(int argc, char **argv)
}
/* init debug */
qemu_log_needs_buffers();
qemu_set_log_filename(log_file, &error_fatal);
if (log_mask) {
int mask;

1
include/qemu/log.h
View File

@ -148,7 +148,6 @@ typedef struct QEMULogItem {
extern const QEMULogItem qemu_log_items[];
void qemu_set_log(int log_flags);
void qemu_log_needs_buffers(void);
void qemu_set_log_filename(const char *filename, Error **errp);
void qemu_set_dfilter_ranges(const char *ranges, Error **errp);
bool qemu_log_in_addr_range(uint64_t addr);

1
linux-user/main.c
View File

@ -679,7 +679,6 @@ int main(int argc, char **argv, char **envp)
log_mask = last_log_mask | (enable_strace ? LOG_STRACE : 0);
if (log_mask) {
qemu_log_needs_buffers();
qemu_set_log(log_mask);
}

21
util/log.c
View File

@ -72,8 +72,6 @@ static void qemu_logfile_free(QemuLogFile *logfile)
g_free(logfile);
}
static bool log_uses_own_buffers;
/* enable or disable low levels log */
void qemu_set_log(int log_flags)
{
@ -121,29 +119,18 @@ void qemu_set_log(int log_flags)
assert(!is_daemonized());
logfile->fd = stderr;
}
/* must avoid mmap() usage of glibc by setting a buffer "by hand" */
if (log_uses_own_buffers) {
static char logfile_buf[4096];
setvbuf(logfile->fd, logfile_buf, _IOLBF, sizeof(logfile_buf));
} else {
#if defined(_WIN32)
/* Win32 doesn't support line-buffering, so use unbuffered output. */
setvbuf(logfile->fd, NULL, _IONBF, 0);
/* Win32 doesn't support line-buffering, so use unbuffered output. */
setvbuf(logfile->fd, NULL, _IONBF, 0);
#else
setvbuf(logfile->fd, NULL, _IOLBF, 0);
setvbuf(logfile->fd, NULL, _IOLBF, 0);
#endif
log_append = 1;
}
log_append = 1;
qatomic_rcu_set(&qemu_logfile, logfile);
}
}
void qemu_log_needs_buffers(void)
{
log_uses_own_buffers = true;
}
/*
* Allow the user to include %d in their logfile which will be
* substituted with the current PID. This is useful for debugging many