Change trace macro name TRACE_BEGIN to TRACE_INPUT_BEGIN and modify some trace points

Change-Id: I57bfe257939b6c8aacc1709f267695c038b31827

diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c
index 02609d3..ea1e4dd 100644 (file)
--- a/src/e_mod_keyrouter_events.c
+++ b/src/e_mod_keyrouter_events.c
@@ -39,8 +39,6 @@ e_keyrouter_process_key_event(void *event, int type)
    Eina_Bool res = EINA_TRUE;
    Ecore_Event_Key *ev = event;
 
-   TRACE_BEGIN(e_keyrouter_process_key_event);
-
    if (!ev) goto finish;
 
    KLDBG("[%s] keyname: %s, key: %s, keycode: %d\n", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode);
@@ -69,7 +67,6 @@ e_keyrouter_process_key_event(void *event, int type)
     res = EINA_FALSE;
 
 finish:
-   TRACE_END();
    return res;
 }
 
@@ -99,12 +96,10 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev)
      {
         if (key_node_data)
           {
-             TRACE_BEGIN(_e_keyrouter_send_key_event_release);
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
              KLINF("Release Pair : Key %s(%s:%d) ===> E_Client (%p) WL_Client (%p)\n",
                       ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
              E_FREE(key_node_data);
-             TRACE_END();
           }
      }
    krt->HardKeys[ev->keycode].press_ptr = NULL;
@@ -126,13 +121,10 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
      {
         if (key_node_data)
           {
-             TRACE_BEGIN(_e_keyrouter_send_key_event_exclusive);
-
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
              KLINF("EXCLUSIVE Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
                       ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
 
-             TRACE_END();
              return EINA_TRUE;
           }
      }
@@ -141,12 +133,10 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
      {
         if (key_node_data)
           {
-             TRACE_BEGIN(_e_keyrouter_send_key_event_or_exclusive);
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
              KLINF("OVERRIDABLE_EXCLUSIVE Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
 
-             TRACE_END();
              return EINA_TRUE;
           }
      }
@@ -163,24 +153,20 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                {
                   if ((EINA_FALSE == krt->isWindowStackChanged) && (surface_focus == key_node_data->surface))
                     {
-                       TRACE_BEGIN(_e_keyrouter_send_key_event_topposition);
                        _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev);
                        KLINF("TOPMOST (TOP_POSITION) Mode : Key %s (%s:%d) ===> Surface (%p)\n",
                                 ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface);
 
-                       TRACE_END();
                        return EINA_TRUE;
                     }
                   krt->isWindowStackChanged = EINA_FALSE;
 
                   if (_e_keyrouter_check_top_visible_window(ec_focus, keycode))
                     {
-                       TRACE_BEGIN(_e_keyrouter_send_key_event_topposition);
                        _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev);
                        KLINF("TOPMOST (TOP_POSITION) Mode : Key %s (%s:%d) ===> Surface (%p)\n",
                              ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode,key_node_data->surface);
 
-                       TRACE_END();
                        return EINA_TRUE;
                     }
                   break;
@@ -202,22 +188,18 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                     {
                        if (key_node_data->surface != surface_focus)
                          {
-                            TRACE_BEGIN(_e_keyrouter_send_key_event_shared);
                             _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
                             KLINF("SHARED Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
                                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
-                            TRACE_END();
                          }
                     }
                   else
                     {
                        if ((surface_focus) && (key_node_data->wc != wl_resource_get_client(surface_focus)))
                          {
-                            TRACE_BEGIN(_e_keyrouter_send_key_event_shared);
                             _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
                             KLINF("SHARED Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
                                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
-                            TRACE_END();
                          }
                     }
                }
@@ -245,14 +227,10 @@ _e_keyrouter_send_key_events_register(int type, Ecore_Event_Key *ev)
         return EINA_FALSE;
      }
 
-   TRACE_BEGIN(_e_keyrouter_send_key_event_register);
-
    _e_keyrouter_send_key_event(type, krt->HardKeys[keycode].registered_ptr->surface, NULL, ev);
    KLINF("REGISTER Mode : Key %s(%s:%d) ===> Surface (%p)\n",
             ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, krt->HardKeys[keycode].registered_ptr->surface);
 
-   TRACE_END();
-
    return EINA_TRUE;
 }
 
@@ -344,7 +322,9 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli
              if (wl_resource_get_client(res) != wc_send) continue;
 
              KLDBG("[time: %d] res: %p, serial: %d send a key(%d):%d to wl_client:%p\n", ev->timestamp, res, serial, (ev->keycode)-8, evtype, wc_send);
+             TRACE_INPUT_BEGIN(_e_keyrouter_send_key_event);
              wl_keyboard_send_key(res, serial, ev->timestamp, ev->keycode-8, evtype);
+             TRACE_INPUT_END();
           }
      }
 }

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index 5bf34ff..672509e 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -140,12 +140,12 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour
 {
    int res = 0;
 
-   TRACE_BEGIN(_e_keyrouter_cb_keygrab_set);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set);
    KLINF("Key grab request (client: %p, surface: %p, key:%d, mode:%d)\n", client, surface, key, mode);
 
    res = _e_keyrouter_keygrab_set(client, surface, key, mode);
 
-   TRACE_END();
+   TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, res);
 }
 
@@ -155,12 +155,12 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso
 {
    int res = 0;
 
-   TRACE_BEGIN(_e_keyrouter_cb_keygrab_unset);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset);
    KLINF("Key ungrab request (client: %p, surface: %p, key:%d)\n", client, surface, key);
 
    res = _e_keyrouter_keygrab_unset(client, surface, key);
 
-   TRACE_END();
+   TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, TIZEN_KEYROUTER_MODE_NONE, res);
 }
 
@@ -174,10 +174,10 @@ _e_keyrouter_cb_get_keygrab_status(struct wl_client *client, struct wl_resource
    (void) key;
    int mode = TIZEN_KEYROUTER_MODE_NONE;
 
-   TRACE_BEGIN(_e_keyrouter_cb_get_keygrab_status);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_get_keygrab_status);
    mode = e_keyrouter_find_key_in_list(surface, client, key);
 
-   TRACE_END();
+   TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, TIZEN_KEYROUTER_ERROR_NONE);
 }
 
@@ -189,7 +189,7 @@ _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;
 
-   TRACE_BEGIN(_e_keyrouter_cb_keygrab_set_list);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set_list);
 
    wl_array_init(&grab_result_list);
 
@@ -218,7 +218,7 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
      }
 
 send_notify:
-   TRACE_END();
+   TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify_list(resource, surface, &grab_result_list);
    wl_array_release(&grab_result_list);
 }
@@ -231,7 +231,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
    int *ungrab_request = NULL;
    int res = TIZEN_KEYROUTER_ERROR_NONE;
 
-   TRACE_BEGIN(_e_keyrouter_cb_keygrab_unset_list);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset_list);
 
    wl_array_init(&grab_result_list);
 
@@ -248,7 +248,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
           }
      }
 
-   TRACE_END();
+   TRACE_INPUT_END();
    tizen_keyrouter_send_keygrab_notify_list(resource, surface, &grab_result_list);
    wl_array_release(&grab_result_list);
 }
@@ -383,12 +383,12 @@ _e_keyrouter_init(E_Module *m)
    Eina_Bool res = EINA_FALSE;
    int ret;
 
-   TRACE_BEGIN(_e_keyrouter_init);
+   TRACE_INPUT_BEGIN(_e_keyrouter_init);
 
    if (!krt)
      {
         KLERR("Failed to allocate memory for krt !\n");
-        TRACE_END();
+        TRACE_INPUT_END();
         return NULL;
      }
 
@@ -431,7 +431,7 @@ _e_keyrouter_init(E_Module *m)
      }
 #endif
 
-   TRACE_END();
+   TRACE_INPUT_END();
    return kconfig;
 
 err:
@@ -444,7 +444,7 @@ err:
    if (krt && krt->ef_handler) ecore_event_filter_del(krt->ef_handler);
    if (krt) E_FREE(krt);
 
-   TRACE_END();
+   TRACE_INPUT_END();
    return NULL;
 }
 
@@ -489,8 +489,6 @@ _e_keyrouter_query_tizen_key_table(void)
    Eina_List *l;
    E_Keyrouter_Tizen_HWKey *data;
 
-   TRACE_BEGIN(_e_keyrouter_query_tizen_key_table);
-
    /* TODO: Make struct in HardKeys to pointer.
                   If a key is defined, allocate memory to pointer,
                   that makes to save unnecessary memory */
@@ -515,7 +513,6 @@ _e_keyrouter_query_tizen_key_table(void)
         krt->HardKeys[data->keycode].no_privcheck = data->no_privcheck ? EINA_TRUE : EINA_FALSE;
      }
 
-   TRACE_END();
    return EINA_TRUE;
 }
 

diff --git a/src/e_mod_main_wl.h b/src/e_mod_main_wl.h
index d66197b..7091e2c 100644 (file)
--- a/src/e_mod_main_wl.h
+++ b/src/e_mod_main_wl.h
@@ -9,21 +9,21 @@
 #include <cynara-creds-socket.h>
 #endif
 
-#ifdef TRACE_BEGIN
-#undef TRACE_BEGIN
+#ifdef TRACE_INPUT_BEGIN
+#undef TRACE_INPUT_BEGIN
 #endif
-#ifdef TRACE_END
-#undef TRACE_END
+#ifdef TRACE_INPUT_END
+#undef TRACE_INPUT_END
 #endif
 
 #ifdef ENABLE_TTRACE
 #include <ttrace.h>
 
-#define TRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_INPUT, "INPUT:KRT:"#NAME)
-#define TRACE_END() traceEnd(TTRACE_TAG_INPUT)
+#define TRACE_INPUT_BEGIN(NAME) traceBegin(TTRACE_TAG_INPUT, "INPUT:KRT:"#NAME)
+#define TRACE_INPUT_END() traceEnd(TTRACE_TAG_INPUT)
 #else
-#define TRACE_BEGIN(NAME)
-#define TRACE_END()
+#define TRACE_INPUT_BEGIN(NAME)
+#define TRACE_INPUT_END()
 #endif
 
 /* Temporary value of maximum number of HWKeys */