[mutter/wip/carlosg/input-thread: 69/76] backends/native: Surround device state queries/updates with RW lock

[Carlos Garnacho <carlosg src gnome org>]

commit 24e1c0a883c4f18b94d3226d65b41861146d1aa9
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Aug 12 10:43:48 2020 +0200

    backends/native: Surround device state queries/updates with RW lock
    
    Wrap all keyboard state updates, and all pointer/stylus/touch cursor
    position with a write lock, and ::query_state() (The only entrypoint
    to this state from other threads) with a read lock.
    
    The principle is that query_state may be called from different threads
    (UI so far, but maybe KMS too in the future), while the input thread
    may (or may not) be updating it. This state is fetched "atomically"
    (eg. x/y will be consistently old or new, if the input thread were
    updating it at the same time).
    
    There's other places deep in backends/native that read this state,
    they all will run in the input thread, so they count as "other readers"
    to the other thread. Those changes are already mutually exclusive with
    updates, so they don't explicitly need the RW lock.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403

 src/backends/native/meta-input-device-native.c |  4 ++
 src/backends/native/meta-seat-impl.c           | 55 +++++++++++++++++++++++---
 src/backends/native/meta-seat-impl.h           |  1 +
 3 files changed, 54 insertions(+), 6 deletions(-)
---
diff --git a/src/backends/native/meta-input-device-native.c b/src/backends/native/meta-input-device-native.c
index 392a1bcacb..e81eff3acd 100644
--- a/src/backends/native/meta-input-device-native.c
+++ b/src/backends/native/meta-input-device-native.c
@@ -438,6 +438,8 @@ update_internal_xkb_state (MetaInputDeviceNative *device,
   xkb_mod_mask_t group_mods;
   struct xkb_state *xkb_state;
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   xkb_state = meta_seat_impl_get_xkb_state (seat_impl);
   depressed_mods = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_DEPRESSED);
   latched_mods = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_LATCHED);
@@ -460,6 +462,8 @@ update_internal_xkb_state (MetaInputDeviceNative *device,
                          locked_mods,
                          0, 0, group_mods);
   notify_stickykeys_mask (device);
+
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
 }
 
 static void
diff --git a/src/backends/native/meta-seat-impl.c b/src/backends/native/meta-seat-impl.c
index 57f94331f4..c8d9f7a1d3 100644
--- a/src/backends/native/meta-seat-impl.c
+++ b/src/backends/native/meta-seat-impl.c
@@ -446,6 +446,8 @@ new_absolute_motion_event (MetaSeatImpl       *seat_impl,
   clutter_event_set_device (event, seat_impl->core_pointer);
   clutter_event_set_source_device (event, input_device);
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
     {
       MetaInputDeviceNative *device_native =
@@ -469,6 +471,8 @@ new_absolute_motion_event (MetaSeatImpl       *seat_impl,
       seat_impl->pointer_y = y;
     }
 
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
+
   return event;
 }
 
@@ -2049,10 +2053,14 @@ process_device_event (MetaSeatImpl          *seat_impl,
         y = libinput_event_touch_get_y_transformed (touch_event,
                                                     stage_height);
 
+        g_rw_lock_writer_lock (&seat_impl->state_lock);
+
         touch_state = meta_seat_impl_acquire_touch_state (seat_impl, seat_slot);
         touch_state->coords.x = x;
         touch_state->coords.y = y;
 
+        g_rw_lock_writer_unlock (&seat_impl->state_lock);
+
         meta_seat_impl_notify_touch_event (seat_impl, device,
                                            CLUTTER_TOUCH_BEGIN,
                                            time_us,
@@ -2084,7 +2092,10 @@ process_device_event (MetaSeatImpl          *seat_impl,
                                            touch_state->seat_slot,
                                            touch_state->coords.x,
                                            touch_state->coords.y);
+
+        g_rw_lock_writer_lock (&seat_impl->state_lock);
         meta_seat_impl_release_touch_state (seat_impl, seat_slot);
+        g_rw_lock_writer_unlock (&seat_impl->state_lock);
         break;
       }
 
@@ -2111,13 +2122,18 @@ process_device_event (MetaSeatImpl          *seat_impl,
         y = libinput_event_touch_get_y_transformed (touch_event,
                                                     stage_height);
 
+        g_rw_lock_writer_lock (&seat_impl->state_lock);
         touch_state = meta_seat_impl_lookup_touch_state (seat_impl, seat_slot);
+        if (touch_state)
+          {
+            touch_state->coords.x = x;
+            touch_state->coords.y = y;
+          }
+        g_rw_lock_writer_unlock (&seat_impl->state_lock);
+
         if (!touch_state)
           break;
 
-        touch_state->coords.x = x;
-        touch_state->coords.y = y;
-
         meta_seat_impl_notify_touch_event (seat_impl, device,
                                            CLUTTER_TOUCH_UPDATE,
                                            time_us,
@@ -2476,6 +2492,8 @@ meta_seat_impl_constructed (GObject *object)
   struct udev *udev;
   struct xkb_keymap *xkb_keymap;
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   device = meta_input_device_native_new_virtual (
       seat_impl, CLUTTER_POINTER_DEVICE,
       CLUTTER_INPUT_MODE_LOGICAL);
@@ -2538,6 +2556,8 @@ meta_seat_impl_constructed (GObject *object)
         xkb_keymap_led_get_index (xkb_keymap, XKB_LED_NAME_SCROLL);
     }
 
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
+
   seat_impl->has_touchscreen = has_touchscreen (seat_impl);
   seat_impl->has_tablet_switch = has_tablet_switch (seat_impl);
   update_touch_mode (seat_impl);
@@ -2634,6 +2654,8 @@ meta_seat_impl_finalize (GObject *object)
 
   g_free (seat_impl->seat_id);
 
+  g_rw_lock_clear (&seat_impl->state_lock);
+
   G_OBJECT_CLASS (meta_seat_impl_parent_class)->finalize (object);
 }
 
@@ -2689,6 +2711,9 @@ meta_seat_impl_query_state (MetaSeatImpl         *seat_impl,
                             ClutterModifierType  *modifiers)
 {
   MetaInputDeviceNative *device_native = META_INPUT_DEVICE_NATIVE (device);
+  gboolean retval = FALSE;
+
+  g_rw_lock_reader_lock (&seat_impl->state_lock);
 
   if (sequence)
     {
@@ -2698,7 +2723,7 @@ meta_seat_impl_query_state (MetaSeatImpl         *seat_impl,
       slot = meta_event_native_sequence_get_slot (sequence);
       touch_state = meta_seat_impl_lookup_touch_state (seat_impl, slot);
       if (!touch_state)
-        return FALSE;
+        goto out;
 
       if (coords)
         {
@@ -2709,7 +2734,7 @@ meta_seat_impl_query_state (MetaSeatImpl         *seat_impl,
       if (modifiers)
         *modifiers = meta_xkb_translate_modifiers (seat_impl->xkb, 0);
 
-      return TRUE;
+      retval = TRUE;
     }
   else
     {
@@ -2725,8 +2750,12 @@ meta_seat_impl_query_state (MetaSeatImpl         *seat_impl,
                                                      seat_impl->button_state);
         }
 
-      return TRUE;
+      retval = TRUE;
     }
+
+ out:
+  g_rw_lock_reader_unlock (&seat_impl->state_lock);
+  return retval;
 }
 
 static void
@@ -2797,6 +2826,8 @@ meta_seat_impl_class_init (MetaSeatImplClass *klass)
 static void
 meta_seat_impl_init (MetaSeatImpl *seat_impl)
 {
+  g_rw_lock_init (&seat_impl->state_lock);
+
   seat_impl->device_id_next = INITIAL_DEVICE_ID;
 
   seat_impl->repeat = TRUE;
@@ -2838,6 +2869,8 @@ meta_seat_impl_update_xkb_state (MetaSeatImpl *seat_impl)
   xkb_mod_mask_t locked_mods;
   struct xkb_keymap *xkb_keymap;
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   xkb_keymap = meta_keymap_native_get_keyboard_map (seat_impl->keymap);
 
   latched_mods = xkb_state_serialize_mods (seat_impl->xkb,
@@ -2861,6 +2894,8 @@ meta_seat_impl_update_xkb_state (MetaSeatImpl *seat_impl)
     xkb_keymap_led_get_index (xkb_keymap, XKB_LED_NAME_SCROLL);
 
   meta_seat_impl_sync_leds (seat_impl);
+
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
 }
 
 int
@@ -3021,6 +3056,8 @@ meta_seat_impl_set_keyboard_layout_index (MetaSeatImpl       *seat_impl,
 
   g_return_if_fail (META_IS_SEAT_IMPL (seat_impl));
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   state = seat_impl->xkb;
 
   depressed_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_DEPRESSED);
@@ -3030,6 +3067,8 @@ meta_seat_impl_set_keyboard_layout_index (MetaSeatImpl       *seat_impl,
   xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
 
   seat_impl->layout_idx = idx;
+
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
 }
 
 /**
@@ -3062,6 +3101,8 @@ meta_seat_impl_set_keyboard_numlock (MetaSeatImpl *seat_impl,
 
   g_return_if_fail (META_IS_SEAT_IMPL (seat_impl));
 
+  g_rw_lock_writer_lock (&seat_impl->state_lock);
+
   keymap = seat_impl->keymap;
   xkb_keymap = meta_keymap_native_get_keyboard_map (keymap);
 
@@ -3089,6 +3130,8 @@ meta_seat_impl_set_keyboard_numlock (MetaSeatImpl *seat_impl,
                          group_mods);
 
   meta_seat_impl_sync_leds (seat_impl);
+
+  g_rw_lock_writer_unlock (&seat_impl->state_lock);
 }
 
 /**
diff --git a/src/backends/native/meta-seat-impl.h b/src/backends/native/meta-seat-impl.h
index d2836bae33..b9201632cc 100644
--- a/src/backends/native/meta-seat-impl.h
+++ b/src/backends/native/meta-seat-impl.h
@@ -59,6 +59,7 @@ struct _MetaSeatImpl
   MetaEventSource *event_source;
   struct libinput *libinput;
   struct libinput_seat *libinput_seat;
+  GRWLock state_lock;
 
   GSList *devices;