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

Add global variable inSignalContext 

This will be used for checking for proper logging when in signal
context.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Chase Douglas 2012-04-06 07:43:57 -07:00 committed by Peter Hutterer
parent 8dc70acbf3
commit d3725549f0
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/os-support/shared/sigio.c
View File

@ -99,6 +99,8 @@ xf86SIGIO(int sig)
int save_errno = errno; /* do not clobber the global errno */ int save_errno = errno; /* do not clobber the global errno */
int r; int r;
inSignalContext = TRUE;
ready = xf86SigIOMask; ready = xf86SigIOMask;
to.tv_sec = 0; to.tv_sec = 0;
to.tv_usec = 0; to.tv_usec = 0;
@ -114,6 +116,8 @@ xf86SIGIO(int sig)
} }
/* restore global errno */ /* restore global errno */
errno = save_errno; errno = save_errno;
inSignalContext = FALSE;
} }
static int static int

3
include/globals.h
View File

@ -2,6 +2,8 @@
#ifndef _XSERV_GLOBAL_H_ #ifndef _XSERV_GLOBAL_H_
#define _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_
#include <signal.h>
#include "window.h" /* for WindowPtr */ #include "window.h" /* for WindowPtr */
/* Global X server variables that are visible to mi, dix, os, and ddx */ /* Global X server variables that are visible to mi, dix, os, and ddx */
@ -23,6 +25,7 @@ extern _X_EXPORT int GrabInProgress;
extern _X_EXPORT Bool noTestExtensions; extern _X_EXPORT Bool noTestExtensions;
extern _X_EXPORT char *SeatId; extern _X_EXPORT char *SeatId;
extern _X_EXPORT char *ConnectionInfo; extern _X_EXPORT char *ConnectionInfo;
extern _X_EXPORT sig_atomic_t inSignalContext;
#ifdef DPMSExtension #ifdef DPMSExtension
extern _X_EXPORT CARD32 DPMSStandbyTime; extern _X_EXPORT CARD32 DPMSStandbyTime;

2
os/utils.c
View File

@ -204,6 +204,8 @@ int auditTrailLevel = 1;
char *SeatId = NULL; char *SeatId = NULL;
sig_atomic_t inSignalContext = FALSE;
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
#define HAS_SAVED_IDS_AND_SETEUID #define HAS_SAVED_IDS_AND_SETEUID
#endif #endif