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

xwin: drop duplicate OsVendorVErrorF() 

It really doesn't seem to be necessary to protect a LogVMessageVerb()
call by extra mutex on windows only, while obviously not needed on
any other platform.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1691>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-13 12:02:58 +02:00 committed by Marge Bot
parent da22bc9ae0
commit 9652bc73e2
6 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwin/InitOutput.c
View File

@ -633,9 +633,6 @@ OsVendorInit(void)
winFixupPaths(); winFixupPaths();
if (!OsVendorVErrorFProc)
OsVendorVErrorFProc = OsVendorVErrorF;
if (!g_fLogInited) { if (!g_fLogInited) {
/* keep this order. If LogInit fails it calls Abort which then calls /* keep this order. If LogInit fails it calls Abort which then calls
* ddxGiveUp where LogInit is called again and creates an infinite * ddxGiveUp where LogInit is called again and creates an infinite

4
hw/xwin/win.h
View File

@ -742,10 +742,6 @@ void
* winerror.c * winerror.c
*/ */
void
OsVendorVErrorF(const char *pszFormat, va_list va_args)
_X_ATTRIBUTE_PRINTF(1, 0);
void void
winMessageBoxF(const char *pszError, UINT uType, ...) winMessageBoxF(const char *pszError, UINT uType, ...)
_X_ATTRIBUTE_PRINTF(1, 3); _X_ATTRIBUTE_PRINTF(1, 3);

17
hw/xwin/winerror.c
View File

@ -39,23 +39,6 @@
#include "dix/input_priv.h" #include "dix/input_priv.h"
void
OsVendorVErrorF(const char *pszFormat, va_list va_args)
{
/* make sure the clipboard and multiwindow threads do not interfere the
* main thread */
static pthread_mutex_t s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
/* Lock the printing mutex */
pthread_mutex_lock(&s_pmPrinting);
/* Print the error message to a log file, could be stderr */
LogVMessageVerb(X_NONE, 0, pszFormat, va_args);
/* Unlock the printing mutex */
pthread_mutex_unlock(&s_pmPrinting);
}
/* /*
* os/log.c:FatalError () calls our vendor ErrorF, so the message * os/log.c:FatalError () calls our vendor ErrorF, so the message
* from a FatalError will be logged. * from a FatalError will be logged.

6
hw/xwin/winprocarg.c
View File

@ -225,12 +225,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
/* Initialize once */ /* Initialize once */
if (!s_fBeenHere) { if (!s_fBeenHere) {
/*
* This initialises our hook into VErrorF () for catching log messages
* that are generated before OsInit () is called.
*/
OsVendorVErrorFProc = OsVendorVErrorF;
s_fBeenHere = TRUE; s_fBeenHere = TRUE;
/* Initialize only if option is not -help */ /* Initialize only if option is not -help */

5
os/log.c
View File

@ -105,8 +105,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#pragma clang diagnostic ignored "-Wformat-nonliteral" #pragma clang diagnostic ignored "-Wformat-nonliteral"
#endif #endif
void (*OsVendorVErrorFProc) (const char *, va_list args) = NULL;
/* Default logging parameters. */ /* Default logging parameters. */
#define DEFAULT_LOG_VERBOSITY 0 #define DEFAULT_LOG_VERBOSITY 0
#define DEFAULT_LOG_FILE_VERBOSITY 3 #define DEFAULT_LOG_FILE_VERBOSITY 3
@ -911,9 +909,6 @@ FatalError(const char *f, ...)
void void
VErrorF(const char *f, va_list args) VErrorF(const char *f, va_list args)
{ {
if (OsVendorVErrorFProc)
OsVendorVErrorFProc(f, args);
else
LogVMessageVerb(X_NONE, -1, f, args); LogVMessageVerb(X_NONE, -1, f, args);
} }

4
os/osdep.h
View File

@ -176,10 +176,6 @@ int os_move_fd(int fd);
depending on whether multithreading is used */ depending on whether multithreading is used */
int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest); int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
/* callback for DDX specific error printing, if any (may be NULL) */
extern void (*OsVendorVErrorFProc) (const char *, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
typedef void (*OsSigHandlerPtr) (int sig); typedef void (*OsSigHandlerPtr) (int sig);
/* install signal handler */ /* install signal handler */