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

mi: change infamous "Tossed event ..." error for something more explanatory. 

Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db)
This commit is contained in:
Peter Hutterer 2007-12-07 20:18:49 +10:30 committed by Dave Airlie
parent c31aead0fe
commit e070c2cbef
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mi/mieq.c
View File

@ -122,7 +122,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
* motion event they need to be attached to. Sigh. */ * motion event they need to be attached to. Sigh. */
if (e->u.u.type == DeviceValuator) { if (e->u.u.type == DeviceValuator) {
if (laste->nevents > 6) { if (laste->nevents > 6) {
ErrorF("mieqEnqueue: more than six valuator events; dropping.\n"); ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n");
return; return;
} }
if (oldtail == miEventQueue.head || if (oldtail == miEventQueue.head ||
@ -133,7 +133,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
lastkbp->type == ProximityOut) || lastkbp->type == ProximityOut) ||
((lastkbp->deviceid & DEVICE_BITS) != ((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) { (v->deviceid & DEVICE_BITS))) {
ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n"); ErrorF("[mi] mieqEnequeue: out-of-order valuator event; dropping.\n");
return; return;
} }
memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent)); memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent));
@ -145,12 +145,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
oldtail = (oldtail - 1) % QUEUE_SIZE; oldtail = (oldtail - 1) % QUEUE_SIZE;
} }
else { else {
newtail = (oldtail + 1) % QUEUE_SIZE; newtail = (oldtail + 1) % QUEUE_SIZE;
/* Toss events which come in late. Usually this means your server's /* Toss events which come in late. Usually this means your server's
* stuck in an infinite loop somewhere, but SIGIO is still getting * stuck in an infinite loop somewhere, but SIGIO is still getting
* handled. */ * handled. */
if (newtail == miEventQueue.head) { if (newtail == miEventQueue.head) {
ErrorF("tossed event which came in late\n"); ErrorF("[mi] EQ overflowing. The server is probably stuck "
"in an infinite loop.\n");
return; return;
} }
miEventQueue.tail = newtail; miEventQueue.tail = newtail;