change PEPPER_TRACE into PEPPER_DEBUG

Change-Id: Ib69c3dc8d18be1d44d4d33adc5e14d040e7f3383

diff --git a/samples/sample-server.c b/samples/sample-server.c
index 4836b41..75e95a5 100644 (file)
--- a/samples/sample-server.c
+++ b/samples/sample-server.c
@@ -62,7 +62,7 @@ _handle_keyboard_key(pepper_event_listener_t *listener, pepper_object_t *object,
 
        event = (pepper_input_event_t *)info;
 
-       PEPPER_TRACE("[%s] keycode:%d, state=%d\n", __FUNCTION__, event->key, event->state);
+       PEPPER_DEBUG("[%s] keycode:%d, state=%d\n", __FUNCTION__, event->key, event->state);
 
        /* send key event via keyrouter key event handler */
        pepper_keyrouter_event_handler(listener, object, id, info, keyrouter);
@@ -92,7 +92,7 @@ _handle_seat_add(pepper_event_listener_t *listener, pepper_object_t *object, uin
 {
        pepper_seat_t *new_seat = (pepper_seat_t *)info;
 
-       PEPPER_TRACE("[%s] seat added. name:%s\n", __FUNCTION__, pepper_seat_get_name(new_seat));
+       PEPPER_DEBUG("[%s] seat added. name:%s\n", __FUNCTION__, pepper_seat_get_name(new_seat));
 
        listener_keyboard_add = pepper_object_add_event_listener((pepper_object_t *)new_seat,
                                                                PEPPER_EVENT_SEAT_KEYBOARD_ADD,
@@ -106,7 +106,7 @@ _handle_seat_remove(pepper_event_listener_t *listener, pepper_object_t *object,
 {
        pepper_seat_t *seat = (pepper_seat_t *)info;
 
-       PEPPER_TRACE("[%s] seat removed (name=%s)\n", __FUNCTION__, pepper_seat_get_name(seat));
+       PEPPER_DEBUG("[%s] seat removed (name=%s)\n", __FUNCTION__, pepper_seat_get_name(seat));
 
        /* remove devices belongs to this seat */
        if (input_device)
@@ -119,7 +119,7 @@ _handle_input_device_add(pepper_event_listener_t *listener, pepper_object_t *obj
 {
        pepper_input_device_t *device = (pepper_input_device_t *)info;
 
-       PEPPER_TRACE("[%s] input device added.\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] input device added.\n", __FUNCTION__);
 
        if (seat)
                pepper_seat_add_input_device(seat, device);
@@ -131,7 +131,7 @@ _handle_input_device_remove(pepper_event_listener_t *listener, pepper_object_t *
 {
        pepper_input_device_t *device = (pepper_input_device_t *)info;
 
-       PEPPER_TRACE("[%s] input device removed.\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] input device removed.\n", __FUNCTION__);
 
        if (seat)
                pepper_seat_remove_input_device(seat, device);
@@ -270,7 +270,7 @@ main(int argc, char **argv)
        probed = pepper_evdev_device_probe(evdev, caps);
 
        if (!probed)
-               PEPPER_TRACE("No evdev devices have been probed.\n");
+               PEPPER_DEBUG("No evdev devices have been probed.\n");
 
        inotify = pepper_inotify_create(compositor, _handle_pepper_inotify_event, evdev);
        PEPPER_CHECK(inotify, ;, "Failed to create inotify\n");

diff --git a/src/bin/doctor/doctor.c b/src/bin/doctor/doctor.c
index e949af3..1c7c159 100644 (file)
--- a/src/bin/doctor/doctor.c
+++ b/src/bin/doctor/doctor.c
@@ -49,19 +49,19 @@ _handle_pointer_event(pepper_event_listener_t *listener, pepper_object_t *object
        {
                case PEPPER_EVENT_POINTER_MOTION:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_POINTER_MOTION\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_POINTER_MOTION\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_POINTER_MOTION_ABSOLUTE:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_POINTER_MOTION_ABSOLUTE\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_POINTER_MOTION_ABSOLUTE\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_POINTER_BUTTON:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_POINTER_BUTTON\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_POINTER_BUTTON\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_POINTER_AXIS:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_POINTER_AXIS\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_POINTER_AXIS\n", __FUNCTION__);
                        break;
        }
 }
@@ -85,23 +85,23 @@ _handle_touch_event(pepper_event_listener_t *listener, pepper_object_t *object,
        {
                case PEPPER_EVENT_TOUCH_DOWN:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_TOUCH_DOWN\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_TOUCH_DOWN\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_TOUCH_UP:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_TOUCH_UP\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_TOUCH_UP\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_TOUCH_MOTION:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_TOUCH_MOTION\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_TOUCH_MOTION\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_TOUCH_FRAME:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_TOUCH_FRAME\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_TOUCH_FRAME\n", __FUNCTION__);
                        break;
                case PEPPER_EVENT_TOUCH_CANCEL:
                        /* TODO: */
-                       PEPPER_TRACE("[%s] PEPPER_EVENT_TOUCH_CANCEL\n", __FUNCTION__);
+                       PEPPER_DEBUG("[%s] PEPPER_EVENT_TOUCH_CANCEL\n", __FUNCTION__);
                        break;
        }
 }
@@ -115,7 +115,7 @@ _handle_keyboard_key(pepper_event_listener_t *listener, pepper_object_t *object,
        PEPPER_CHECK(data, return, "Invalid data.\n");
 
        event = (pepper_input_event_t *)info;
-       PEPPER_TRACE("[%s] keycode:%d, state=%d\n", __FUNCTION__, event->key, event->state);
+       PEPPER_DEBUG("[%s] keycode:%d, state=%d\n", __FUNCTION__, event->key, event->state);
 
        pepper_keyrouter_event_handler(listener, object, id, info, keyrouter);
 }
@@ -126,7 +126,7 @@ _handle_seat_keyboard_add(pepper_event_listener_t *listener, pepper_object_t *ob
 {
        pepper_keyboard_t *keyboard = (pepper_keyboard_t *)info;
 
-       PEPPER_TRACE("[%s] keyboard added\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] keyboard added\n", __FUNCTION__);
 
        pepper_xkb_keyboard_set_keymap(xkb, keyboard, NULL);
 
@@ -143,7 +143,7 @@ _handle_seat_pointer_add(pepper_event_listener_t *listener, pepper_object_t *obj
 {
        pepper_pointer_t *pointer = (pepper_pointer_t *)info;
 
-       PEPPER_TRACE("[%s] pointer added\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] pointer added\n", __FUNCTION__);
 
        listener_pointer_event = pepper_object_add_event_listener((pepper_object_t *)pointer,
                                                                PEPPER_EVENT_POINTER_MOTION
@@ -161,7 +161,7 @@ _handle_seat_touch_add(pepper_event_listener_t *listener, pepper_object_t *objec
 {
        pepper_touch_t *touch = (pepper_touch_t *)info;
 
-       PEPPER_TRACE("[%s] touch added\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] touch added\n", __FUNCTION__);
 
        listener_touch_event = pepper_object_add_event_listener((pepper_object_t *)touch,
                                                                PEPPER_EVENT_TOUCH_DOWN
@@ -180,7 +180,7 @@ _handle_seat_add(pepper_event_listener_t *listener, pepper_object_t *object, uin
 {
        pepper_seat_t *seat = (pepper_seat_t *)info;
 
-       PEPPER_TRACE("[%s] seat added. name:%s\n", __FUNCTION__, pepper_seat_get_name(seat));
+       PEPPER_DEBUG("[%s] seat added. name:%s\n", __FUNCTION__, pepper_seat_get_name(seat));
 
        listener_keyboard_add = pepper_object_add_event_listener((pepper_object_t *)seat,
                                                                PEPPER_EVENT_SEAT_KEYBOARD_ADD,
@@ -205,7 +205,7 @@ _handle_input_device_add(pepper_event_listener_t *listener, pepper_object_t *obj
 {
        pepper_input_device_t *device = (pepper_input_device_t *)info;
 
-       PEPPER_TRACE("[%s] input device added.\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] input device added.\n", __FUNCTION__);
 
        if (seat)
                pepper_seat_add_input_device(seat, device);
@@ -217,7 +217,7 @@ _handle_input_device_remove(pepper_event_listener_t *listener, pepper_object_t *
 {
        pepper_input_device_t *device = (pepper_input_device_t *)info;
 
-       PEPPER_TRACE("[%s] input device removed.\n", __FUNCTION__);
+       PEPPER_DEBUG("[%s] input device removed.\n", __FUNCTION__);
 
        if (seat)
                pepper_seat_remove_input_device(seat, device);
@@ -342,9 +342,9 @@ int main(int argc, char *argv[])
        probed = pepper_evdev_device_probe(evdev, caps);
 
        if (!probed)
-               PEPPER_TRACE("No evdev devices have been probed.\n");
+               PEPPER_DEBUG("No evdev devices have been probed.\n");
        else
-               PEPPER_TRACE("%d evdev device(s) has been probed.\n", probed);
+               PEPPER_DEBUG("%d evdev device(s) has been probed.\n", probed);
 
        /* create server module(s) loader : TODO */
 

diff --git a/src/lib/devicemgr/pepper-devicemgr.c b/src/lib/devicemgr/pepper-devicemgr.c
index 6f3d708..0ef43ba 100644 (file)
--- a/src/lib/devicemgr/pepper-devicemgr.c
+++ b/src/lib/devicemgr/pepper-devicemgr.c
@@ -146,7 +146,7 @@ _pepper_devicemgr_keyboard_grab_key(pepper_keyboard_t *keyboard, void *data,
 
 finish:
        if (!ret)
-               PEPPER_TRACE("block key event: (%d %s)\n", key, (state ? "press" : "release"));
+               PEPPER_DEBUG("block key event: (%d %s)\n", key, (state ? "press" : "release"));
        return ret;
 }
 
@@ -684,7 +684,7 @@ pepper_devicemgr_create(pepper_compositor_t *compositor, pepper_seat_t *seat)
        PEPPER_CHECK(pepper_devicemgr->devicemgr, goto failed, "Failed to create devicemgr\n");
 
        pepper_devicemgr->pepper_security_init_done = ret = pepper_security_init();
-       if (!ret) PEPPER_TRACE("pepper_security_init() is failed. Devicemgr will work without pepper_security.\n");
+       if (!ret) PEPPER_DEBUG("pepper_security_init() is failed. Devicemgr will work without pepper_security.\n");
 
        return pepper_devicemgr;
 

diff --git a/src/lib/drm/drm-output.c b/src/lib/drm/drm-output.c
index bdcc398..7d4ae1e 100644 (file)
--- a/src/lib/drm/drm-output.c
+++ b/src/lib/drm/drm-output.c
@@ -527,7 +527,7 @@ drm_output_set_cursor(drm_output_t *output)
 
                if (drmModeSetCursor(drm->fd, output->crtc_id, gbm_bo_get_handle(bo).s32,
                                                         drm->cursor_width, drm->cursor_height)) {
-                       PEPPER_TRACE("failed to set cursor\n");
+                       PEPPER_DEBUG("failed to set cursor\n");
                        drm->cursor_broken = PEPPER_TRUE;
                }
 
@@ -537,7 +537,7 @@ drm_output_set_cursor(drm_output_t *output)
        pepper_view_get_position(output->cursor_view, &x, &y);
        if ((output->cursor_x != (int)x) || (output->cursor_y != (int)y)) {
                if (drmModeMoveCursor(drm->fd, output->crtc_id, (int)x, (int)y)) {
-                       PEPPER_TRACE("failed to move cursor\n");
+                       PEPPER_DEBUG("failed to move cursor\n");
                        drm->cursor_broken = PEPPER_TRUE;
                }
 
@@ -893,7 +893,7 @@ drm_output_create(drm_connector_t *conn)
                                                                                                 GBM_FORMAT_ARGB8888,
                                                                                                 GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
                if (!output->cursor_bo[0] || !output->cursor_bo[1]) {
-                       PEPPER_TRACE("failed to create cursor bo\n");
+                       PEPPER_DEBUG("failed to create cursor bo\n");
                        drm->cursor_broken = PEPPER_TRUE;
                }
        }

diff --git a/src/lib/keyrouter/keyrouter.c b/src/lib/keyrouter/keyrouter.c
index 81ddfeb..18b6459 100644 (file)
--- a/src/lib/keyrouter/keyrouter.c
+++ b/src/lib/keyrouter/keyrouter.c
@@ -121,9 +121,9 @@ keyrouter_set_focus_client(keyrouter_t *keyrouter, void *focus_client)
        keyrouter->focus_client = focus_client;
 
        if (focus_client)
-               PEPPER_TRACE("[%s] focus client has been set. (focus_client=0x%p)\n", __FUNCTION__, focus_client);
+               PEPPER_DEBUG("[%s] focus client has been set. (focus_client=0x%p)\n", __FUNCTION__, focus_client);
        else
-               PEPPER_TRACE("[%s] focus client has been set to NULL.\n", __FUNCTION__);
+               PEPPER_DEBUG("[%s] focus client has been set to NULL.\n", __FUNCTION__);
 }
 
 PEPPER_API void
@@ -134,9 +134,9 @@ keyrouter_set_top_client(keyrouter_t *keyrouter, void *top_client)
        keyrouter->top_client = top_client;
 
        if (top_client)
-               PEPPER_TRACE("[%s] top client has been set. (top_client=0x%p)\n", __FUNCTION__, top_client);
+               PEPPER_DEBUG("[%s] top client has been set. (top_client=0x%p)\n", __FUNCTION__, top_client);
        else
-               PEPPER_TRACE("[%s] top client has been set to NULL.\n", __FUNCTION__);
+               PEPPER_DEBUG("[%s] top client has been set to NULL.\n", __FUNCTION__);
 }
 
 PEPPER_API int
@@ -158,7 +158,7 @@ keyrouter_key_process(keyrouter_t *keyrouter,
                        PEPPER_CHECK(delivery, return 0, "Failed to allocate memory\n");
                        delivery->data = info->data;
                        pepper_list_insert(delivery_list, &delivery->link);
-                       PEPPER_TRACE("Exclusive Mode: keycode: %d to data: %p\n", keycode, info->data);
+                       PEPPER_DEBUG("Exclusive Mode: keycode: %d to data: %p\n", keycode, info->data);
                        return 1;
                }
        }
@@ -169,7 +169,7 @@ keyrouter_key_process(keyrouter_t *keyrouter,
                        PEPPER_CHECK(delivery, return 0, "Failed to allocate memory\n");
                        delivery->data = info->data;
                        pepper_list_insert(delivery_list, &delivery->link);
-                       PEPPER_TRACE("OR-Excl Mode: keycode: %d to data: %p\n", keycode, info->data);
+                       PEPPER_DEBUG("OR-Excl Mode: keycode: %d to data: %p\n", keycode, info->data);
                        return 1;
                }
        }
@@ -180,7 +180,7 @@ keyrouter_key_process(keyrouter_t *keyrouter,
                                PEPPER_CHECK(delivery, return 0, "Failed to allocate memory\n");
                                delivery->data = info->data;
                                pepper_list_insert(delivery_list, &delivery->link);
-                               PEPPER_TRACE("Topmost Mode: keycode: %d to data: %p\n", keycode, info->data);
+                               PEPPER_DEBUG("Topmost Mode: keycode: %d to data: %p\n", keycode, info->data);
                                return 1;
                        }
                }
@@ -192,7 +192,7 @@ keyrouter_key_process(keyrouter_t *keyrouter,
                delivery->data = keyrouter->focus_client;
                pepper_list_insert(delivery_list, &delivery->link);
                count++;
-               PEPPER_TRACE("Focus: keycode: %d to data: %p, count: %d\n", keycode, delivery->data, count);
+               PEPPER_DEBUG("Focus: keycode: %d to data: %p, count: %d\n", keycode, delivery->data, count);
        }
 
        if (!pepper_list_empty(&keyrouter->hard_keys[keycode].grab.shared)) {
@@ -204,7 +204,7 @@ keyrouter_key_process(keyrouter_t *keyrouter,
                        delivery->data = info->data;
                        pepper_list_insert(delivery_list, &delivery->link);
                        count++;
-                       PEPPER_TRACE("Shared: keycode: %d to data: %p, count: %d\n", keycode, info->data, count);
+                       PEPPER_DEBUG("Shared: keycode: %d to data: %p, count: %d\n", keycode, info->data, count);
                }
        }
 

diff --git a/src/lib/keyrouter/pepper-keyrouter.c b/src/lib/keyrouter/pepper-keyrouter.c
index f648f55..ed44dd5 100644 (file)
--- a/src/lib/keyrouter/pepper-keyrouter.c
+++ b/src/lib/keyrouter/pepper-keyrouter.c
@@ -189,36 +189,36 @@ pepper_keyrouter_debug_keygrab_status_print(pepper_keyrouter_t *pepper_keyrouter
 
        for (i = 0; i < KEYROUTER_MAX_KEYS; i++) {
                if (keyrouter_is_grabbed_key(pepper_keyrouter->keyrouter, i)) {
-                       PEPPER_TRACE("\t[ Keycode: %d ]\n", i);
+                       PEPPER_DEBUG("\t[ Keycode: %d ]\n", i);
                        list = keyrouter_grabbed_list_get(pepper_keyrouter->keyrouter, TIZEN_KEYROUTER_MODE_EXCLUSIVE, i);
                        if (list && !pepper_list_empty(list)) {
-                               PEPPER_TRACE("\t  == Exclusive Grab ==\n");
+                               PEPPER_DEBUG("\t  == Exclusive Grab ==\n");
                                pepper_list_for_each(grab_data, list, link) {
-                                       PEPPER_TRACE("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
+                                       PEPPER_DEBUG("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
                                }
                        }
 
                        list = keyrouter_grabbed_list_get(pepper_keyrouter->keyrouter, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, i);
                        if (list && !pepper_list_empty(list)) {
-                               PEPPER_TRACE("\t  == OR_Exclusive Grab ==\n");
+                               PEPPER_DEBUG("\t  == OR_Exclusive Grab ==\n");
                                pepper_list_for_each(grab_data, list, link) {
-                                       PEPPER_TRACE("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
+                                       PEPPER_DEBUG("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
                                }
                        }
 
                        list = keyrouter_grabbed_list_get(pepper_keyrouter->keyrouter, TIZEN_KEYROUTER_MODE_TOPMOST, i);
                        if (list && !pepper_list_empty(list)) {
-                               PEPPER_TRACE("\t  == Top Position Grab ==\n");
+                               PEPPER_DEBUG("\t  == Top Position Grab ==\n");
                                pepper_list_for_each(grab_data, list, link) {
-                                       PEPPER_TRACE("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
+                                       PEPPER_DEBUG("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
                                }
                        }
 
                        list = keyrouter_grabbed_list_get(pepper_keyrouter->keyrouter, TIZEN_KEYROUTER_MODE_SHARED, i);
                        if (list && !pepper_list_empty(list)) {
-                               PEPPER_TRACE("\t  == Shared Grab ==\n");
+                               PEPPER_DEBUG("\t  == Shared Grab ==\n");
                                pepper_list_for_each(grab_data, list, link) {
-                                       PEPPER_TRACE("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
+                                       PEPPER_DEBUG("\t    client: %p (pid: %d)\n", grab_data->data, _pepper_keyrouter_get_pid(grab_data->data));
                                }
                        }
                }
@@ -241,7 +241,7 @@ _pepper_keyrouter_key_send(pepper_keyrouter_t *pepper_keyrouter,
                if (wl_resource_get_client(resource) == client)
                {
                        wl_keyboard_send_key(resource, wl_display_get_serial(pepper_keyrouter->display), time, key, state);
-                       PEPPER_TRACE("[%s] key : %d, state : %d, time : %lu\n", __FUNCTION__, key, state, time);
+                       PEPPER_DEBUG("[%s] key : %d, state : %d, time : %lu\n", __FUNCTION__, key, state, time);
                }
        }
 }
@@ -284,7 +284,7 @@ pepper_keyrouter_key_process(pepper_keyrouter_t *pepper_keyrouter,
                if (pepper_keyrouter->focus_view)
                        pepper_keyboard_send_key(pepper_keyrouter->keyboard, pepper_keyrouter->focus_view, time, key, state);
                else
-                       PEPPER_TRACE("No focused view exists.\n", __FUNCTION__);
+                       PEPPER_DEBUG("No focused view exists.\n", __FUNCTION__);
        }
 }
 
@@ -737,7 +737,7 @@ pepper_keyrouter_create(pepper_compositor_t *compositor)
        PEPPER_CHECK(pepper_keyrouter->keyrouter, goto failed, "Failed to create keyrouter\n");
 
        pepper_keyrouter->pepper_security_init_done = ret = pepper_security_init();
-               if (!ret) PEPPER_TRACE("pepper_security_init() is failed. Keyrouter will work without pepper_security.\n");
+               if (!ret) PEPPER_DEBUG("pepper_security_init() is failed. Keyrouter will work without pepper_security.\n");
 
        return pepper_keyrouter;
 

diff --git a/src/lib/pepper/output.c b/src/lib/pepper/output.c
index 86014e4..5984733 100644 (file)
--- a/src/lib/pepper/output.c
+++ b/src/lib/pepper/output.c
@@ -252,7 +252,7 @@ pepper_output_finish_frame(pepper_output_t *output, struct timespec *ts)
                        else
                                tick_count = PEPPER_OUTPUT_MAX_TICK_COUNT;
 
-                       PEPPER_TRACE("%s FPS : %.2f\n", output->name,
+                       PEPPER_DEBUG("%s FPS : %.2f\n", output->name,
                                                 (double)(tick_count * 1000) / (double)output->frame.total_time);
                }
        }

diff --git a/src/lib/pepper/pepper-utils.h b/src/lib/pepper/pepper-utils.h
index c291288..d988ab4 100644 (file)
--- a/src/lib/pepper/pepper-utils.h
+++ b/src/lib/pepper/pepper-utils.h
@@ -340,7 +340,7 @@ pepper_log_dlog_enable(pepper_bool_t enabled);
                    __FILE__, __FUNCTION__, ##__VA_ARGS__);                             \
     } while (0)
 
-#define PEPPER_TRACE(fmt, ...)                                                          \
+#define PEPPER_DEBUG(fmt, ...)                                                          \
     do {                                                                                \
         pepper_log("DEBUG", PEPPER_LOG_LEVEL_DEBUG, "%s[%s]: " fmt,                      \
                    __FILE__, __FUNCTION__, ##__VA_ARGS__);                              \

diff --git a/src/lib/pepper/utils-security.c b/src/lib/pepper/utils-security.c
index 3edca8d..c8fea90 100644 (file)
--- a/src/lib/pepper/utils-security.c
+++ b/src/lib/pepper/utils-security.c
@@ -111,7 +111,7 @@ pepper_security_privilege_check(pid_t pid, uid_t uid, const char *privilege)
                _pepper_security_log_print(ret, "privilege: %s, client_smack: %s, pid: %d", privilege, client_smack, pid);
 
 finish:
-       PEPPER_TRACE("Privilege Check For '%s' %s pid:%u uid:%u client_smack:%s(len:%d) client_session:%s ret:%d",
+       PEPPER_DEBUG("Privilege Check For '%s' %s pid:%u uid:%u client_smack:%s(len:%d) client_session:%s ret:%d",
                                        privilege, res ? "SUCCESS" : "FAIL", pid, uid,
                                        client_smack ? client_smack : "N/A", len,
                                        client_session ? client_session: "N/A", ret);
@@ -144,12 +144,12 @@ pepper_security_init(void)
 
                for (retry_cnt = 0; retry_cnt < 5; retry_cnt++) {
 
-                       PEPPER_TRACE("Retry cynara initialize: %d\n", retry_cnt + 1);
+                       PEPPER_DEBUG("Retry cynara initialize: %d\n", retry_cnt + 1);
 
                        ret = cynara_initialize(&g_cynara, NULL);
 
                        if (CYNARA_API_SUCCESS == ret)  {
-                               PEPPER_TRACE("Succeed to initialize cynara !\n");
+                               PEPPER_DEBUG("Succeed to initialize cynara !\n");
                                return 1;
                        }
 

diff --git a/src/lib/pepper/view.c b/src/lib/pepper/view.c
index 7eedc4a..0d8899c 100644 (file)
--- a/src/lib/pepper/view.c
+++ b/src/lib/pepper/view.c
@@ -36,7 +36,7 @@ pepper_view_mark_dirty(pepper_view_t *view, uint32_t flag)
        int             i;
 
        if (view->dirty & flag) {
-               PEPPER_TRACE("view:%p, dirty:%x, flag:%x\n", view, view->dirty, flag);
+               PEPPER_DEBUG("view:%p, dirty:%x, flag:%x\n", view, view->dirty, flag);
                return;
        }
 
@@ -165,21 +165,21 @@ pepper_view_update(pepper_view_t *view)
                view->dirty &= ~PEPPER_VIEW_ACTIVE_DIRTY;
 
        if (!view->dirty) {
-               PEPPER_TRACE("view:%p not dirty\n", view);
+               PEPPER_DEBUG("view:%p not dirty\n", view);
                return;
        }
 
-       PEPPER_TRACE("view:%p dirty\n", view);
+       PEPPER_DEBUG("view:%p dirty\n", view);
 
        view->active = active;
 
        /* Damage for the view unmap will be handled by assigning NULL plane. */
        if (!view->active) {
-               PEPPER_TRACE("view:%p not active\n", view);
+               PEPPER_DEBUG("view:%p not active\n", view);
                return;
        }
 
-       PEPPER_TRACE("view:%p active\n", view);
+       PEPPER_DEBUG("view:%p active\n", view);
 
        /* We treat the modification as unmapping and remapping the view. So,
         * damage for the unmap and damage for the remap.
@@ -255,7 +255,7 @@ pepper_view_update(pepper_view_t *view)
                }
        }
 
-       PEPPER_TRACE("view:%p output_overlap:%d\n", view, view->output_overlap);
+       PEPPER_DEBUG("view:%p output_overlap:%d\n", view, view->output_overlap);
 
        /* Mark the plane entries as damaged. */
        for (i = 0; i < PEPPER_MAX_OUTPUT_COUNT; i++)

diff --git a/src/lib/x11/x11-common.c b/src/lib/x11/x11-common.c
index 923596f..b364b5a 100644 (file)
--- a/src/lib/x11/x11-common.c
+++ b/src/lib/x11/x11-common.c
@@ -90,7 +90,7 @@ x11_handle_event(int fd, uint32_t mask, void *data)
                                x11_handle_input_event(seat, type, event);
                        break;
                case XCB_EXPOSE:
-                       PEPPER_TRACE("XCB_EXPOSE\n");
+                       PEPPER_DEBUG("XCB_EXPOSE\n");
                        {
                                xcb_expose_event_t *expose = (xcb_expose_event_t *)event;
                                x11_output_t *output = x11_find_output_by_window(connection, expose->window);
@@ -103,32 +103,32 @@ x11_handle_event(int fd, uint32_t mask, void *data)
                        break;
                case XCB_FOCUS_IN:
                        /* TODO: Cursor handling */
-                       PEPPER_TRACE("XCB_FOCUS_IN\n");
+                       PEPPER_DEBUG("XCB_FOCUS_IN\n");
                        break;
                case XCB_FOCUS_OUT:
-                       PEPPER_TRACE("XCB_FOCUS_OUT\n");
+                       PEPPER_DEBUG("XCB_FOCUS_OUT\n");
                        break;
                case XCB_KEYMAP_NOTIFY:
-                       PEPPER_TRACE("XCB_KEYMAP_NOTIFY\n");
+                       PEPPER_DEBUG("XCB_KEYMAP_NOTIFY\n");
                        {
                                /* TODO: ignore at this time. */
                        }
                        break;
                case XCB_CONFIGURE_NOTIFY:
                        /* Window moved */
-                       PEPPER_TRACE("XCB_CONFIGURE_NOTIFY\n");
+                       PEPPER_DEBUG("XCB_CONFIGURE_NOTIFY\n");
                        break;
                case XCB_QUERY_EXTENSION:
-                       PEPPER_TRACE("XCB_QUERY_EXTENSION\n");
+                       PEPPER_DEBUG("XCB_QUERY_EXTENSION\n");
                        break;
                case XCB_DESTROY_NOTIFY:
-                       PEPPER_TRACE("XCB_DESTROY_NOTIFY\n");
+                       PEPPER_DEBUG("XCB_DESTROY_NOTIFY\n");
                        break;
                case XCB_UNMAP_NOTIFY:
-                       PEPPER_TRACE("XCB_UNMAP_NOTIFY\n");
+                       PEPPER_DEBUG("XCB_UNMAP_NOTIFY\n");
                        break;
                case XCB_CLIENT_MESSAGE:
-                       PEPPER_TRACE("XCB_CLIENT_MESSAGE\n");
+                       PEPPER_DEBUG("XCB_CLIENT_MESSAGE\n");
                        {
                                xcb_client_message_event_t *msg;
                                xcb_atom_t                  atom;

diff --git a/src/lib/x11/x11-input.c b/src/lib/x11/x11-input.c
index c39d75b..6ac46be 100644 (file)
--- a/src/lib/x11/x11-input.c
+++ b/src/lib/x11/x11-input.c
@@ -58,11 +58,11 @@ x11_handle_input_event(x11_seat_t *seat, uint32_t type,
 
        switch (type) {
        case XCB_ENTER_NOTIFY: {
-               PEPPER_TRACE("enter\n");
+               PEPPER_DEBUG("enter\n");
        }
        break;
        case XCB_LEAVE_NOTIFY: {
-               PEPPER_TRACE("leave\n");
+               PEPPER_DEBUG("leave\n");
        }
        break;
        case XCB_KEY_PRESS: {