keyrouter: add pname(process name) of client in logs

Change-Id: I141430ee891e49a953c2ab11a2c52c34b4b8ccfe

diff --git a/src/bin/e_keyrouter_list.c b/src/bin/e_keyrouter_list.c
index de87c62bc2b83786bc5fa43605f875191e3540a1..17fb1d7b5a81a50cbb655890ddaa003c6be6f588 100644 (file)
--- a/src/bin/e_keyrouter_list.c
+++ b/src/bin/e_keyrouter_list.c
@@ -12,6 +12,7 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c
    Eina_List *keylist_ptr = NULL, *l = NULL;
    E_Keyrouter_Key_List_NodePtr kdata = NULL;
    int pid;
+   char *pname = NULL, *cmd = NULL;
 
    EINA_SAFETY_ON_FALSE_RETURN_VAL
      (((mode == TIZEN_KEYROUTER_MODE_EXCLUSIVE) ||
@@ -27,8 +28,12 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c
         EINA_LIST_FOREACH(keylist_ptr, l, kdata)
           {
              pid = e_keyrouter_util_get_pid(kdata->wc, kdata->surface);
-             KLINF("The key(%d) is already grabbed exclusively by other [surface: %p, client: %p, pid:%d(%s)]",
-                    key, kdata->surface, kdata->wc, pid, e_keyrouter_util_cmd_get_from_pid(pid));
+             cmd = e_keyrouter_util_cmd_get_from_pid(pid);
+             pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
+             KLINF("The key(%d) is already grabbed exclusively by other [surface: %p, client: %p, pid:%d, pname: %s]",
+                    key, kdata->surface, kdata->wc, pid, pname ? : "Unknown");
+            if (pname) E_FREE(pname);
+            if (cmd) E_FREE(cmd);
           }
         return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY;
      }

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index 57cf32abb3062e856f191b643500bb4067e8d11d..0224357ac7cb7e8241f57d060eb74cfa98dcb75b 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -172,6 +172,8 @@ static void
 _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t key, uint32_t mode)
 {
    int res = 0;
+   int pid;
+   char *pname = NULL, *cmd = NULL;
 
    TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set);
 
@@ -179,22 +181,28 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour
 
    TRACE_INPUT_END();
 
+   pid = e_keyrouter_util_get_pid(client, surface);
+   cmd = e_keyrouter_util_cmd_get_from_pid(pid);
+   pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
    if (res == TIZEN_KEYROUTER_ERROR_NONE)
      {
         if (mode == TIZEN_KEYROUTER_MODE_EXCLUSIVE)
           {
-             KLINF("Success to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d)", key, e_keyrouter_mode_to_string(mode),
-                client, surface, e_keyrouter_util_get_pid(client, surface));
+             KLINF("Success to %s grab request: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s", e_keyrouter_mode_to_string(mode), key,
+                client, surface, pid, pname ? : "Unknown");
           }
         else
           {
-             KLDBG("Success to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d)", key, e_keyrouter_mode_to_string(mode),
-                client, surface, e_keyrouter_util_get_pid(client, surface));
+             KLDBG("Success to %s grab request: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s)", e_keyrouter_mode_to_string(mode), key,
+                client, surface, pid, pname ? : "Unknown");
           }
      }
    else
-     KLINF("Failed to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, e_keyrouter_mode_to_string(mode),
-        client, surface, e_keyrouter_util_get_pid(client, surface), res);
+     KLINF("Failed to %s grab request: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s): result: %d", e_keyrouter_mode_to_string(mode), key,
+        client, surface, pid, pname ? : "Unknown", res);
+   if (pname) E_FREE(pname);
+   if (cmd) E_FREE(cmd);
+
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, res);
 }
 
@@ -203,6 +211,8 @@ static void
 _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t key)
 {
    int res = 0;
+   int pid;
+   char *pname = NULL, *cmd = NULL;
 
    TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset);
 
@@ -210,12 +220,18 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso
 
    TRACE_INPUT_END();
 
+   pid = e_keyrouter_util_get_pid(client, surface);
+   cmd = e_keyrouter_util_cmd_get_from_pid(pid);
+   pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
    if (res == TIZEN_KEYROUTER_ERROR_NONE)
-     KLDBG("Success to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d)", key, client, surface,
-           e_keyrouter_util_get_pid(client, surface));
+     KLDBG("Success to ungrab request: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s)", key,
+        client, surface, pid, pname ? : "Unknown");
    else
-     KLINF("Failed to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, client, surface,
-           e_keyrouter_util_get_pid(client, surface), res);
+     KLINF("Failed to ungrab request: %d key(wl_client: %p, wl_surface: %p, pid: %d, pname: %s): result: %d", key,
+        client, surface, pid, pname ? : "Unknown", res);
+   if (pname) E_FREE(pname);
+   if (cmd) E_FREE(cmd);
+
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, TIZEN_KEYROUTER_MODE_NONE, res);
 }
 
@@ -242,6 +258,8 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
    E_Keyrouter_Grab_Request *grab_request = NULL;
    int res = TIZEN_KEYROUTER_ERROR_NONE;
    int array_len = 0;
+   int pid;
+   char *pname = NULL, *cmd = NULL;
 
    TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set_list);
 
@@ -260,17 +278,22 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
      {
         res = e_keyrouter_keygrab_set(client, surface, grab_request->key, grab_request->mode);
         grab_request->err = res;
+
+        pid = e_keyrouter_util_get_pid(client, surface);
+        cmd = e_keyrouter_util_cmd_get_from_pid(pid);
+        pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
         if (res == TIZEN_KEYROUTER_ERROR_NONE)
-          KLDBG("Success to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d)",
-                grab_request->key, e_keyrouter_mode_to_string(grab_request->mode),
-                client, surface, e_keyrouter_util_get_pid(client, surface));
+          KLDBG("Success to %s grab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s)",
+                e_keyrouter_mode_to_string(grab_request->mode), grab_request->key,
+                client, surface, pid, pname ? : "Unknown");
         else
-          KLINF("Failed to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d): res: %d",
-                grab_request->key, e_keyrouter_mode_to_string(grab_request->mode),
-                client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->err);
+          KLINF("Failed to %s grab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s): result: %d",
+                e_keyrouter_mode_to_string(grab_request->mode), grab_request->key,
+                client, surface, pid, pname ? : "Unknown", grab_request->err);
+        if (pname) E_FREE(pname);
+        if (cmd) E_FREE(cmd);
      }
 
-
    TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify_list(resource, surface, grab_list);
 }
@@ -281,6 +304,8 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
    E_Keyrouter_Ungrab_Request *ungrab_request = NULL;
    int res = TIZEN_KEYROUTER_ERROR_NONE;
    int array_len = 0;
+   int pid;
+   char *pname = NULL, *cmd = NULL;
 
    TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset_list);
 
@@ -299,12 +324,21 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
      {
         res = e_keyrouter_keygrab_unset(client, surface, ungrab_request->key);
         ungrab_request->err = res;
+        pid = e_keyrouter_util_get_pid(client, surface);
+        cmd = e_keyrouter_util_cmd_get_from_pid(pid);
+        pname = e_keyrouter_util_process_name_get_from_cmd(cmd);
+
         if (res == TIZEN_KEYROUTER_ERROR_NONE)
-          KLDBG("Success to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d)",
-                ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface));
+          KLDBG("Success to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s)",
+                ungrab_request->key,
+                client, surface, pid, pname ? : "Unknown");
         else
-          KLINF("Failed to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d): res: %d",
-                ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->err);
+          KLINF("Failed to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d, pname: %s): result: %d",
+                ungrab_request->key,
+                client, surface, pid, pname ? : "Unknown",
+                ungrab_request->err);
+        if (pname) E_FREE(pname);
+        if (cmd) E_FREE(cmd);
      }
 
    TRACE_INPUT_END();