Revert "Revert "e_keyrouter: fix cynara crash issue""

This reverts commit f8fc8462f32e039863d199a54e45f77aa43d7f7b.

Change-Id: If7e7be03692681ff2640ef280a0f902b7d456662

diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c
index 5bb6c00967d0d8f0ea642c1700484e6a7aa1986a..6ead6b0032abebb9d12fbf64c51c9175d53dbfe9 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter.c
+++ b/src/bin/inputmgr/e_keyrouter.c
@@ -211,6 +211,7 @@ _e_keyrouter_input_thread_keygrab_print(void *data)
    fprintf(log_fl, "    ----- End -----\n\n");
 
    fprintf(log_fl, "    ----- Grabbed keys Info -----\n\n");
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    for (i = 8; i <= krt->max_tizen_hwkeys; i++)
      {
         if (!krt->HardKeys[i].keycode) continue;
@@ -271,6 +272,8 @@ _e_keyrouter_input_thread_keygrab_print(void *data)
         fprintf(log_fl, "\n");
      }
 
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
+
    fprintf(log_fl, "    ----- End -----\n\n");
 
    fclose(log_fl);
@@ -280,7 +283,7 @@ _e_keyrouter_input_thread_keygrab_print(void *data)
 static void
 _e_keyrouter_keygrab_print(void *data EINA_UNUSED, const char *log_path)
 {
-   e_input_backend_thread_safe_call(_e_keyrouter_input_thread_keygrab_print, (void *)log_path, strlen(log_path)+1);
+   _e_keyrouter_input_thread_keygrab_print((void *)log_path);
 }
 
 static Eina_Bool
@@ -417,6 +420,8 @@ 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_rec_mutex_lock(&krt->grab_key_mutex);
+
    krt->numTizenHWKeys = kconf->num_keycode;
    krt->max_tizen_hwkeys = kconf->max_keycode;
 
@@ -450,6 +455,8 @@ e_keyrouter_query_tizen_key_table(void)
           }
      }
 
+   g_rec_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));
@@ -641,6 +648,8 @@ e_keyrouter_init(void)
    krt = E_NEW(E_Keyrouter, 1);
    EINA_SAFETY_ON_NULL_GOTO(krt, err);
 
+   g_rec_mutex_init(&krt->grab_key_mutex);
+
    kconfig = E_NEW(E_Keyrouter_Config_Data, 1);
    EINA_SAFETY_ON_NULL_GOTO(kconfig, err);
    krt->conf = kconfig;
@@ -710,6 +719,7 @@ e_keyrouter_shutdown(void)
 
    _e_keyrouter_deinit_handlers();
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    for (i = 0; i <= krt->max_tizen_hwkeys; i++)
      {
         if (krt->HardKeys[i].keyname)
@@ -718,6 +728,7 @@ e_keyrouter_shutdown(void)
           E_FREE(keycode_data);
      }
    E_FREE(krt->HardKeys);
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    EINA_LIST_FREE(krt->ignore_list, keycode_data)
      E_FREE(keycode_data);
@@ -741,7 +752,7 @@ e_keyrouter_shutdown(void)
         krt->longkey.timer = 0;
      }
 
-   e_keyrouter_wl_shutdown();
+   g_rec_mutex_clear(&krt->grab_key_mutex);
 
    E_FREE(krt);
    /* TODO: free allocated memory */
@@ -754,9 +765,11 @@ e_keyrouter_shutdown(void)
 E_API void
 e_keyrouter_keygrab_list_lock()
 {
+   g_rec_mutex_lock(&krt->grab_key_mutex);
 }
 
 E_API void
 e_keyrouter_keygrab_list_unlock()
 {
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 }

diff --git a/src/bin/inputmgr/e_keyrouter_events.c b/src/bin/inputmgr/e_keyrouter_events.c
index 7806ef958dbc0316d6d31d9fe740dfcaa3ebe473..a23d61c2870907d950b2b43157c297d994e5f130 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_events.c
+++ b/src/bin/inputmgr/e_keyrouter_events.c
@@ -23,8 +23,11 @@ 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_rec_mutex_lock(&krt->grab_key_mutex);
+
    if (!krt->HardKeys[key].keycode)
      {
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
         return EINA_FALSE;
      }
    if (krt->HardKeys[key].excl_ptr ||
@@ -32,9 +35,12 @@ _e_keyrouter_is_key_grabbed(int key)
         krt->HardKeys[key].top_ptr ||
         krt->HardKeys[key].shared_ptr)
      {
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
         return EINA_TRUE;
      }
 
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
+
    return EINA_FALSE;
 }
 
@@ -74,11 +80,16 @@ _e_keyrouter_event_routed_key_check(Ecore_Event_Key *ev, int type)
         return EINA_FALSE;
      }
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
+
    if (!krt->HardKeys[ev->keycode].keycode)
      {
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
         return EINA_FALSE;
      }
 
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
+
    return EINA_TRUE;
 }
 
@@ -182,6 +193,7 @@ _e_keyrouter_key_cancel(int keycode)
    E_FREE(keyname);
    EINA_SAFETY_ON_NULL_GOTO(key_release, failed);
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    press_ptr_list = krt->HardKeys[keycode].press_ptr;
    EINA_LIST_FREE(press_ptr_list, key_node_data)
      {
@@ -201,6 +213,7 @@ _e_keyrouter_key_cancel(int keycode)
      }
 
    krt->HardKeys[keycode].press_ptr = NULL;
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    _e_keyrouter_key_free(key_cancel);
    _e_keyrouter_key_free(key_release);
@@ -512,6 +525,7 @@ _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev, E_Device *dev)
 
    if (krt->isPictureOffEnabled == 1)
      {
+        g_rec_mutex_lock(&krt->grab_key_mutex);
         Eina_List *pic_off_ptr_list = krt->HardKeys[keycode].pic_off_ptr;
         EINA_LIST_FOREACH(pic_off_ptr_list, l, key_node_data)
           {
@@ -529,6 +543,7 @@ _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev, E_Device *dev)
                   if(cmd) E_FREE(cmd);
                }
           }
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
         return;
      }
 
@@ -565,6 +580,7 @@ _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_rec_mutex_lock(&krt->grab_key_mutex);
    Eina_List *press_ptr_list = krt->HardKeys[ev->keycode].press_ptr;
    EINA_LIST_FREE(press_ptr_list, key_node_data)
      {
@@ -630,6 +646,7 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static void
@@ -657,6 +674,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
         return;
      }
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    Eina_List *excl_ptr_list = krt->HardKeys[keycode].excl_ptr;
    EINA_LIST_FOREACH(excl_ptr_list, l, key_node_data)
      {
@@ -673,10 +691,13 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
              return;
           }
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    Eina_List *or_excl_ptr = krt->HardKeys[keycode].or_excl_ptr;
    EINA_LIST_FOREACH(or_excl_ptr, l, key_node_data)
      {
@@ -693,13 +714,16 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
              return;
           }
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    // Top position grab must need a focus surface.
    if (surface_focus)
      {
+        g_rec_mutex_lock(&krt->grab_key_mutex);
         Eina_List *top_ptr_list = krt->HardKeys[keycode].top_ptr;
         EINA_LIST_FOREACH(top_ptr_list, l, key_node_data)
           {
@@ -719,6 +743,7 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
                        return;
                     }
                   krt->isWindowStackChanged = EINA_FALSE;
@@ -738,15 +763,20 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
                        return;
                     }
                   break;
                }
           }
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
        goto need_shared;
      }
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    shared_ptr_list = krt->HardKeys[keycode].shared_ptr;
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
+
    if (shared_ptr_list)
      {
 need_shared:
@@ -761,6 +791,7 @@ need_shared:
           }
         if (res)
           {
+             g_rec_mutex_lock(&krt->grab_key_mutex);
              shared_ptr_list = krt->HardKeys[keycode].shared_ptr;
              EINA_LIST_FOREACH(shared_ptr_list, l, key_node_data)
                {
@@ -785,6 +816,7 @@ need_shared:
                          }
                     }
                }
+             g_rec_mutex_unlock(&krt->grab_key_mutex);
           }
      }
 }
@@ -867,6 +899,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_rec_mutex_lock(&krt->grab_key_mutex);
         Eina_List *top_ptr_list = krt->HardKeys[arr_idx].top_ptr;
         EINA_LIST_FOREACH_SAFE(top_ptr_list, l, l_next, key_node_data)
           {
@@ -877,11 +910,14 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
                        return EINA_TRUE;
                     }
                }
           }
 
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
+
         if (ec_top == ec_focus)
           {
              KLDBG("The e_client(%p) is a focus client", ec_top);

diff --git a/src/bin/inputmgr/e_keyrouter_intern.h b/src/bin/inputmgr/e_keyrouter_intern.h
index bfbb85539dc45c3bb7f1e29dce0003fcf175e1a9..478b0adc91732b65f0b74ad4f6fe183eb8340447 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_intern.h
@@ -85,6 +85,7 @@ struct _E_Keyrouter
 
    E_Input_Event_Handler *_key_down_handler;
    E_Input_Event_Handler *_key_up_handler;
+   GRecMutex grab_key_mutex;
 };
 
 struct _E_Keyrouter_Grab_Request {

diff --git a/src/bin/inputmgr/e_keyrouter_list.c b/src/bin/inputmgr/e_keyrouter_list.c
index 699d726355dfd2681f693e331ab1cf7957995020..fd92fa93a49f1dd9bb965f7bb5909172cf85f3d4 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_list.c
+++ b/src/bin/inputmgr/e_keyrouter_list.c
@@ -24,10 +24,13 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c
 
    if (mode == TIZEN_KEYROUTER_MODE_EXCLUSIVE)
      {
+        g_rec_mutex_lock(&krt->grab_key_mutex);
         if (krt->HardKeys[key].excl_ptr != NULL)
           {
+             g_rec_mutex_unlock(&krt->grab_key_mutex);
              return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY;
           }
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
      }
 
    if (mode == TIZEN_KEYROUTER_MODE_TOPMOST)
@@ -54,9 +57,11 @@ _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_rec_mutex_lock(&krt->grab_key_mutex);
    switch(mode)
      {
       case TIZEN_KEYROUTER_MODE_EXCLUSIVE:
+         g_rec_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_NONE;
 
       case TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE:
@@ -80,6 +85,7 @@ _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_rec_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
 
@@ -93,6 +99,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
                {
                   KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_surface %p",
                         key, e_keyrouter_mode_to_string(mode), surface);
+                  g_rec_mutex_unlock(&krt->grab_key_mutex);
                   return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY;
                }
           }
@@ -102,10 +109,12 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
                {
                   KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_client %p",
                         key, e_keyrouter_mode_to_string(mode), wc);
+                  g_rec_mutex_unlock(&krt->grab_key_mutex);
                   return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY;
                }
           }
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    return TIZEN_KEYROUTER_ERROR_NONE;
 }
@@ -120,6 +129,7 @@ _e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc,
 
    EINA_SAFETY_ON_TRUE_RETURN_VAL(((!surface) && (!wc)), EINA_FALSE);
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    list = _e_keyrouter_get_list(mode, key);
    if (!list)
      {
@@ -144,6 +154,7 @@ _e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc,
      }
 
 end:
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    return ret;
 }
@@ -171,6 +182,8 @@ 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_rec_mutex_lock(&krt->grab_key_mutex);
+
    switch(mode)
      {
       case TIZEN_KEYROUTER_MODE_EXCLUSIVE:
@@ -200,8 +213,10 @@ 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_rec_mutex_unlock(&krt->grab_key_mutex);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 
    if (TIZEN_KEYROUTER_MODE_PRESSED != mode)
      {
@@ -228,9 +243,11 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct
    Eina_List *l = NULL, *l_next = NULL;
    E_Keyrouter_Key_List_NodePtr key_node_data = NULL;
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    list = _e_keyrouter_get_list(mode, key);
    if (!list)
      {
+        g_rec_mutex_unlock(&krt->grab_key_mutex);
         return;
      }
 
@@ -268,6 +285,8 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct
              KLDBG("Remove a %s Mode Grabbed key(%d) by wc(%p)", e_keyrouter_mode_to_string(mode), key, wc);
           }
      }
+
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static void
@@ -288,6 +307,8 @@ _e_keyrouter_remove_client_from_list(void *data)
 
    EINA_SAFETY_ON_TRUE_RETURN(((!surface) && (!wc)));
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
+
    for (i = 0; i <= krt->max_tizen_hwkeys; i++)
      {
         if (0 == krt->HardKeys[i].keycode) continue;
@@ -409,6 +430,7 @@ _e_keyrouter_remove_client_from_list(void *data)
                }
           }
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 }
 
 void
@@ -421,7 +443,7 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
    keygrab_data.client = wc;
 
    INF("[%s] surface(%p), client(%p)\n", __func__, surface, wc);
-   e_input_backend_thread_safe_call(_e_keyrouter_remove_client_from_list, &keygrab_data, sizeof(E_Input_Thread_Request_Keygrab_Data));
+   _e_keyrouter_remove_client_from_list(&keygrab_data);
 }
 
 int

diff --git a/src/bin/server/e_keyrouter_wl.c b/src/bin/server/e_keyrouter_wl.c
index 42ff97fb7469252856c9c2588a67a3af5859d4f7..158faab9d74105b47f27fad819fab6eb9cba7b14 100644 (file)
--- a/src/bin/server/e_keyrouter_wl.c
+++ b/src/bin/server/e_keyrouter_wl.c
@@ -190,6 +190,7 @@ e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface
 
    EINA_SAFETY_ON_NULL_RETURN(wc);
 
+   g_rec_mutex_lock(&krt->grab_key_mutex);
    press_ptr_list = krt->HardKeys[key].press_ptr;
    EINA_LIST_FOREACH(press_ptr_list, l, data)
      {
@@ -215,6 +216,7 @@ e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface
                }
           }
      }
+   g_rec_mutex_unlock(&krt->grab_key_mutex);
 }
 
 static int
@@ -254,8 +256,6 @@ _e_keyrouter_input_thread_keygrab_set(void *data)
         keygrab_data->client, keygrab_data->surface, e_keyrouter_util_get_pid(keygrab_data->client, keygrab_data->surface), res);
 
    tizen_keyrouter_send_keygrab_notify(keygrab_data->resource, keygrab_data->surface, keygrab_data->key, keygrab_data->mode, res);
-
-   e_input_wl_events_flush();
 }
 
 /* tizen_keyrouter_set_keygrab request handler */
@@ -273,7 +273,7 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour
    keygrab_data.mode = mode;
 
    INF("client: %p, surface: %p, key: %d, mode: %d\n", keygrab_data.client, keygrab_data.surface, keygrab_data.key, keygrab_data.mode);
-   e_input_backend_thread_safe_call(_e_keyrouter_input_thread_keygrab_set, &keygrab_data, sizeof(E_Input_Thread_Request_Keygrab_Data));
+   _e_keyrouter_input_thread_keygrab_set(&keygrab_data);
 }
 
 static void
@@ -295,8 +295,6 @@ _e_keyrouter_input_thread_keygrab_unset(void *data)
            e_keyrouter_util_get_pid(keygrab_data->client, keygrab_data->surface), res);
 
    tizen_keyrouter_send_keygrab_notify(keygrab_data->resource, keygrab_data->surface, keygrab_data->key, TIZEN_KEYROUTER_MODE_NONE, res);
-
-   e_input_wl_events_flush();
 }
 
 /* tizen_keyrouter unset_keygrab request handler */
@@ -314,7 +312,7 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso
    keygrab_data.mode = TIZEN_KEYROUTER_MODE_NONE; /* UNUSED */
 
    INF("client: %p, surface: %p, key: %d\n", keygrab_data.client, keygrab_data.surface, keygrab_data.key);
-   e_input_backend_thread_safe_call(_e_keyrouter_input_thread_keygrab_unset, &keygrab_data, sizeof(E_Input_Thread_Request_Keygrab_Data));
+   _e_keyrouter_input_thread_keygrab_unset(&keygrab_data);
 }
 
 /* tizen_keyrouter get_keygrab_status request handler */