diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-06-07 15:52:15 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-06-08 11:36:32 -0400 |
| commit | 5bcdd1cc753d8e60c249eeacba695653af1a39d8 (patch) | |
| tree | a9e388823d5269579ffee0cb5feaee9f44c801c4 /mi | |
| parent | 48a9b29b0a09b865492d60e8a7cd2a94864fbb3f (diff) | |
dix: Update some comments to reflect the new non-SIGIO input model
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mieq.c | 3 | ||||
| -rw-r--r-- | mi/mipointer.c | 5 | ||||
| -rw-r--r-- | mi/mipointrst.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -239,8 +239,7 @@ mieqEnqueue(DeviceIntPtr pDev, InternalEvent *e) else if (n_enqueued + 1 == miEventQueue.nevents) { if (!mieqGrowQueue(&miEventQueue, miEventQueue.nevents << 1)) { /* Toss events which come in late. Usually this means your server's - * stuck in an infinite loop somewhere, but SIGIO is still getting - * handled. + * stuck in an infinite loop in the main thread. */ miEventQueue.dropped++; if (miEventQueue.dropped == 1) { diff --git a/mi/mipointer.c b/mi/mipointer.c index 3f6252d2f..01f3bd2fe 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -555,8 +555,9 @@ miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) pPointer = MIPOINTER(pDev); /* Hack: We mustn't call into ->MoveCursor for anything but the - * VCP, as this may cause a non-HW rendered cursor to be rendered during - * SIGIO. This again leads to allocs during SIGIO which leads to SIGABRT. + * VCP, as this may cause a non-HW rendered cursor to be rendered while + * not holding the input lock. This would race with building the command + * buffer for other rendering. */ if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer &&!pScreenPriv->waitForUpdate && pScreen == pPointer->pSpriteScreen) { diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 4319b12c6..7419ac107 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -38,7 +38,7 @@ typedef struct { miPointerSpriteFuncPtr spriteFuncs; /* sprite-specific methods */ miPointerScreenFuncPtr screenFuncs; /* screen-specific methods */ CloseScreenProcPtr CloseScreen; - Bool waitForUpdate; /* don't move cursor in SIGIO */ + Bool waitForUpdate; /* don't move cursor from input thread */ Bool showTransparent; /* show empty cursors */ } miPointerScreenRec, *miPointerScreenPtr; #endif /* MIPOINTRST_H */ |