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

Merge remote-tracking branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2013-11-01 00:34:18 -07:00
parent 66c5ee0ff4 f36f5a65f6
commit 977e2644b1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Xext/sync.c
View File

@ -2682,7 +2682,16 @@ IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMa
IdleTimeQueryValue(counter, &idle); IdleTimeQueryValue(counter, &idle);
counter->value = idle; /* push, so CheckTrigger works */ counter->value = idle; /* push, so CheckTrigger works */
if (less && XSyncValueLessOrEqual(idle, *less)) { /**
* There's an indefinite amount of time between ProcessInputEvents()
* where the idle time is reset and the time we actually get here. idle
* may be past the lower bracket if we dawdled with the events, so
* check for whether we did reset and bomb out of select immediately.
*/
if (less && XSyncValueGreaterThan(idle, *less) &&
LastEventTimeWasReset(priv->deviceid)) {
AdjustWaitForDelay(wt, 0);
} else if (less && XSyncValueLessOrEqual(idle, *less)) {
/* /*
* We've been idle for less than the threshold value, and someone * We've been idle for less than the threshold value, and someone
* wants to know about that, but now we need to know whether they * wants to know about that, but now we need to know whether they

2
configure.ac
View File

@ -296,7 +296,7 @@ AC_CHECK_HEADER([machine/apmvar.h],[
AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes]) AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])
AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes]) AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])
dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c) dnl glibc backtrace support check
AC_CHECK_HEADER([execinfo.h],[ AC_CHECK_HEADER([execinfo.h],[
AC_CHECK_LIB(c, backtrace, [ AC_CHECK_LIB(c, backtrace, [
AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support]) AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])

5
os/backtrace.c
View File

@ -114,14 +114,15 @@ xorg_backtrace(void)
void void
xorg_backtrace(void) xorg_backtrace(void)
{ {
void *array[64]; const int BT_SIZE = 64;
void *array[BT_SIZE];
const char *mod; const char *mod;
int size, i; int size, i;
Dl_info info; Dl_info info;
ErrorFSigSafe("\n"); ErrorFSigSafe("\n");
ErrorFSigSafe("Backtrace:\n"); ErrorFSigSafe("Backtrace:\n");
size = backtrace(array, 64); size = backtrace(array, BT_SIZE);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
int rc = dladdr(array[i], &info); int rc = dladdr(array[i], &info);