From 34e51325ce713da73211d72fd348d4f86029ee27 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 13 Jul 2017 22:12:02 +0900 Subject: [PATCH] tbm_surface_queue: fixed and subdivided error value Change-Id: Ia81f97645628adaf651e17437e013b8d3fce5872 --- src/tbm_surface_queue.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/tbm_surface_queue.c b/src/tbm_surface_queue.c index b4dfaec..3a04541 100644 --- a/src/tbm_surface_queue.c +++ b/src/tbm_surface_queue.c @@ -1095,7 +1095,11 @@ tbm_surface_queue_enqueue(tbm_surface_queue_h pthread_mutex_unlock(&surface_queue->lock); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST; + + if (!node) + return TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE; + else + return TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST; } if (surface_queue->impl && surface_queue->impl->enqueue) @@ -1108,7 +1112,7 @@ tbm_surface_queue_enqueue(tbm_surface_queue_h pthread_mutex_unlock(&surface_queue->lock); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE; + return TBM_SURFACE_QUEUE_ERROR_EMPTY; } node->type = QUEUE_NODE_TYPE_ENQUEUE; @@ -1152,7 +1156,7 @@ tbm_surface_queue_dequeue(tbm_surface_queue_h pthread_mutex_unlock(&surface_queue->lock); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE; + return TBM_SURFACE_QUEUE_ERROR_EMPTY; } node->type = QUEUE_NODE_TYPE_DEQUEUE; @@ -1256,7 +1260,11 @@ tbm_surface_queue_release(tbm_surface_queue_h pthread_mutex_unlock(&surface_queue->lock); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE; + + if (!node) + return TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE; + else + return TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST; } if (surface_queue->queue_size < surface_queue->num_attached) { @@ -1283,7 +1291,7 @@ tbm_surface_queue_release(tbm_surface_queue_h TBM_LOG_E("surface_queue->free_queue is empty.\n"); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE; + return TBM_SURFACE_QUEUE_ERROR_EMPTY; } node->type = QUEUE_NODE_TYPE_RELEASE; @@ -1327,7 +1335,7 @@ tbm_surface_queue_acquire(tbm_surface_queue_h pthread_mutex_unlock(&surface_queue->lock); _tbm_surf_queue_mutex_unlock(); - return TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE; + return TBM_SURFACE_QUEUE_ERROR_EMPTY; } node->type = QUEUE_NODE_TYPE_ACQUIRE; -- 2.7.4