tbm_bufmgr: lock/unlock tbm_bufmgr_mutex at tbm_bufmgr function

[platform/core/uifw/libtbm.git] / src / tbm_bo.c

diff --git a/src/tbm_bo.c b/src/tbm_bo.c
index 034f5cc..1987327 100644 (file)
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -304,29 +304,15 @@ tbm_bo
 tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 {
        tbm_bo bo;
-       tbm_error_e error;
-
-       _tbm_bufmgr_mutex_lock();
-       _tbm_set_last_result(TBM_ERROR_NONE);
-
-       TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-       TBM_BO_RETURN_VAL_IF_FAIL(size > 0, NULL);
 
-       bo = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags, &error);
+       bo = tbm_bufmgr_internal_alloc_bo(bufmgr, size, flags);
        if (!bo) {
                /* LCOV_EXCL_START */
-               TBM_ERR("tbm_bufmgr_internal_alloc_bo failed. error:%d", error);
-               _tbm_set_last_result(error);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_alloc_bo failed.");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       TBM_TRACE_BO("bo(%p) size(%d) refcnt(%d), flag(%s)\n", bo, size, bo->ref_cnt,
-                       _tbm_flag_to_str(bo->flags));
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
 }
 
@@ -528,28 +514,15 @@ tbm_bo
 tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
 {
        tbm_bo bo;
-       tbm_error_e error;
-
-       _tbm_bufmgr_mutex_lock();
-       _tbm_set_last_result(TBM_ERROR_NONE);
-
-       TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
 
-       bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key, &error);
+       bo = tbm_bufmgr_internal_import_bo_with_key(bufmgr, key);
        if (!bo) {
                /* LCOV_EXCL_START */
-               TBM_ERR("tbm_bufmgr_internal_import_key failed. error:%d", error);
-               _tbm_set_last_result(error);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_import_bo_with_key failed");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       TBM_TRACE_BO("import new bo(%p) ref(%d) key(%d) flag(%s) in list\n",
-                         bo, bo->ref_cnt, key, _tbm_flag_to_str(bo->flags));
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
 }
 
@@ -557,30 +530,15 @@ tbm_bo
 tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
 {
        tbm_bo bo;
-       tbm_error_e error;
 
-       _tbm_bufmgr_mutex_lock();
-       _tbm_set_last_result(TBM_ERROR_NONE);
-
-       TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-
-       bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd, &error);
+       bo = tbm_bufmgr_internal_import_bo_with_fd(bufmgr, fd);
        if (!bo) {
                /* LCOV_EXCL_START */
-               TBM_ERR("tbm_bufmgr_internal_import_fd failed. error:%d", error);
-               _tbm_set_last_result(error);
-               _tbm_bufmgr_mutex_unlock();
+               TBM_ERR("tbm_bufmgr_internal_import_fd failed.");
                return NULL;
                /* LCOV_EXCL_STOP */
        }
 
-       LIST_INITHEAD(&bo->user_data_list); // TODO: remove this. build-break when it is removed.
-
-       TBM_TRACE_BO("import bo(%p) ref(%d) fd(%d) flag(%s)\n",
-                       bo, bo->ref_cnt, fd, _tbm_flag_to_str(bo->flags));
-
-       _tbm_bufmgr_mutex_unlock();
-
        return bo;
 }
 
@@ -658,11 +616,11 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
                goto fail;
        }
 
-       TBM_TRACE_BO("after: bo1(%p) bo2(%p)\n", bo1, bo2);
+       temp = bo1->bo_data;
+       bo1->bo_data = bo2->bo_data;
+       bo2->bo_data = temp;
 
-       temp = bo1->priv;
-       bo1->priv = bo2->priv;
-       bo2->priv = temp;
+       TBM_TRACE_BO("after: bo1(%p) bo2(%p)\n", bo1, bo2);
 
        _tbm_bufmgr_mutex_unlock();
 
@@ -858,11 +816,12 @@ _tbm_bo_free(tbm_bo bo)
        if (!LIST_IS_EMPTY(&bo->user_data_list)) {
                tbm_user_data *old_data = NULL, *tmp;
 
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp,
-                               &bo->user_data_list, item_link) {
+               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &bo->user_data_list, item_link) {
                        TBM_DBG("free user_data\n");
                        user_data_delete(old_data);
                }
+
+               LIST_INITHEAD(&bo->user_data_list); // TODO: remove this. build-break when it is removed.
        }
 
        while (bo->lock_cnt > 0) {