client: clean up trace log

Change-Id: Ic6bd7dc3319b7f87cd1b5a047bde0be6bc1401ae

diff --git a/src/wayland-tbm-client.c b/src/wayland-tbm-client.c
index 97cdfcf..bea6d88 100644 (file)
--- a/src/wayland-tbm-client.c
+++ b/src/wayland-tbm-client.c
@@ -171,9 +171,8 @@ handle_tbm_buffer_import_with_id(void *data,
        snprintf(debug_id, sizeof(debug_id), "%u", (unsigned int)wl_proxy_get_id((struct wl_proxy *)wl_buffer));
        tbm_surface_internal_set_debug_data(tbm_surface, "id", debug_id);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p", getpid(), wl_buffer, tbm_surface);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p (%dx%d) size:%d fmt:%c%c%c%c",
+               wl_buffer, tbm_surface, width, height, size, FOURCC_STR(format));
 
        return;
 
@@ -220,9 +219,8 @@ handle_tbm_buffer_import_with_fd(void *data,
        snprintf(debug_id, sizeof(debug_id), "%u", (unsigned int)wl_proxy_get_id((struct wl_proxy *)wl_buffer));
        tbm_surface_internal_set_debug_data(tbm_surface, "id", debug_id);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p", getpid(), wl_buffer, tbm_surface);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p (%dx%d) size:%d fmt:%c%c%c%c",
+               wl_buffer, tbm_surface, width, height, size, FOURCC_STR(format));
 
        return;
 
@@ -240,9 +238,7 @@ handle_buffer_destroy(void *data,
        tbm_surface_h tbm_surface;
        struct wayland_tbm_buffer *buffer = NULL;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("       pid:%d wl_buffer:%p", getpid(), wl_buffer);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p", wl_buffer);
 
        buffer = _wayland_tbm_client_find_tbm_buffer_wl_buffer(tbm_client, wl_buffer);
        if (buffer)
@@ -583,10 +579,8 @@ wayland_tbm_client_create_buffer(struct wayland_tbm_client *tbm_client,
                (unsigned int)wl_proxy_get_id((struct wl_proxy *)wl_buffer));
        tbm_surface_internal_set_debug_data(surface, "id", debug_id);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("        pid:%d wl_buffer:%p tbm_surface:%p", getpid(),
-                       wl_buffer, surface);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p (%dx%d) size:%d fmt:%c%c%c%c",
+               wl_buffer, surface, info.width, info.height, info.size, FOURCC_STR(info.format));
 
        return wl_buffer;
 
@@ -610,9 +604,7 @@ wayland_tbm_client_destroy_buffer(struct wayland_tbm_client *tbm_client,
 
        // TODO: valid check if the buffer is from this tbm_client???
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("       pid:%d wl_buffer:%p", getpid(), wl_buffer);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p", wl_buffer);
 
        buffer = _wayland_tbm_client_find_tbm_buffer_wl_buffer(tbm_client, wl_buffer);
        if (buffer)
@@ -683,16 +675,14 @@ _wayland_tbm_client_queue_destroy_attach_bufs(struct wayland_tbm_surface_queue *
        struct wayland_tbm_buffer *buffer, *tmp;
 
        wl_list_for_each_safe(buffer, tmp, &queue_info->attach_bufs, link) {
-#ifdef DEBUG_TRACE
-               WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p", getpid(), buffer->wl_buffer, buffer->tbm_surface);
-#endif
+               WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p surface_queue:%p",
+                       buffer->wl_buffer, buffer->tbm_surface, queue_info->tbm_queue);
+
                if (buffer->wl_buffer) {
                        wl_tbm_queue_detach_buffer(queue_info->wl_tbm_queue, buffer->wl_buffer);
 
                        if (!buffer->reuse) {
-#ifdef DEBUG_TRACE
-                               WL_TBM_TRACE("destroy the wl_buffer:%p", buffer->wl_buffer);
-#endif
+                               WL_TBM_TRACE("wl_buffer:%p destroy", buffer->wl_buffer);
                                wl_buffer_destroy(buffer->wl_buffer);
                                buffer->wl_buffer = NULL;
                        }
@@ -716,16 +706,15 @@ _wayland_tbm_client_queue_destroy_unused_attach_bufs(struct wayland_tbm_surface_
                        buffer->expire = 1;
                        continue;
                }
-#ifdef DEBUG_TRACE
-               WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p", getpid(), buffer->wl_buffer, buffer->tbm_surface);
-#endif
+
+               WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p surface_queue:%p",
+                       buffer->wl_buffer, buffer->tbm_surface, queue_info->tbm_queue);
+
                if (buffer->wl_buffer) {
                        wl_tbm_queue_detach_buffer(queue_info->wl_tbm_queue, buffer->wl_buffer);
 
                        if (!buffer->reuse) {
-#ifdef DEBUG_TRACE
-                               WL_TBM_TRACE("destroy the wl_buffer:%p", buffer->wl_buffer);
-#endif
+                               WL_TBM_TRACE("wl_buffer:%p destroy", buffer->wl_buffer);
                                wl_buffer_destroy(buffer->wl_buffer);
                                buffer->wl_buffer = NULL;
                        }
@@ -847,8 +836,8 @@ __wayland_tbm_client_surface_alloc_cb(tbm_surface_queue_h surface_queue, void *d
                                        /* ref.. pair of __wayland_tbm_client_surface_free_cb */
                                        buffer->allocated = 1;
 
-                                       WL_TBM_TRACE("   pid:%d wl_buffer:%p tbm_surface:%p ACTIVE", getpid(), buffer->wl_buffer, buffer->tbm_surface);
-
+                                       WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p surface_queue:%p ACTIVE",
+                                               buffer->wl_buffer, buffer->tbm_surface, surface_queue);
                                } else {
                                        alloc = 1;
                                }
@@ -872,7 +861,8 @@ __wayland_tbm_client_surface_alloc_cb(tbm_surface_queue_h surface_queue, void *d
                                                        queue_info->format,
                                                        queue_info->flag);
 
-               WL_TBM_TRACE("   pid:%d tbm_surface:%p DEACTIVE", getpid(), surface);
+               WL_TBM_TRACE("surface_queue:%p tbm_surface:%p DEACTIVE",
+                       surface_queue, surface);
        }
 
        return surface;
@@ -882,9 +872,8 @@ static void
 __wayland_tbm_client_surface_free_cb(tbm_surface_queue_h surface_queue, void *data,
                      tbm_surface_h surface)
 {
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("    pid:%d tbm_surface:%p", getpid(), surface);
-#endif
+       WL_TBM_TRACE("surface_queue:%p tbm_surface:%p", surface_queue, surface);
+
        struct wayland_tbm_surface_queue *queue_info =
                                (struct wayland_tbm_surface_queue *)data;
        struct wayland_tbm_buffer *buffer, *tmp;
@@ -950,10 +939,8 @@ handle_tbm_queue_buffer_attached(void *data,
        wl_list_insert(&queue_info->attach_bufs, &buffer->link);
        pthread_mutex_unlock(&queue_info->lock);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p",
-                       getpid(), buffer->wl_buffer, buffer->tbm_surface);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p tbm_surface:%p surface_queue:%p",
+               buffer->wl_buffer, buffer->tbm_surface, queue_info->tbm_queue);
 
        return;
 
@@ -991,7 +978,7 @@ handle_tbm_queue_active(void *data,
                                (struct wayland_tbm_surface_queue *)data;
        tbm_surface_queue_h tbm_queue = NULL;
 
-       WL_TBM_LOG("active queue");
+       WL_TBM_LOG("active surface_queue:%p", queue_info->tbm_queue);
 
        pthread_mutex_lock(&queue_info->lock);
 
@@ -1000,9 +987,6 @@ handle_tbm_queue_active(void *data,
                pthread_mutex_unlock(&queue_info->lock);
                return;
        }
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("                  pid:%d", getpid());
-#endif
 
        queue_info->is_active = 1;
        queue_info->usage = usage;
@@ -1044,11 +1028,7 @@ handle_tbm_queue_deactive(void *data,
        int length = 0;
        int i;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("                  pid:%d", getpid());
-#endif
-
-       WL_TBM_LOG("deactive queue");
+       WL_TBM_LOG("deactive surface_queue:%p", queue_info->tbm_queue);
 
        pthread_mutex_lock(&queue_info->lock);
 
@@ -1106,10 +1086,7 @@ handle_tbm_queue_flush(void *data,
                                (struct wayland_tbm_surface_queue *)data;
        tbm_surface_queue_h tbm_queue = NULL;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("pid:%d", getpid());
-#endif
-       WL_TBM_LOG("flush queue");
+       WL_TBM_LOG("flush surface_queue:%p", queue_info->tbm_queue);
 
        pthread_mutex_lock(&queue_info->lock);
 
@@ -1151,10 +1128,8 @@ handle_tbm_queue_buffer_usable(void *data,
        if (queue_info->is_active && !queue_info->active_flush_invalid)
                is_active = 1;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE("pid:%d wl_buffer:%p tbm_surface:%p",
-                       getpid(), buffer->wl_buffer, buffer->tbm_surface);
-#endif
+       WL_TBM_TRACE("wl_buffer:%p surface_queue:%p",
+               wl_buffer, queue_info->tbm_queue);
 
        pthread_mutex_unlock(&queue_info->lock);
 
@@ -1174,7 +1149,6 @@ static struct wayland_tbm_surface_queue *
 _wayland_tbm_client_find_queue_info_wl_surface(struct wayland_tbm_client *tbm_client,
                                        struct wl_surface *surface)
 {
-       /* set the debug_pid to the surface for debugging */
        if (!wl_list_empty(&tbm_client->queue_info_list)) {
                struct wayland_tbm_surface_queue *queue_info = NULL;
 
@@ -1191,7 +1165,6 @@ static struct wayland_tbm_surface_queue *
 _wayland_tbm_client_find_queue_info_queue(struct wayland_tbm_client *tbm_client,
                                        tbm_surface_queue_h queue)
 {
-       /* set the debug_pid to the surface for debugging */
        if (!wl_list_empty(&tbm_client->queue_info_list)) {
                struct wayland_tbm_surface_queue *queue_info = NULL;
 
@@ -1215,9 +1188,8 @@ _handle_tbm_surface_queue_destroy_notify(tbm_surface_queue_h surface_queue,
        int length = 0;
        int i;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE(" pid:%d", getpid());
-#endif
+       WL_TBM_TRACE("surface_queue:%p", surface_queue);
+
        pthread_mutex_lock(&queue_info->lock);
 
        length = wl_list_length(&queue_info->attach_bufs);
@@ -1261,9 +1233,7 @@ _handle_tbm_surface_queue_reset_notify(tbm_surface_queue_h surface_queue,
        int format;
        int queue_size;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE(" pid:%d", getpid());
-#endif
+       WL_TBM_TRACE("surface_queue:%p", surface_queue);
 
        width = tbm_surface_queue_get_width(surface_queue);
        height = tbm_surface_queue_get_height(surface_queue);
@@ -1369,10 +1339,6 @@ wayland_tbm_client_create_surface_queue(struct wayland_tbm_client *tbm_client,
        struct wayland_tbm_surface_queue *queue_info;
        struct wl_tbm_queue *queue;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE(" pid:%d", getpid());
-#endif
-
        WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
        WL_TBM_RETURN_VAL_IF_FAIL(surface != NULL, NULL);
 
@@ -1419,12 +1385,8 @@ wayland_tbm_client_create_surface_queue(struct wayland_tbm_client *tbm_client,
        tbm_surface_queue_add_trace_cb(queue_info->tbm_queue,
                                        _handle_tbm_surface_queue_trace_notify, queue_info);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_C_LOG("INFO cur(%dx%d fmt:0x%x num:%d) new(%dx%d fmt:0x%x num:%d)",
-               queue_info->width, queue_info->height,
-               queue_info->format, queue_info->num_bufs,
-               width, height, format, queue_size);
-#endif
+       WL_TBM_C_LOG("create wl_surface:%p surface_queue:%p(%dx%d size:%d fmt:%c%c%c%c)",
+               surface, queue_info->tbm_queue, width, height, queue_size, FOURCC_STR(format));
 
        pthread_mutex_init(&queue_info->lock, NULL);
 
@@ -1449,10 +1411,6 @@ wayland_tbm_client_create_surface_queue_tiled(struct wayland_tbm_client *tbm_cli
        struct wayland_tbm_surface_queue *queue_info;
        struct wl_tbm_queue *queue;
 
-#ifdef DEBUG_TRACE
-       WL_TBM_TRACE(" pid:%d", getpid());
-#endif
-
        WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
        WL_TBM_RETURN_VAL_IF_FAIL(surface != NULL, NULL);
 
@@ -1499,12 +1457,8 @@ wayland_tbm_client_create_surface_queue_tiled(struct wayland_tbm_client *tbm_cli
        tbm_surface_queue_add_trace_cb(queue_info->tbm_queue,
                                        _handle_tbm_surface_queue_trace_notify, queue_info);
 
-#ifdef DEBUG_TRACE
-       WL_TBM_C_LOG("INFO cur(%dx%d fmt:0x%x num:%d) new(%dx%d fmt:0x%x num:%d)",
-               queue_info->width, queue_info->height,
-               queue_info->format, queue_info->num_bufs,
-               width, height, format, queue_size);
-#endif
+       WL_TBM_C_LOG("create wl_surface:%p surface_queue:%p(%dx%d size:%d fmt:%c%c%c%c)",
+               surface, queue_info->tbm_queue, width, height, queue_size, FOURCC_STR(format));
 
        pthread_mutex_init(&queue_info->lock, NULL);
 

diff --git a/src/wayland-tbm-int.h b/src/wayland-tbm-int.h
index 9de3ccb..f759429 100644 (file)
--- a/src/wayland-tbm-int.h
+++ b/src/wayland-tbm-int.h
@@ -54,7 +54,7 @@ extern int bTrace;
 
 #define WL_TBM_C_LOG(fmt, ...) {\
        if (bDlog) {\
-               LOGE(fmt, ##__VA_ARGS__);\
+               LOGI(fmt, ##__VA_ARGS__);\
        } \
        else {\
                fprintf(stderr, "[WL_TBM_C(%d):%s] " fmt"\n", getpid(), __func__, ##__VA_ARGS__);\
@@ -94,6 +94,8 @@ extern int bTrace;
 #define WL_TBM_LOG_E(fmt, ...)   fprintf(stderr, "[WL_TBM_E(%d)] " fmt"\n", getpid(), ##__VA_ARGS__)
 #endif /* ENABLE_DLOG */
 
+#define C(b, m)             (((b) >> (m)) & 0xFF)
+#define FOURCC_STR(id)      C(id, 0), C(id, 8), C(id, 16), C(id, 24)
 
 /* check condition */
 #define WL_TBM_RETURN_IF_FAIL(cond) {\