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

(!1688) os: directly set console verbosity level, instead of using LogSetParameter() 

No need for extra call to some demuxer function for nothing but setting a
simple int variable. Setting verbosity level really is nothing more than just
writing some value into a variable, so it's trivial to just to do that, instead
of having an unncessarily complex "universal setter" for that.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-09 20:40:51 +02:00
parent 4cd73b26c0
commit 421eeec9c5
7 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/ephyr/ephyrinit.c
View File

@ -289,10 +289,8 @@ ddxProcessArgument(int argc, char **argv, int i)
} }
else if (!strcmp(argv[i], "-verbosity")) { else if (!strcmp(argv[i], "-verbosity")) {
if (i + 1 < argc && argv[i + 1][0] != '-') { if (i + 1 < argc && argv[i + 1][0] != '-') {
int verbosity = atoi(argv[i + 1]); xorgLogVerbosity = atoi(argv[i + 1]);
EPHYR_LOG("set verbosiry to %d\n", xorgLogVerbosity);
LogSetParameter(XLOG_VERBOSITY, verbosity);
EPHYR_LOG("set verbosiry to %d\n", verbosity);
return 2; return 2;
} }
else { else {

2
hw/xfree86/common/xf86Init.c
View File

@ -870,7 +870,7 @@ void
xf86SetVerbosity(int verb) xf86SetVerbosity(int verb)
{ {
xf86Verbose = verb; xf86Verbose = verb;
LogSetParameter(XLOG_VERBOSITY, verb); xorgLogVerbosity = verb;
} }
void void

4
hw/xwayland/xwayland.c
View File

@ -235,11 +235,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
val = strtol(argv[i], &end, 0); val = strtol(argv[i], &end, 0);
if (*end == '\0') { if (*end == '\0') {
verbosity = val; verbosity = val;
LogSetParameter(XLOG_VERBOSITY, verbosity); xorgLogVerbosity = verbosity;
return 2; return 2;
} }
} }
LogSetParameter(XLOG_VERBOSITY, ++verbosity); xorgLogVerbosity = ++verbosity;
return 1; return 1;
} }
else if (strcmp(argv[i], "-version") == 0) { else if (strcmp(argv[i], "-version") == 0) {

2
hw/xwin/InitOutput.c
View File

@ -542,7 +542,7 @@ OsVendorInit(void)
g_pszLogFile = LogInit(g_pszLogFile, ".old"); g_pszLogFile = LogInit(g_pszLogFile, ".old");
} }
LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose); xorgLogVerbosity = g_iLogVerbose;
LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose); LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose);
/* Log the version information */ /* Log the version information */

8
os/log.c
View File

@ -114,7 +114,7 @@ void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
static int logFileFd = -1; static int logFileFd = -1;
static Bool logSync = FALSE; static Bool logSync = FALSE;
static int logVerbosity = DEFAULT_LOG_VERBOSITY; int xorgLogVerbosity = DEFAULT_LOG_VERBOSITY;
static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY; static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY;
/* Buffer to information logged before the log file is opened. */ /* Buffer to information logged before the log file is opened. */
@ -319,7 +319,7 @@ LogSetParameter(LogParameter param, int value)
logSync = value ? TRUE : FALSE; logSync = value ? TRUE : FALSE;
return TRUE; return TRUE;
case XLOG_VERBOSITY: case XLOG_VERBOSITY:
logVerbosity = value; xorgLogVerbosity = value;
return TRUE; return TRUE;
case XLOG_FILE_VERBOSITY: case XLOG_FILE_VERBOSITY:
logFileVerbosity = value; logFileVerbosity = value;
@ -568,7 +568,7 @@ LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
static Bool newline = TRUE; static Bool newline = TRUE;
int ret; int ret;
if (verb < 0 || logVerbosity >= verb) if (verb < 0 || xorgLogVerbosity >= verb)
ret = write(2, buf, len); ret = write(2, buf, len);
if (verb < 0 || logFileVerbosity >= verb) { if (verb < 0 || logFileVerbosity >= verb) {
@ -620,7 +620,7 @@ LogMessageTypeVerbString(MessageType type, int verb)
if (type == X_ERROR) if (type == X_ERROR)
verb = 0; verb = 0;
if (logVerbosity < verb && logFileVerbosity < verb) if (xorgLogVerbosity < verb && logFileVerbosity < verb)
return NULL; return NULL;
switch (type) { switch (type) {

8
os/log_priv.h
View File

@ -68,4 +68,12 @@ int LogSetParameter(LogParameter param, int value);
#define DebugF(...) /* */ #define DebugF(...) /* */
#endif #endif
/**
* @brief console log verbosity (stderr)
*
* The verbosity level of logging to console. All messages with verbosity
* level below this one will be written to stderr
*/
extern int xorgLogVerbosity;
#endif /* __XORG_OS_LOGGING_H */ #endif /* __XORG_OS_LOGGING_H */

4
test/signal-logging.c
View File

@ -150,7 +150,7 @@ number_formatting(void)
-0x7FFFFFFFFFFFFFFF, /* Maximum 64-bit signed number */ -0x7FFFFFFFFFFFFFFF, /* Maximum 64-bit signed number */
} ; } ;
LogSetParameter(XLOG_VERBOSITY, -1); xorgLogVerbosity = -1;
for (i = 0; i < ARRAY_SIZE(unsigned_tests); i++) for (i = 0; i < ARRAY_SIZE(unsigned_tests); i++)
assert(check_number_format_test(unsigned_tests[i])); assert(check_number_format_test(unsigned_tests[i]));
@ -182,7 +182,7 @@ static void logging_format(void)
uintptr_t ptr; uintptr_t ptr;
char *fname = NULL; char *fname = NULL;
LogSetParameter(XLOG_VERBOSITY, -1); xorgLogVerbosity = -1;
/* set up buf to contain ".....end" */ /* set up buf to contain ".....end" */
memset(buf, '.', sizeof(buf)); memset(buf, '.', sizeof(buf));