Revert "e_keyrouter: apply thread synchronization for key grab variables"

This reverts commit 60c7ad9f8b85bf1443d5ba8193221c46bd6a33e7.

Change-Id: I053ced3e6fd02ef798d43c98073a5b26ecf4b18a

diff --git a/src/bin/e_keyrouter.c b/src/bin/e_keyrouter.c
index 3e541a6..ae5925d 100644 (file)
--- a/src/bin/e_keyrouter.c
+++ b/src/bin/e_keyrouter.c
@@ -134,8 +134,6 @@ _e_keyrouter_info_print(void *data, const char *log_path)
 
    fprintf(log_fl, "\n===== Keyrouter Information =====\n");
    fprintf(log_fl, "    ----- Grabbable Keys -----\n");
-
-   g_mutex_lock(&krt->grab_key_mutex);
    for (i = 8; i <= krt->max_tizen_hwkeys; i++)
      {
         if (!krt->HardKeys[i].keycode) continue;
@@ -147,7 +145,6 @@ _e_keyrouter_info_print(void *data, const char *log_path)
         free(keyname);
         keyname = NULL;
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
    fprintf(log_fl, "    ----- End -----\n\n");
 
    fclose(log_fl);
@@ -209,8 +206,6 @@ _e_keyrouter_keygrab_print(void *data, const char *log_path)
    fprintf(log_fl, "    ----- End -----\n\n");
 
    fprintf(log_fl, "    ----- Grabbed keys Info -----\n\n");
-
-   g_mutex_lock(&krt->grab_key_mutex);
    for (i = 8; i <= krt->max_tizen_hwkeys; i++)
      {
         if (!krt->HardKeys[i].keycode) continue;
@@ -270,7 +265,6 @@ _e_keyrouter_keygrab_print(void *data, const char *log_path)
 
         fprintf(log_fl, "\n");
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    fprintf(log_fl, "    ----- End -----\n\n");
 
@@ -428,8 +422,6 @@ _e_keyrouter_query_tizen_key_table(void)
    krt->HardKeys = E_NEW(E_Keyrouter_Grabbed_Key, kconf->max_keycode + 1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(krt->HardKeys, EINA_FALSE);
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
    krt->numTizenHWKeys = kconf->num_keycode;
    krt->max_tizen_hwkeys = kconf->max_keycode;
 
@@ -465,8 +457,6 @@ _e_keyrouter_query_tizen_key_table(void)
           }
      }
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    if (e_comp_wl_input_keymap_cache_file_use_get() == EINA_FALSE)
      {
         KLINF("Server create a new cache file: %s", e_comp_wl_input_keymap_path_get(names));
@@ -500,19 +490,15 @@ e_keyrouter_longkey_add(int keycode, double time)
    EINA_SAFETY_ON_NULL_RETURN_VAL(krt, EINA_FALSE);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(keycode <= krt->max_tizen_hwkeys, EINA_FALSE);
 
-   g_mutex_lock(&krt->grab_key_mutex);
    if (krt->HardKeys[keycode].longkey.enabled == EINA_TRUE)
      {
         KLWRN("The %d keycode'long press is already enabled by time: %lf\n", keycode, krt->HardKeys[keycode].longkey.time);
-        g_mutex_unlock(&krt->grab_key_mutex);
         return EINA_FALSE;
      }
 
    krt->HardKeys[keycode].longkey.enabled = EINA_TRUE;
    krt->HardKeys[keycode].longkey.time = time;
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    KLINF("To enable %d key's longkey function. (time: %lf)\n", keycode, time);
 
    return EINA_TRUE;
@@ -525,10 +511,9 @@ e_keyrouter_longkey_del(int keycode)
              How control this behavior?
              Cancel current long press or not
     */
-   g_mutex_lock(&krt->grab_key_mutex);
+
    krt->HardKeys[keycode].longkey.enabled = EINA_FALSE;
    krt->HardKeys[keycode].longkey.time = 0.0;
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    KLINF("To disable %d key's longkey function.\n", keycode);
 }
@@ -548,13 +533,12 @@ e_keyrouter_composition_key_add(int *keys, int count)
         KLWRN("Currently only two key composition is allowed. (%d)\n", count);
         return EINA_FALSE;
      }
-   g_mutex_lock(&krt->grab_key_mutex);
+
    EINA_LIST_FOREACH(krt->HardKeys[keys[0]].composition_key_list, l, data)
      {
         if (*data == keys[1])
           {
              KLWRN("%d and %d key's key composition is already requested.\n", keys[0], keys[1]);
-             g_mutex_unlock(&krt->grab_key_mutex);
              return EINA_FALSE;
           }
      }
@@ -563,11 +547,9 @@ e_keyrouter_composition_key_add(int *keys, int count)
         if (*data == keys[0])
           {
              KLERR("%d and %d key's key composition is already requested. (list currupted)\n", keys[0], keys[1]);
-             g_mutex_unlock(&krt->grab_key_mutex);
              return EINA_FALSE;
           }
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    data = E_NEW(int, 1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
@@ -578,10 +560,8 @@ e_keyrouter_composition_key_add(int *keys, int count)
    *data = keys[0];
    *data2 = keys[1];
 
-   g_mutex_lock(&krt->grab_key_mutex);
    krt->HardKeys[keys[0]].composition_key_list = eina_list_append(krt->HardKeys[keys[0]].composition_key_list, data2);
    krt->HardKeys[keys[1]].composition_key_list = eina_list_append(krt->HardKeys[keys[1]].composition_key_list, data);
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    KLINF("Add %d and %d key composition.\n", keys[0], keys[1]);
 
@@ -609,7 +589,6 @@ e_keyrouter_composition_key_del(int *keys, int count)
         return;
      }
 
-   g_mutex_lock(&krt->grab_key_mutex);
    EINA_LIST_FOREACH_SAFE(krt->HardKeys[keys[0]].composition_key_list, l, l_next, data)
      {
         if (*data == keys[1])
@@ -629,7 +608,6 @@ e_keyrouter_composition_key_del(int *keys, int count)
              break;
           }
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    KLINF("Delete %d and %d key composition.\n", keys[0], keys[1]);
 }
@@ -692,8 +670,6 @@ e_keyrouter_init(void)
    if (e_input_thread_mode_get())
      g_mutex_init(&krt->event_handler_mutex);
 
-   g_mutex_init(&krt->grab_key_mutex);
-
    kconfig = E_NEW(E_Keyrouter_Config_Data, 1);
    EINA_SAFETY_ON_NULL_GOTO(kconfig, err);
 
@@ -757,7 +733,6 @@ e_keyrouter_shutdown(void)
 
    _e_keyrouter_deinit_handlers();
 
-   g_mutex_lock(&krt->grab_key_mutex);
    for (i = 0; i <= krt->max_tizen_hwkeys; i++)
      {
         if (krt->HardKeys[i].keyname)
@@ -766,7 +741,6 @@ e_keyrouter_shutdown(void)
           E_FREE(keycode_data);
      }
    E_FREE(krt->HardKeys);
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    EINA_LIST_FREE(krt->ignore_list, keycode_data)
      E_FREE(keycode_data);

diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c
index 40923a8..892b332 100644 (file)
--- a/src/bin/e_keyrouter_events.c
+++ b/src/bin/e_keyrouter_events.c
@@ -13,11 +13,8 @@ static Eina_Bool _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int a
 static Eina_Bool
 _e_keyrouter_is_key_grabbed(int key)
 {
-   g_mutex_lock(&krt->grab_key_mutex);
-
    if (!krt->HardKeys[key].keycode)
      {
-        g_mutex_unlock(&krt->grab_key_mutex);
         return EINA_FALSE;
      }
    if (krt->HardKeys[key].excl_ptr ||
@@ -25,12 +22,9 @@ _e_keyrouter_is_key_grabbed(int key)
         krt->HardKeys[key].top_ptr ||
         krt->HardKeys[key].shared_ptr)
      {
-        g_mutex_unlock(&krt->grab_key_mutex);
         return EINA_TRUE;
      }
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    return EINA_FALSE;
 }
 
@@ -64,22 +58,13 @@ _e_keyrouter_event_routed_key_check(Ecore_Event_Key *ev, int type)
           }
      }
 
-
    if (krt->max_tizen_hwkeys < ev->keycode)
      {
         KLWRN("The key(%d) is too larger to process keyrouting: Invalid keycode", ev->keycode);
         return EINA_FALSE;
      }
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
-   if (!krt->HardKeys[ev->keycode].keycode)
-     {
-        g_mutex_unlock(&krt->grab_key_mutex);
-        return EINA_FALSE;
-     }
-
-   g_mutex_unlock(&krt->grab_key_mutex);
+   if (!krt->HardKeys[ev->keycode].keycode) return EINA_FALSE;
 
    return EINA_TRUE;
 }
@@ -183,8 +168,6 @@ _e_keyrouter_key_cancel(int keycode)
    E_FREE(keyname);
    EINA_SAFETY_ON_NULL_GOTO(key_release, failed);
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
    EINA_LIST_FREE(krt->HardKeys[keycode].press_ptr, key_node_data)
      {
         _e_keyrouter_key_send(ECORE_EVENT_KEY_DOWN, key_cancel, NULL, key_node_data);
@@ -203,8 +186,6 @@ _e_keyrouter_key_cancel(int keycode)
      }
    krt->HardKeys[keycode].press_ptr = NULL;
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    _e_keyrouter_key_free(key_cancel);
    _e_keyrouter_key_free(key_release);
 
@@ -547,7 +528,6 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *de
    E_Keyrouter_Event_Data *key_data = NULL;
 
    /* Deliver release  clean up pressed key list */
-   g_mutex_lock(&krt->grab_key_mutex);
    EINA_LIST_FREE(krt->HardKeys[ev->keycode].press_ptr, key_node_data)
      {
         if (key_node_data->focused == EINA_TRUE)
@@ -612,7 +592,6 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *de
         E_FREE(key_node_data);
      }
    krt->HardKeys[ev->keycode].press_ptr = NULL;
-   g_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static void
@@ -639,7 +618,6 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
         return;
      }
 
-   g_mutex_lock(&krt->grab_key_mutex);
    EINA_LIST_FOREACH(krt->HardKeys[keycode].excl_ptr, l, key_node_data)
      {
         if (key_node_data)
@@ -655,7 +633,6 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
                       key_node_data->surface, key_node_data->wc, pid, pname ?: "Unknown");
              if(pname) E_FREE(pname);
              if(cmd) E_FREE(cmd);
-             g_mutex_unlock(&krt->grab_key_mutex);
              return;
           }
      }
@@ -675,14 +652,12 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
                      key_node_data->surface, key_node_data->wc, pid, pname ?: "Unknown");
              if(pname) E_FREE(pname);
              if(cmd) E_FREE(cmd);
-             g_mutex_unlock(&krt->grab_key_mutex);
+
              return;
           }
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    // Top position grab must need a focus surface.
-   g_mutex_lock(&krt->grab_key_mutex);
    if (surface_focus)
      {
         EINA_LIST_FOREACH(krt->HardKeys[keycode].top_ptr, l, key_node_data)
@@ -703,7 +678,6 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
 
                        if(pname) E_FREE(pname);
                        if(cmd) E_FREE(cmd);
-                       g_mutex_unlock(&krt->grab_key_mutex);
                        return;
                     }
                   krt->isWindowStackChanged = EINA_FALSE;
@@ -723,7 +697,6 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
 
                        if(pname) E_FREE(pname);
                        if(cmd) E_FREE(cmd);
-                       g_mutex_unlock(&krt->grab_key_mutex);
                        return;
                     }
                   break;
@@ -771,8 +744,6 @@ need_shared:
                }
           }
      }
-
-   g_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static Eina_Bool
@@ -853,7 +824,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
           }
 
         /* TODO: Check this client is located inside a display boundary */
-        g_mutex_lock(&krt->grab_key_mutex);
+
         EINA_LIST_FOREACH_SAFE(krt->HardKeys[arr_idx].top_ptr, l, l_next, key_node_data)
           {
              if (key_node_data)
@@ -863,12 +834,10 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
                        krt->HardKeys[arr_idx].top_ptr = eina_list_promote_list(krt->HardKeys[arr_idx].top_ptr, l);
                        KLDBG("Move a client(e_client: %p, wl_surface: %p) to first index of list(key: %d)",
                                 ec_top, key_node_data->surface, arr_idx);
-                       g_mutex_unlock(&krt->grab_key_mutex);
                        return EINA_TRUE;
                     }
                }
           }
-        g_mutex_unlock(&krt->grab_key_mutex);
 
         if (ec_top == ec_focus)
           {

diff --git a/src/bin/e_keyrouter_list.c b/src/bin/e_keyrouter_list.c
index 6e74f99..bf99aa3 100644 (file)
--- a/src/bin/e_keyrouter_list.c
+++ b/src/bin/e_keyrouter_list.c
@@ -19,12 +19,8 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c
 
    if (mode == TIZEN_KEYROUTER_MODE_EXCLUSIVE)
      {
-        bool check_grabbed = false;
-        g_mutex_lock(&krt->grab_key_mutex);
-        check_grabbed = (krt->HardKeys[key].excl_ptr != NULL);
-        g_mutex_unlock(&krt->grab_key_mutex);
         EINA_SAFETY_ON_TRUE_RETURN_VAL
-          (check_grabbed,
+          ((krt->HardKeys[key].excl_ptr != NULL),
            TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY);
      }
 
@@ -52,11 +48,9 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
    Eina_List *keylist_ptr = NULL, *l = NULL;
    E_Keyrouter_Key_List_NodePtr key_node_data = NULL;
 
-   g_mutex_lock(&krt->grab_key_mutex);
    switch(mode)
      {
       case TIZEN_KEYROUTER_MODE_EXCLUSIVE:
-         g_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_NONE;
 
       case TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE:
@@ -80,10 +74,8 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
          break;
       default:
          KLWRN("Unknown key(%d) and grab mode(%d)", key, mode);
-         g_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    EINA_LIST_FOREACH(keylist_ptr, l, key_node_data)
      {
@@ -158,8 +150,6 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
    new_keyptr->focused = focused;
    new_keyptr->status = E_KRT_CSTAT_ALIVE;
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
    switch(mode)
      {
       case TIZEN_KEYROUTER_MODE_EXCLUSIVE:
@@ -189,22 +179,20 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
       default:
          KLWRN("Unknown key(%d) and grab mode(%d)", key, mode);
          E_FREE(new_keyptr);
-         g_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    if (TIZEN_KEYROUTER_MODE_PRESSED != mode)
      {
         if (surface)
           {
              e_keyrouter_wl_add_surface_destroy_listener(surface);
-             /* TODO: if failed add surface_destroy_listener, remove keygrabs */
+             /* TODO: if failed add surface_destory_listener, remove keygrabs */
           }
         else if (wc)
           {
              e_keyrouter_wl_add_client_destroy_listener(wc);
-             /* TODO: if failed add client_destroy_listener, remove keygrabs */
+             /* TODO: if failed add client_destory_listener, remove keygrabs */
           }
      }
 
@@ -267,8 +255,6 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
 
    EINA_SAFETY_ON_TRUE_RETURN(((!surface) && (!wc)));
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
    for (i = 0; i <= krt->max_tizen_hwkeys; i++)
      {
         if (0 == krt->HardKeys[i].keycode) continue;
@@ -390,8 +376,6 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
                }
           }
      }
-
-   g_mutex_unlock(&krt->grab_key_mutex);
 }
 
 int
@@ -448,8 +432,6 @@ _e_keyrouter_get_list(int mode, int key)
 {
    Eina_List **list = NULL;
 
-   g_mutex_lock(&krt->grab_key_mutex);
-
    switch (mode)
      {
         case TIZEN_KEYROUTER_MODE_EXCLUSIVE:             list = &krt->HardKeys[key].excl_ptr;    break;
@@ -460,8 +442,6 @@ _e_keyrouter_get_list(int mode, int key)
         default: break;
      }
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    return list;
 }
 
@@ -497,16 +477,13 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
-   g_mutex_lock(&krt->grab_key_mutex);
    /* Check whether the key can be grabbed or not !
     * Only key listed in Tizen key layout file can be grabbed. */
    if (0 == krt->HardKeys[key].keycode)
      {
         KLWRN("Invalid key ! Disabled to set keygrab ! (keycode:%d)", key);
-        g_mutex_unlock(&krt->grab_key_mutex);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 
    /* Check whether the request key can be grabbed or not */
    res = e_keyrouter_set_keygrab_in_list(surface, client, key, mode);
@@ -517,13 +494,11 @@ e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, i
 int
 e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface, int key)
 {
-   g_mutex_lock(&krt->grab_key_mutex);
 
    /* Check the given key range */
    if (krt->max_tizen_hwkeys < key)
      {
         KLWRN("Invalid range of key ! (keycode:%d) maximum value(%d)", key, krt->max_tizen_hwkeys);
-        g_mutex_unlock(&krt->grab_key_mutex);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
@@ -532,12 +507,9 @@ e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface,
    if (0 == krt->HardKeys[key].keycode)
      {
         KLWRN("Invalid key ! Disabled to unset keygrab! (keycode:%d)", key);
-        g_mutex_unlock(&krt->grab_key_mutex);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
-   g_mutex_unlock(&krt->grab_key_mutex);
-
    /* Ungrab top position grabs first. This grab mode do not need privilege */
    if (!surface)
      e_keyrouter_find_and_remove_client_from_list(NULL, client, key, TIZEN_KEYROUTER_MODE_TOPMOST);

diff --git a/src/bin/e_keyrouter_private.h b/src/bin/e_keyrouter_private.h
index a977711..5f05374 100644 (file)
--- a/src/bin/e_keyrouter_private.h
+++ b/src/bin/e_keyrouter_private.h
@@ -89,7 +89,6 @@ struct _E_Keyrouter
    E_Input_Event_Handler *_key_down_handler;
    E_Input_Event_Handler *_key_up_handler;
    GMutex event_handler_mutex;
-   GMutex grab_key_mutex;
 };
 
 struct _E_Keyrouter_Grab_Request {

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index def5d56..3f14be1 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -146,7 +146,6 @@ e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface
 
    EINA_SAFETY_ON_NULL_RETURN(wc);
 
-   g_mutex_lock(&krt->grab_key_mutex);
    EINA_LIST_FOREACH(krt->HardKeys[key].press_ptr, l, data)
      {
         if (surface)
@@ -171,7 +170,6 @@ e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface
                }
           }
      }
-   g_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static int
@@ -545,19 +543,13 @@ e_keyrouter_wl_util_do_privilege_check(struct wl_client *client, uint32_t mode,
    if (mode == TIZEN_KEYROUTER_MODE_TOPMOST)
      return EINA_TRUE;
 
-   g_mutex_lock(&krt->grab_key_mutex);
    if (krt->HardKeys[keycode].no_privcheck == EINA_TRUE &&
        mode == TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE)
-     {
-        g_mutex_unlock(&krt->grab_key_mutex);
-        return EINA_TRUE;
-     }
-
-   g_mutex_unlock(&krt->grab_key_mutex);
+     return EINA_TRUE;
 
    if (!client) return EINA_FALSE;
 
-   /* If initialize cynara is failed, allow keygrabs regardless of the privilege permission. */
+   /* If initialize cynara is failed, allow keygrabs regardless of the previlege permition. */
    if (krt->p_cynara == NULL)
      {
         if (retried == EINA_FALSE)