Log input devices #3417

AlanGriffiths · 2024-06-06T17:01:23Z

Drops some unused code from the "Input Report", and replaces the optional logging with direct logging.

This now includes logging the actual configuration of the device

codecov · 2024-06-06T17:14:59Z

Codecov Report

Attention: Patch coverage is 50.70423% with 70 lines in your changes missing coverage. Please review.

Project coverage is 77.23%. Comparing base (1398638) to head (7966439).
Report is 15 commits behind head on main.

❗ Current head 7966439 differs from pull request most recent head a65965e

Please upload reports for the commit a65965e to get more accurate results.

Files	Patch %	Lines
src/server/input/default_input_device_hub.cpp	48.85%	67 Missing ⚠️
src/platforms/evdev/platform.cpp	60.00%	2 Missing ⚠️
src/miral/input_device_config.cpp	83.33%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3417      +/-   ##
==========================================
- Coverage   77.31%   77.23%   -0.09%     
==========================================
  Files        1068     1071       +3     
  Lines       68284    68460     +176     
==========================================
+ Hits        52797    52878      +81     
- Misses      15487    15582      +95

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Saviq

Couple of nits, but feel free to merge if you don't think worth it.

While here, should we unify the logging categories?

mir/src/server/input/default_input_device_hub.cpp

Line 30 in 31ef078

#define MIR_LOG_COMPONENT "Input"

Could be input-hub instead?

 <information> evdev-input: Opened device: /dev/input/event9 [0000:0006] Video Bus
 <information> Input: Device configuration: Lid Switch, capabilities={}
 <information> evdev-input: Opened device: /dev/input/event0 [0000:0005] Lid Switch
 <information> Input: Device configuration: Power Button, capabilities={keyboard}
 <information> evdev-input: Opened device: /dev/input/event1 [0000:0001] Power Button
#  …

vs.

 <information> evdev-input: Opened device: /dev/input/event9 [0000:0006] Video Bus
 <information> input-hub: Device configuration: Lid Switch, capabilities={}
 <information> evdev-input: Opened device: /dev/input/event0 [0000:0005] Lid Switch
 <information> input-hub: Device configuration: Power Button, capabilities={keyboard}
 <information> evdev-input: Opened device: /dev/input/event1 [0000:0001] Power Button
#  …

Looks like an opportunity to introduce std::formatter<>s for the different types?

AlanGriffiths · 2024-06-17T09:59:21Z

Looks like an opportunity to introduce std::formatter<>s for the different types?

Oh! Yeah, I still have to get used to having this stuff available.

src/server/input/default_input_device_hub.cpp

Saviq

Should we align the command line options with what's logged?

--mouse-acceleration vs. capabilities={pointer}…, pointer_config={acceleration=…}

Underscores vs. hyphens, too?

Co-authored-by: Michał Sawicz <michal.sawicz@canonical.com>

Saviq

Still no…

$ ubuntu-frame --mouse-acceleration=none --mouse-cursor-acceleration-bias=1.00 2>&1 | grep -e input-hub -e evdev-input
[2024-06-19 08:09:21.795207] <information> mirserver: Selected input driver: mir:evdev-input (version: 2.18.0)
[2024-06-19 08:09:25.329572] <information> evdev-input: Opened device: /dev/input/event3 [0000:0001] Power Button
[2024-06-19 08:09:25.351274] <information> evdev-input: Opened device: /dev/input/event7 [0000:0006] Video Bus
[2024-06-19 08:09:25.373068] <information> evdev-input: Opened device: /dev/input/event1 [0000:0001] Power Button
[2024-06-19 08:09:25.373404] <information> evdev-input: Opened device: /dev/input/event0 [0000:0005] Lid Switch
[2024-06-19 08:09:25.395651] <information> evdev-input: Opened device: /dev/input/event2 [0000:0003] Sleep Button
[2024-06-19 08:09:25.417728] <information> evdev-input: Opened device: /dev/input/event5 [05ac:024a] Apple Inc. Apple Internal Keyboard / Trackpad
[2024-06-19 08:09:25.419174] <information> evdev-input: Opened device: /dev/input/event8 [05ac:024a] bcm5974
[2024-06-19 08:09:25.419356] <information> input-hub: Device configuration: Power Button, capabilities={keyboard}
[2024-06-19 08:09:25.419481] <information> input-hub: Device configuration: Video Bus, capabilities={keyboard}
[2024-06-19 08:09:25.419586] <information> input-hub: Device configuration: Power Button, capabilities={keyboard}
[2024-06-19 08:09:25.419687] <information> input-hub: Device configuration: Lid Switch, capabilities={}
[2024-06-19 08:09:25.419787] <information> input-hub: Device configuration: Sleep Button, capabilities={keyboard}
[2024-06-19 08:09:25.432277] <information> input-hub: Device configuration: Apple Inc. Apple Internal Keyboard / Trackpad, capabilities={keyboard|alpha_numeric}
[2024-06-19 08:09:25.432513] <information> input-hub: Device configuration: bcm5974, capabilities={pointer|touchpad}, pointer_config={handedness=right,acceleration=adaptive,acceleration_bias=0.00,hscale=1.00,vscale=1.00}, touchpad_config={click_mode=finger_count|scroll_mode=two_finger|disable_while_typing}

Saviq

Still no…

Gah!

It's good, only now I realized pointer != mouse…

$ ubuntu-frame --mouse-acceleration=none --mouse-cursor-acceleration-bias=1.00 2>&1 | grep -e input-hub -e evdev-input      
[2024-06-19 14:52:17.962644] <information> mirserver: Selected input driver: mir:evdev-input (version: 2.18.0)
[2024-06-19 14:52:23.735914] <information> evdev-input: Opened device: /dev/input/event3 [0000:0001] Power Button
[2024-06-19 14:52:23.758030] <information> evdev-input: Opened device: /dev/input/event7 [0000:0006] Video Bus
[2024-06-19 14:52:23.780154] <information> evdev-input: Opened device: /dev/input/event1 [0000:0001] Power Button
[2024-06-19 14:52:23.780434] <information> evdev-input: Opened device: /dev/input/event0 [0000:0005] Lid Switch
[2024-06-19 14:52:23.802997] <information> evdev-input: Opened device: /dev/input/event2 [0000:0003] Sleep Button
[2024-06-19 14:52:23.825003] <information> evdev-input: Opened device: /dev/input/event5 [05ac:024a] Apple Inc. Apple Internal Keyboard / Trackpad
[2024-06-19 14:52:23.826464] <information> evdev-input: Opened device: /dev/input/event8 [05ac:024a] bcm5974
[2024-06-19 14:52:23.826630] <information> input-hub: Device configuration: Power Button, capabilities={keyboard}
[2024-06-19 14:52:23.826732] <information> input-hub: Device configuration: Video Bus, capabilities={keyboard}
[2024-06-19 14:52:23.826843] <information> input-hub: Device configuration: Power Button, capabilities={keyboard}
[2024-06-19 14:52:23.826942] <information> input-hub: Device configuration: Lid Switch, capabilities={}
[2024-06-19 14:52:23.827042] <information> input-hub: Device configuration: Sleep Button, capabilities={keyboard}
[2024-06-19 14:52:23.839656] <information> input-hub: Device configuration: Apple Inc. Apple Internal Keyboard / Trackpad, capabilities={keyboard|alpha_numeric}
[2024-06-19 14:52:23.840048] <information> input-hub: Device configuration: bcm5974, capabilities={pointer|touchpad}, pointer_config={handedness=right,acceleration=adaptive,acceleration_bias=0.00,hscale=1.00,vscale=1.00}, touchpad_config={click_mode=finger_count|scroll_mode=two_finger|disable_while_typing}
[2024-06-19 14:52:32.119525] <information> evdev-input: Opened device: /dev/input/event6 [046d:4023] Logitech Wireless Keyboard PID:4023
[2024-06-19 14:52:32.119778] <information> evdev-input: Opened device: /dev/input/event12 [046d:4091] Logitech Wireless Mouse
[2024-06-19 14:52:32.126371] <information> input-hub: Device configuration: Logitech Wireless Keyboard PID:4023, capabilities={keyboard|alpha_numeric}
[2024-06-19 14:52:32.126465] <information> input-hub: Device configuration: Logitech Wireless Mouse, capabilities={pointer}, pointer_config={handedness=right,acceleration=none,acceleration_bias=1.00,hscale=1.00,vscale=1.00}
[2024-06-19 14:52:36.732264] <information> evdev-input: Removed device: /dev/input/event6 [046d:4023] Logitech Wireless Keyboard PID:4023
[2024-06-19 14:52:36.944260] <information> evdev-input: Removed device: /dev/input/event12 [046d:4091] Logitech Wireless Mouse

Saviq · 2024-06-19T12:54:16Z

(but you will need to fix the tests…)

… may update the properties)

Saviq

Oh well, sid's got a short run…

AlanGriffiths changed the title ~~log-input-devices~~ Log input devices Jun 6, 2024

AlanGriffiths added 3 commits June 13, 2024 17:54

Drop dead code

686005d

Replace single use reporting with log_info()

c993b95

Provide a single line log of input device configuration

d45e29a

AlanGriffiths force-pushed the log-input-devices branch from 41b9d3c to d45e29a Compare June 14, 2024 10:39

Actually log the configuration

fd70f57

AlanGriffiths marked this pull request as ready for review June 14, 2024 15:14

AlanGriffiths requested a review from a team as a code owner June 14, 2024 15:14

AlanGriffiths added 2 commits June 14, 2024 16:18

Label device configs better

5f0591c

Drop duplicate log

307323c

Saviq approved these changes Jun 17, 2024

View reviewed changes

Better log component

b9de4ce

Specialise std::formatter

41fd21d

AlanGriffiths marked this pull request as draft June 17, 2024 15:29

AlanGriffiths added 2 commits June 17, 2024 16:32

Bugfix std::formatter<mi::DeviceCapabilities>::format(...)

883a045

Bugfix std::formatter<std::shared_ptr<mi::DefaultDevice>>::format(...)

8f6747b

AlanGriffiths marked this pull request as ready for review June 17, 2024 22:09

Saviq reviewed Jun 18, 2024

View reviewed changes

src/server/input/default_input_device_hub.cpp Outdated Show resolved Hide resolved

Saviq reviewed Jun 18, 2024

View reviewed changes

Saviq mentioned this pull request Jun 18, 2024

Review the input command line options #3428

Open

AlanGriffiths and others added 2 commits June 18, 2024 12:39

Spell "acceleration_bias" better

3b31fa2

Co-authored-by: Michał Sawicz <michal.sawicz@canonical.com>

Defer logging until configuration is completed

b0b459a

Saviq requested changes Jun 19, 2024

View reviewed changes

Saviq approved these changes Jun 19, 2024

View reviewed changes

Saviq enabled auto-merge June 19, 2024 12:53

AlanGriffiths disabled auto-merge June 19, 2024 13:22

Log properties of input devices after observers are notified (as they…

2be5d73

… may update the properties)

Configure acceleration on touchpads

a65965e

Saviq force-pushed the log-input-devices branch 2 times, most recently from 7966439 to a65965e Compare June 20, 2024 11:09

Saviq approved these changes Jun 20, 2024

View reviewed changes

Saviq added this pull request to the merge queue Jun 20, 2024

Merged via the queue into main with commit 720b13c Jun 20, 2024
67 of 72 checks passed

Saviq deleted the log-input-devices branch June 20, 2024 12:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Log input devices #3417

Log input devices #3417

AlanGriffiths commented Jun 6, 2024 •

edited

Loading

codecov bot commented Jun 6, 2024 •

edited

Loading

Saviq left a comment •

edited

Loading

AlanGriffiths commented Jun 17, 2024

Saviq left a comment

Saviq left a comment

Saviq left a comment

Saviq commented Jun 19, 2024

Saviq left a comment

Log input devices #3417

Log input devices #3417

Conversation

AlanGriffiths commented Jun 6, 2024 • edited Loading

codecov bot commented Jun 6, 2024 • edited Loading

Codecov Report

Saviq left a comment • edited Loading

Choose a reason for hiding this comment

AlanGriffiths commented Jun 17, 2024

Saviq left a comment

Choose a reason for hiding this comment

Saviq left a comment

Choose a reason for hiding this comment

Saviq left a comment

Choose a reason for hiding this comment

Saviq commented Jun 19, 2024

Saviq left a comment

Choose a reason for hiding this comment

AlanGriffiths commented Jun 6, 2024 •

edited

Loading

codecov bot commented Jun 6, 2024 •

edited

Loading

Saviq left a comment •

edited

Loading