change the log macro at all files
[platform/core/uifw/libtbm.git] / src / tbm_surface_queue.c
index ab2fd2b..cf2e0a2 100644 (file)
@@ -38,22 +38,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DIRTY_QUEUE    2
 #define NODE_LIST      4
 
-#define TBM_QUEUE_DEBUG 0
-
-#ifdef TRACE
-#define TBM_QUEUE_TRACE(fmt, ...)  { if (bTrace&0x1) fprintf(stderr, "[TBM:TRACE(%d)(%s:%d)] " fmt, getpid(), __func__, __LINE__, ##__VA_ARGS__); }
-#else
-#define TBM_QUEUE_TRACE(fmt, ...)
-#endif /* TRACE */
-
-#if TBM_QUEUE_DEBUG
-#define TBM_LOCK() TBM_LOG_D("[LOCK] %s:%d surface:%p\n", __func__, __LINE__, surface_queue)
-#define TBM_UNLOCK() TBM_LOG_D("[UNLOCK] %s:%d surface:%p\n", __func__, __LINE__, surface_queue)
-#else
-#define TBM_LOCK()
-#define TBM_UNLOCK()
-#endif
-
 static tbm_bufmgr g_surf_queue_bufmgr;
 static pthread_mutex_t tbm_surf_queue_lock;
 void _tbm_surface_queue_mutex_unlock(void);
@@ -61,7 +45,7 @@ void _tbm_surface_queue_mutex_unlock(void);
 /* check condition */
 #define TBM_SURF_QUEUE_RETURN_IF_FAIL(cond) {\
        if (!(cond)) {\
-               TBM_LOG_E("'%s' failed.\n", #cond);\
+               TBM_ERR("'%s' failed.\n", #cond);\
                _tbm_surf_queue_mutex_unlock();\
                return;\
        } \
@@ -69,7 +53,7 @@ void _tbm_surface_queue_mutex_unlock(void);
 
 #define TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(cond, val) {\
        if (!(cond)) {\
-               TBM_LOG_E("'%s' failed.\n", #cond);\
+               TBM_ERR("'%s' failed.\n", #cond);\
                _tbm_surf_queue_mutex_unlock();\
                return val;\
        } \
@@ -175,7 +159,7 @@ _tbm_surf_queue_mutex_init(void)
                return true;
 
        if (pthread_mutex_init(&tbm_surf_queue_lock, NULL)) {
-               TBM_LOG_E("fail: pthread_mutex_init\n");
+               TBM_ERR("fail: pthread_mutex_init\n");
                return false;
        }
 
@@ -188,7 +172,7 @@ static void
 _tbm_surf_queue_mutex_lock(void)
 {
        if (!_tbm_surf_queue_mutex_init()) {
-               TBM_LOG_E("fail: _tbm_surf_queue_mutex_init\n");
+               TBM_ERR("fail: _tbm_surf_queue_mutex_init\n");
                return;
        }
 
@@ -223,29 +207,29 @@ _tbm_surface_queue_is_valid(tbm_surface_queue_h surface_queue)
        tbm_surface_queue_h old_data = NULL;
 
        if (surface_queue == NULL) {
-               TBM_LOG_E("error: surface_queue is NULL.\n");
+               TBM_ERR("error: surface_queue is NULL.\n");
                return 0;
        }
 
        if (g_surf_queue_bufmgr == NULL) {
-               TBM_LOG_E("error: g_surf_queue_bufmgr is NULL.\n");
+               TBM_ERR("error: g_surf_queue_bufmgr is NULL.\n");
                return 0;
        }
 
        if (LIST_IS_EMPTY(&g_surf_queue_bufmgr->surf_queue_list)) {
-               TBM_LOG_E("error: surf_queue_list is empty\n");
+               TBM_ERR("error: surf_queue_list is empty\n");
                return 0;
        }
 
        LIST_FOR_EACH_ENTRY(old_data, &g_surf_queue_bufmgr->surf_queue_list,
                                item_link) {
                if (old_data == surface_queue) {
-                       TBM_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+                       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
                        return 1;
                }
        }
 
-       TBM_LOG_E("error: Invalid tbm_surface_queue(%p)\n", surface_queue);
+       TBM_ERR("error: Invalid tbm_surface_queue(%p)\n", surface_queue);
 
        return 0;
 }
@@ -362,7 +346,7 @@ _queue_get_node(tbm_surface_queue_h surface_queue, int type,
                }
        }
 
-       TBM_LOG_E("fail to get the queue_node.\n");
+       TBM_ERR("fail to get the queue_node.\n");
 
        return NULL;
 }
@@ -422,7 +406,7 @@ _notify_remove(struct list_head *list,
                }
        }
 
-       TBM_LOG_E("Cannot find notifiy\n");
+       TBM_ERR("Cannot find notifiy\n");
 }
 
 static void
@@ -482,7 +466,7 @@ _trace_remove(struct list_head *list,
                }
        }
 
-       TBM_LOG_E("Cannot find notifiy\n");
+       TBM_ERR("Cannot find notifiy\n");
 }
 
 static void
@@ -655,7 +639,7 @@ tbm_surface_queue_add_destroy_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->destory_noti, destroy_cb, data);
 
@@ -678,7 +662,7 @@ tbm_surface_queue_remove_destroy_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->destory_noti, destroy_cb, data);
 
@@ -703,7 +687,7 @@ tbm_surface_queue_add_dequeuable_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->dequeuable_noti, dequeuable_cb, data);
 
@@ -726,7 +710,7 @@ tbm_surface_queue_remove_dequeuable_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->dequeuable_noti, dequeuable_cb, data);
 
@@ -751,7 +735,7 @@ tbm_surface_queue_add_dequeue_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->dequeue_noti, dequeue_cb, data);
 
@@ -774,7 +758,7 @@ tbm_surface_queue_remove_dequeue_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->dequeue_noti, dequeue_cb, data);
 
@@ -799,7 +783,7 @@ tbm_surface_queue_add_can_dequeue_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->can_dequeue_noti, can_dequeue_cb, data);
 
@@ -822,7 +806,7 @@ tbm_surface_queue_remove_can_dequeue_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->can_dequeue_noti, can_dequeue_cb, data);
 
@@ -847,7 +831,7 @@ tbm_surface_queue_add_acquirable_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->acquirable_noti, acquirable_cb, data);
 
@@ -870,7 +854,7 @@ tbm_surface_queue_remove_acquirable_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->acquirable_noti, acquirable_cb, data);
 
@@ -895,7 +879,7 @@ tbm_surface_queue_add_trace_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _trace_add(&surface_queue->trace_noti, trace_cb, data);
 
@@ -918,7 +902,7 @@ tbm_surface_queue_remove_trace_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _trace_remove(&surface_queue->trace_noti, trace_cb, data);
 
@@ -943,7 +927,7 @@ tbm_surface_queue_set_alloc_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        surface_queue->alloc_cb = alloc_cb;
        surface_queue->free_cb = free_cb;
@@ -965,7 +949,7 @@ tbm_surface_queue_get_width(tbm_surface_queue_h surface_queue)
 
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue), 0);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        width = surface_queue->width;
 
@@ -983,7 +967,7 @@ tbm_surface_queue_get_height(tbm_surface_queue_h surface_queue)
 
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue), 0);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        height = surface_queue->height;
 
@@ -1001,7 +985,7 @@ tbm_surface_queue_get_format(tbm_surface_queue_h surface_queue)
 
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue), 0);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        format = surface_queue->format;
 
@@ -1019,7 +1003,7 @@ tbm_surface_queue_get_size(tbm_surface_queue_h surface_queue)
 
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue), 0);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        queue_size = surface_queue->queue_size;
 
@@ -1042,7 +1026,7 @@ tbm_surface_queue_add_reset_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_add(&surface_queue->reset_noti, reset_cb, data);
 
@@ -1065,7 +1049,7 @@ tbm_surface_queue_remove_reset_cb(
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        _notify_remove(&surface_queue->reset_noti, reset_cb, data);
 
@@ -1095,11 +1079,11 @@ tbm_surface_queue_enqueue(tbm_surface_queue_h
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
 
        node = _queue_get_node(surface_queue, 0, surface, &queue_type);
        if (node == NULL || queue_type != NODE_LIST) {
-               TBM_LOG_E("tbm_surface_queue_enqueue::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
+               TBM_ERR("tbm_surface_queue_enqueue::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
                        node, queue_type);
                pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1117,7 +1101,7 @@ tbm_surface_queue_enqueue(tbm_surface_queue_h
                _tbm_surface_queue_enqueue(surface_queue, node, 1);
 
        if (!_queue_get_node(surface_queue, DIRTY_QUEUE, surface, NULL)) {
-               TBM_LOG_E("enqueue surface(%p) but surface isn't present in the dirty_queue\n", surface);
+               TBM_ERR("enqueue surface(%p) but surface isn't present in the dirty_queue\n", surface);
                pthread_mutex_unlock(&surface_queue->lock);
 
                _tbm_surf_queue_mutex_unlock();
@@ -1165,11 +1149,11 @@ tbm_surface_queue_cancel_dequeue(tbm_surface_queue_h
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
 
        node = _queue_get_node(surface_queue, 0, surface, &queue_type);
        if (node == NULL || queue_type != NODE_LIST) {
-               TBM_LOG_E("tbm_surface_queue_cancel_dequeue::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
+               TBM_ERR("tbm_surface_queue_cancel_dequeue::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
                        node, queue_type);
                pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1178,7 +1162,7 @@ tbm_surface_queue_cancel_dequeue(tbm_surface_queue_h
        }
 
        if (node->delete_pending) {
-               TBM_QUEUE_TRACE("delete pending tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
+               TBM_TRACE_SURFACE_QUEUE("delete pending tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
 
                _queue_delete_node(surface_queue, node);
 
@@ -1192,7 +1176,7 @@ tbm_surface_queue_cancel_dequeue(tbm_surface_queue_h
        }
 
        if (surface_queue->queue_size < surface_queue->num_attached) {
-               TBM_QUEUE_TRACE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
+               TBM_TRACE_SURFACE_QUEUE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
 
                if (surface_queue->impl && surface_queue->impl->need_detach)
                        surface_queue->impl->need_detach(surface_queue, node);
@@ -1216,7 +1200,7 @@ tbm_surface_queue_cancel_dequeue(tbm_surface_queue_h
        if (_queue_is_empty(&surface_queue->free_queue)) {
                pthread_mutex_unlock(&surface_queue->lock);
 
-               TBM_LOG_E("surface_queue->free_queue is empty.\n");
+               TBM_ERR("surface_queue->free_queue is empty.\n");
                _tbm_surf_queue_mutex_unlock();
                return TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE;
        }
@@ -1255,7 +1239,7 @@ tbm_surface_queue_dequeue(tbm_surface_queue_h
                        surface_queue->impl->need_attach(surface_queue);
 
                if (!_tbm_surface_queue_is_valid(surface_queue)) {
-                       TBM_LOG_E("surface_queue:%p is invalid", surface_queue);
+                       TBM_ERR("surface_queue:%p is invalid", surface_queue);
                        pthread_mutex_unlock(&surface_queue->lock);
                        _tbm_surf_queue_mutex_unlock();
                        return TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE;
@@ -1268,7 +1252,7 @@ tbm_surface_queue_dequeue(tbm_surface_queue_h
                node = _tbm_surface_queue_dequeue(surface_queue);
 
        if (node == NULL || node->surface == NULL) {
-               TBM_LOG_E("_queue_node_pop_front failed\n");
+               TBM_ERR("_queue_node_pop_front failed\n");
                pthread_mutex_unlock(&surface_queue->lock);
 
                _tbm_surf_queue_mutex_unlock();
@@ -1278,7 +1262,7 @@ tbm_surface_queue_dequeue(tbm_surface_queue_h
        node->type = QUEUE_NODE_TYPE_DEQUEUE;
        *surface = node->surface;
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, *surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, *surface);
 
        pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1308,14 +1292,14 @@ tbm_surface_queue_can_dequeue(tbm_surface_queue_h surface_queue, int wait)
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if (_queue_is_empty(&surface_queue->free_queue)) {
                if (surface_queue->impl && surface_queue->impl->need_attach)
                        surface_queue->impl->need_attach(surface_queue);
 
                if (!_tbm_surface_queue_is_valid(surface_queue)) {
-                       TBM_LOG_E("surface_queue:%p is invalid", surface_queue);
+                       TBM_ERR("surface_queue:%p is invalid", surface_queue);
                        pthread_mutex_unlock(&surface_queue->lock);
                        _tbm_surf_queue_mutex_unlock();
                        return 0;
@@ -1357,11 +1341,11 @@ tbm_surface_queue_release(tbm_surface_queue_h
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
 
        node = _queue_get_node(surface_queue, 0, surface, &queue_type);
        if (node == NULL || queue_type != NODE_LIST) {
-               TBM_LOG_E("tbm_surface_queue_release::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
+               TBM_ERR("tbm_surface_queue_release::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
                        node, queue_type);
                pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1374,7 +1358,7 @@ tbm_surface_queue_release(tbm_surface_queue_h
        }
 
        if (node->delete_pending) {
-               TBM_QUEUE_TRACE("delete pending tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
+               TBM_TRACE_SURFACE_QUEUE("delete pending tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
 
                _queue_delete_node(surface_queue, node);
 
@@ -1388,7 +1372,7 @@ tbm_surface_queue_release(tbm_surface_queue_h
        }
 
        if (surface_queue->queue_size < surface_queue->num_attached) {
-               TBM_QUEUE_TRACE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
+               TBM_TRACE_SURFACE_QUEUE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
 
                if (surface_queue->impl && surface_queue->impl->need_detach)
                        surface_queue->impl->need_detach(surface_queue, node);
@@ -1410,7 +1394,7 @@ tbm_surface_queue_release(tbm_surface_queue_h
                _tbm_surface_queue_release(surface_queue, node, 1);
 
        if (!_queue_get_node(surface_queue, FREE_QUEUE, surface, NULL)) {
-               TBM_LOG_E("release surface(%p) but surface isn't present in the free_queue\n", surface);
+               TBM_ERR("release surface(%p) but surface isn't present in the free_queue\n", surface);
                pthread_mutex_unlock(&surface_queue->lock);
 
                _tbm_surf_queue_mutex_unlock();
@@ -1447,11 +1431,11 @@ tbm_surface_queue_cancel_acquire(tbm_surface_queue_h
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, surface);
 
        node = _queue_get_node(surface_queue, 0, surface, &queue_type);
        if (node == NULL || queue_type != NODE_LIST) {
-               TBM_LOG_E("tbm_surface_queue_cancel_acquire::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
+               TBM_ERR("tbm_surface_queue_cancel_acquire::Surface is existed in free_queue or dirty_queue node:%p, type:%d\n",
                        node, queue_type);
                pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1465,7 +1449,7 @@ tbm_surface_queue_cancel_acquire(tbm_surface_queue_h
                _tbm_surface_queue_enqueue(surface_queue, node, 1);
 
        if (_queue_is_empty(&surface_queue->dirty_queue)) {
-               TBM_LOG_E("enqueue surface but queue is empty node:%p\n", node);
+               TBM_ERR("enqueue surface but queue is empty node:%p\n", node);
                pthread_mutex_unlock(&surface_queue->lock);
 
                _tbm_surf_queue_mutex_unlock();
@@ -1509,7 +1493,7 @@ tbm_surface_queue_acquire(tbm_surface_queue_h
                node = _tbm_surface_queue_acquire(surface_queue);
 
        if (node == NULL || node->surface == NULL) {
-               TBM_LOG_E("_queue_node_pop_front failed\n");
+               TBM_ERR("_queue_node_pop_front failed\n");
                pthread_mutex_unlock(&surface_queue->lock);
 
                _tbm_surf_queue_mutex_unlock();
@@ -1524,16 +1508,16 @@ tbm_surface_queue_acquire(tbm_surface_queue_h
                tbm_surface_info_s info;
                int ret;
 
-               TBM_LOG_E("start map surface:%p", *surface);
+               TBM_ERR("start map surface:%p", *surface);
                ret = tbm_surface_map(*surface, TBM_SURF_OPTION_READ, &info);
-               TBM_LOG_E("end map surface:%p", *surface);
+               TBM_ERR("end map surface:%p", *surface);
                if (ret == TBM_SURFACE_ERROR_NONE)
                        tbm_surface_unmap(*surface);
        }
 
        if (surface_queue->acquire_sync_count > 0) surface_queue->acquire_sync_count--;
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, *surface);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) tbm_surface(%p)\n", surface_queue, *surface);
 
        pthread_mutex_unlock(&surface_queue->lock);
 
@@ -1556,7 +1540,7 @@ tbm_surface_queue_can_acquire(tbm_surface_queue_h surface_queue, int wait)
 
        pthread_mutex_lock(&surface_queue->lock);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if (!_queue_is_empty(&surface_queue->dirty_queue)) {
                pthread_mutex_unlock(&surface_queue->lock);
@@ -1586,7 +1570,7 @@ tbm_surface_queue_destroy(tbm_surface_queue_h surface_queue)
 
        TBM_SURF_QUEUE_RETURN_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue));
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        LIST_DEL(&surface_queue->item_link);
 
@@ -1627,7 +1611,7 @@ tbm_surface_queue_reset(tbm_surface_queue_h
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if (width == surface_queue->width && height == surface_queue->height &&
                format == surface_queue->format) {
@@ -1717,7 +1701,7 @@ tbm_surface_queue_set_size(tbm_surface_queue_h
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(queue_size > 0,
                                        TBM_SURFACE_QUEUE_ERROR_INVALID_PARAMETER);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if ((surface_queue->queue_size == queue_size) && !flush) {
                _tbm_surf_queue_mutex_unlock();
@@ -1764,7 +1748,7 @@ tbm_surface_queue_set_size(tbm_surface_queue_h
                        int need_del = surface_queue->queue_size - queue_size;
 
                        LIST_FOR_EACH_ENTRY_SAFE(node, tmp, &surface_queue->free_queue.head, item_link) {
-                               TBM_QUEUE_TRACE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
+                               TBM_TRACE_SURFACE_QUEUE("deatch tbm_surface_queue(%p) surface(%p)\n", surface_queue, node->surface);
 
                                if (surface_queue->impl && surface_queue->impl->need_detach)
                                        surface_queue->impl->need_detach(surface_queue, node);
@@ -1797,7 +1781,7 @@ tbm_surface_queue_free_flush(tbm_surface_queue_h surface_queue)
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if (surface_queue->num_attached == 0) {
                _tbm_surf_queue_mutex_unlock();
@@ -1833,7 +1817,7 @@ tbm_surface_queue_flush(tbm_surface_queue_h surface_queue)
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(_tbm_surface_queue_is_valid(surface_queue),
                               TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        if (surface_queue->num_attached == 0) {
                _tbm_surf_queue_mutex_unlock();
@@ -2018,12 +2002,12 @@ tbm_surface_queue_create(int queue_size, int width,
                                            sizeof(struct _tbm_surface_queue));
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(surface_queue != NULL, NULL);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        tbm_queue_default *data = (tbm_queue_default *) calloc(1,
                                  sizeof(tbm_queue_default));
        if (data == NULL) {
-               TBM_LOG_E("cannot allocate the tbm_queue_default.\n");
+               TBM_ERR("cannot allocate the tbm_queue_default.\n");
                free(surface_queue);
                _tbm_surf_queue_mutex_unlock();
                return NULL;
@@ -2178,12 +2162,12 @@ tbm_surface_queue_sequence_create(int queue_size, int width,
                                            sizeof(struct _tbm_surface_queue));
        TBM_SURF_QUEUE_RETURN_VAL_IF_FAIL(surface_queue != NULL, NULL);
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p)\n", surface_queue);
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p)\n", surface_queue);
 
        tbm_queue_sequence *data = (tbm_queue_sequence *) calloc(1,
                                   sizeof(tbm_queue_sequence));
        if (data == NULL) {
-               TBM_LOG_E("cannot allocate the tbm_queue_sequence.\n");
+               TBM_ERR("cannot allocate the tbm_queue_sequence.\n");
                free(surface_queue);
                _tbm_surf_queue_mutex_unlock();
                return NULL;
@@ -2244,7 +2228,7 @@ tbm_surface_queue_set_sync_count(tbm_surface_queue_h surface_queue,
        else
                surface_queue->enqueue_sync_count = dequeue_num + sync_count;
 
-       TBM_QUEUE_TRACE("tbm_surface_queue(%p) enqueue_sync_count:(%d) acquire_sync_count:(%d)\n",
+       TBM_TRACE_SURFACE_QUEUE("tbm_surface_queue(%p) enqueue_sync_count:(%d) acquire_sync_count:(%d)\n",
                                surface_queue, surface_queue->enqueue_sync_count, surface_queue->acquire_sync_count);
 
        pthread_mutex_unlock(&surface_queue->lock);