diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-04-30 15:44:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-14 16:37:32 +1000 |
| commit | e90beb18000cf49b9108c4f977abfd111ed908ad (patch) | |
| tree | 4858f75d1c57118f0bcdb1e1c024bbc0435bea72 /glx | |
| parent | d0725a0b8672465cc4d3b85fb705ddb64d020476 (diff) | |
os: Use ErrorFSigSafe from FatalError and it's friends
Backtrace logging etc. is already sigsafe, but the actual FatalError message
in response is not yet, leading to amusing logs like this:
(EE) Segmentation fault at address 0x0
(EE) BUG: triggered 'if (inSignalContext)'
(EE) BUG: log.c:499 in LogVMessageVerb()
(EE) Warning: attempting to log data in a signal unsafe manner while in
signal context.
Please update to check inSignalContext and/or use LogMessageVerbSigSafe() or
ErrorFSigSafe().
The offending log format message is:
Fatal server error:
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 042c6d861f7bb7038ddcdd6b59766fd9094d0e52)
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxdri.c | 2 | ||||
| -rw-r--r-- | glx/glxdri2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/glx/glxdri.c b/glx/glxdri.c index da4646845..5891a68c5 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -885,7 +885,7 @@ glxDRILeaveVT(ScrnInfoPtr scrn) __GLXDRIscreen *screen = (__GLXDRIscreen *) glxGetScreen(xf86ScrnToScreen(scrn)); - LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n"); + LogMessageVerbSigSafe(X_INFO, -1, "AIGLX: Suspending AIGLX clients for VT switch\n"); glxSuspendClients(); diff --git a/glx/glxdri2.c b/glx/glxdri2.c index b26e501dc..16e7e3dee 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -835,7 +835,7 @@ glxDRILeaveVT(ScrnInfoPtr scrn) __GLXDRIscreen *screen = (__GLXDRIscreen *) glxGetScreen(xf86ScrnToScreen(scrn)); - LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n"); + LogMessageVerbSigSafe(X_INFO, -1, "AIGLX: Suspending AIGLX clients for VT switch\n"); glxSuspendClients(); |