frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1682) os: log: drop now meaningless XLOG_FLUSH option 

Since we're not indirectly writing via FILE anymore, this option has
become meaningless: it meant flushing out our in-process buffer to
the kernel, but we're now doing direct write() calls anyways.

xf86 still accepts the "flush" config file flag for backwards compatibility,
but it hasn't any practical meaning anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-10 12:35:30 +02:00
parent ac22cf2d45
commit 4510b21b76
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86Config.c
View File

@ -826,12 +826,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
{
if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) {
if (!xf86NameCmp(s, "flush")) {
xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
LogSetParameter(XLOG_FLUSH, TRUE);
xf86Msg(X_CONFIG, "flush log flag is noop\n");
}
else if (!xf86NameCmp(s, "sync")) {
xf86Msg(X_CONFIG, "Syncing logfile enabled\n");
LogSetParameter(XLOG_FLUSH, TRUE);
LogSetParameter(XLOG_SYNC, TRUE);
}
else {

1
hw/xwin/InitOutput.c
View File

@ -646,7 +646,6 @@ OsVendorInit(void)
g_pszLogFile = LogInit(g_pszLogFile, ".old");
}
LogSetParameter(XLOG_FLUSH, 1);
LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose);
LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose);

1
include/os.h
View File

@ -324,7 +324,6 @@ timingsafe_memcmp(const void *b1, const void *b2, size_t len);
/* Logging. */
typedef enum _LogParameter {
XLOG_FLUSH,
XLOG_SYNC,
XLOG_VERBOSITY,
XLOG_FILE_VERBOSITY

12
os/log.c
View File

@ -118,7 +118,6 @@ void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
#endif
static int logFileFd = -1;
static Bool logFlush = FALSE;
static Bool logSync = FALSE;
static int logVerbosity = DEFAULT_LOG_VERBOSITY;
static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY;
@ -341,9 +340,6 @@ Bool
LogSetParameter(LogParameter param, int value)
{
switch (param) {
case XLOG_FLUSH:
logFlush = value ? TRUE : FALSE;
return TRUE;
case XLOG_SYNC:
logSync = value ? TRUE : FALSE;
return TRUE;
@ -604,7 +600,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
if (inSignalContext && logFileFd >= 0) {
ret = write(logFileFd, buf, len);
#ifndef WIN32
if (logFlush && logSync)
if (logSync)
fsync(logFileFd);
#endif
}
@ -620,12 +616,10 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
}
newline = end_line;
write(logFileFd, buf, len);
if (logFlush) {
#ifndef WIN32
if (logSync)
fsync(logFileFd);
if (logSync)
fsync(logFileFd);
#endif
}
}
else if (!inSignalContext && needBuffer) {
if (len > bufferUnused) {