On 27.05.2016 08:08, Keith Packard wrote:
>
> commit f84703b50cc908a127f4ad923ebbf56f8f244c0d
> Author: Keith Packard <[email protected]>
> Date: Tue Dec 8 14:20:21 2015 -0800
>
> dix: Reallocate touchpoint buffer at input event time [v2]
>
> Now that input is threaded, malloc can be used at event time to resize
> the touchpoint buffer as needed.x
>
> v2: Remove "Need to grow the queue means dropping events."
> from comment as it no longer applies. (Peter Hutterer)
>
> Signed-off-by: Keith Packard <[email protected]>
> Reviewed-by: Peter Hutterer <[email protected]>
This change broke make check for me, specifically test/touch:
touch: ../../test/touch.c:62: touch_grow_queue: Assertion
`TouchBeginDDXTouch(&dev, 1234) == ((void *)0)' failed.
Program received signal SIGABRT, Aborted.
0x00007ffff5aff458 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:55
55 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt full
#0 0x00007ffff5aff458 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:55
resultvar = 0
pid = 22575
selftid = 22575
#1 0x00007ffff5b008da in __GI_abort () at abort.c:89
save_stage = 2
act = {__sigaction_handler = {sa_handler = 0x4, sa_sigaction = 0x4},
sa_mask = {__val = {244813135909, 1, 140737488347424, 8589934684, 0, 0, 0,
21474836480, 140737316590703, 140737488347576, 140737488347376,
140737316604560, 140737316624864, 7,
140737354088448, 5811584}}, sa_flags = 62, sa_restorer = 0x58ae70
<__PRETTY_FUNCTION__.12825>}
sigs = {__val = {32, 0 <repeats 15 times>}}
#2 0x00007ffff5af8387 in __assert_fail_base (fmt=<optimized out>,
assertion=assertion@entry=0x58ad80 "TouchBeginDDXTouch(&dev, 1234) == ((void
*)0)", file=file@entry=0x58ab90 "../../test/touch.c", line=line@entry=62,
function=function@entry=0x58ae70 <__PRETTY_FUNCTION__.12825>
"touch_grow_queue") at assert.c:92
str = 0x815a90 ""
total = 4096
#3 0x00007ffff5af8432 in __GI___assert_fail
(assertion=assertion@entry=0x58ad80 "TouchBeginDDXTouch(&dev, 1234) == ((void
*)0)", file=file@entry=0x58ab90 "../../test/touch.c", line=line@entry=62,
function=function@entry=0x58ae70 <__PRETTY_FUNCTION__.12825>
"touch_grow_queue") at assert.c:101
No locals.
#4 0x000000000040cadd in touch_grow_queue () at ../../test/touch.c:62
dev = {public = {devicePrivate = 0x0, processInputProc = 0x0,
realInputProc = 0x0, enqueueInputProc = 0x0, on = 0}, next = 0x0, startup = 0,
deviceProc = 0x0, inited = 0, enabled = 0, coreEvents = 0, deviceGrab =
{grabTime = {months = 0,
milliseconds = 0}, fromPassiveGrab = 0, implicitGrab = 0, unused
= 0x0, grab = 0x0, activatingKey = 0 '\000', ActivateGrab = 0x0, DeactivateGrab
= 0x0, sync = {frozen = 0, state = 0, other = 0x0, event = 0x0}}, type = 0,
xinput_type = 0,
name = 0x815100 "test device", id = 2, key = 0x0, valuator =
0x7fffffffe290, touch = 0x7fffffffe270, button = 0x0, focus = 0x0, proximity =
0x0, kbdfeed = 0x0, ptrfeed = 0x0, intfeed = 0x0, stringfeed = 0x0, bell = 0x0,
leds = 0x0,
xkb_interest = 0x0, config_info = 0x0, unused_classes = 0x0,
saved_master_id = 0, devPrivates = 0x0, unwrapProc = 0x0, spriteInfo = 0x0,
master = 0x0, lastSlave = 0x0, last = {valuators = {0 <repeats 36 times>},
numValuators = 0, slave = 0x0,
scroll = 0x0, num_touches = 8, touches = 0x815120}, properties =
{properties = 0x0, handlers = 0x0}, relative_transform = {m = {{0, 0, 0}, {0,
0, 0}, {0, 0, 0}}}, scale_and_transform = {m = {{0, 0, 0}, {0, 0, 0}, {0, 0,
0}}}, xtest_master_id = 0,
idle_counter = 0x0}
val = {sourceid = -7388, numMotionEvents = 32767, first_motion =
-136429167, last_motion = 32767, motion = 0xd, motionHintWindow =
0x7ffff2550df1, axes = 0x7ffff254eab8, numAxes = 5, axisVal = 0xa4f92301,
accelScheme = {number = 43246732,
AccelSchemeProc = 0x1, accelData = 0x7fffffffe400, AccelInitProc =
0x7ffff5e72f10, AccelCleanupProc = 0x7ffff5e70f18}, h_scroll_axis = -7388,
v_scroll_axis = 32767}
touch = {sourceid = 158, touches = 0x7ffff5e72f10, num_touches = 32768,
max_touches = 63481, mode = 255 '\377', buttonsDown = 127 '\177', state = 0,
motionMask = 4294959912}
new_size = <optimized out>
i = <optimized out>
__PRETTY_FUNCTION__ = "touch_grow_queue"
#5 0x000000000040c6f9 in main (argc=<optimized out>, argv=<optimized out>) at
../../test/touch.c:282
No locals.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
