diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-12-07 20:18:49 +1030 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-01-09 13:42:10 +1000 |
commit | e070c2cbef0d6fbbafce8d417e8b29231c2fdc50 (patch) | |
tree | 99cfdd1cc36f5e82792bc6a7d8a59f7a1acf2f17 /mi | |
parent | c31aead0fe9fe424120ce221cd9f76cb6d29a5b5 (diff) |
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db49efd3f04432ff45871b44c7d4ad57)
Diffstat (limited to 'mi')
-rw-r--r-- | mi/mieq.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -122,7 +122,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) * motion event they need to be attached to. Sigh. */ if (e->u.u.type == DeviceValuator) { if (laste->nevents > 6) { - ErrorF("mieqEnqueue: more than six valuator events; dropping.\n"); + ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n"); return; } if (oldtail == miEventQueue.head || @@ -133,7 +133,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) lastkbp->type == ProximityOut) || ((lastkbp->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; } memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent)); @@ -145,12 +145,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e) oldtail = (oldtail - 1) % QUEUE_SIZE; } else { - newtail = (oldtail + 1) % QUEUE_SIZE; - /* Toss events which come in late. Usually this means your server's + newtail = (oldtail + 1) % QUEUE_SIZE; + /* Toss events which come in late. Usually this means your server's * stuck in an infinite loop somewhere, but SIGIO is still getting * handled. */ - if (newtail == miEventQueue.head) { - ErrorF("tossed event which came in late\n"); + if (newtail == miEventQueue.head) { + ErrorF("[mi] EQ overflowing. The server is probably stuck " + "in an infinite loop.\n"); return; } miEventQueue.tail = newtail; |