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 6bb9198..1987327 100644 (file)
--- a/src/tbm_bo.c
+++ b/src/tbm_bo.c
@@ -141,7 +141,7 @@ _bo_lock(tbm_bo bo, int device, int opt)
        tbm_error_e error;
        int ret;
 
-       error = tbm_module_bo_lock(bo->bufmgr->module, bo, bo->bo_data, device, opt);
+       error = tbm_bo_data_lock(bo->bo_data, device, opt);
        _tbm_set_last_result(error);
        switch(error) {
                case TBM_ERROR_NONE:
@@ -165,7 +165,7 @@ _bo_unlock(tbm_bo bo)
 {
        tbm_error_e error;
 
-       error = tbm_module_bo_unlock(bo->bufmgr->module, bo, bo->bo_data);
+       error = tbm_bo_data_unlock(bo->bo_data);
        _tbm_set_last_result(error);
        switch(error) {
                case TBM_ERROR_NONE:
@@ -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;
 }
 
@@ -386,7 +372,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt)
                return (tbm_bo_handle) NULL;
        }
 
-       bo_handle = tbm_module_bo_map(bo->bufmgr->module, bo, bo->bo_data, device, opt, &error);
+       bo_handle = tbm_bo_data_map(bo->bo_data, device, opt, &error);
        if (bo_handle.ptr == NULL) {
                /* LCOV_EXCL_START */
                TBM_ERR("error: fail to map bo:%p error:%d\n", bo, error);
@@ -418,7 +404,7 @@ tbm_bo_unmap(tbm_bo bo)
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
        TBM_BO_RETURN_VAL_IF_FAIL(bo->map_cnt > 0, 0);
 
-       error = tbm_module_bo_unmap(bo->bufmgr->module, bo, bo->bo_data);
+       error = tbm_bo_data_unmap(bo->bo_data);
        if (error != TBM_ERROR_NONE) {
                /* LCOV_EXCL_START */
                TBM_ERR("error: bo(%p) map_cnt(%d) error(%d)\n", bo, bo->map_cnt, error);
@@ -451,7 +437,7 @@ tbm_bo_get_handle(tbm_bo bo, int device)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL);
 
-       bo_handle = tbm_module_bo_get_handle(bo->bufmgr->module, bo, bo->bo_data, device, &error);
+       bo_handle = tbm_bo_data_get_handle(bo->bo_data, device, &error);
        if (bo_handle.ptr == NULL) {
                /* LCOV_EXCL_START */
                TBM_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, bo_handle.ptr, error);
@@ -479,7 +465,7 @@ tbm_bo_export(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
-       ret = tbm_module_bo_export_key(bo->bufmgr->module, bo, bo->bo_data, &error);
+       ret = tbm_bo_data_export_key(bo->bo_data, &error);
        if (!ret) {
                /* LCOV_EXCL_START */
                TBM_ERR("tbm_moule_bo_export_key failed. bo:%p tbm_key:%d error:%d", bo, ret, error);
@@ -507,10 +493,10 @@ tbm_bo_export_fd(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1);
 
-       fd = tbm_module_bo_export_fd(bo->bufmgr->module, bo, bo->bo_data, &error);
+       fd = tbm_bo_data_export_fd(bo->bo_data, &error);
        if (fd < 0) {
                /* LCOV_EXCL_START */
-               TBM_ERR("tbm_module_bo_export_fd filed. bo:%p tbm_fd:%d error:%d", bo, fd, error);
+               TBM_ERR("tbm_bo_data_export_fd filed. bo:%p tbm_fd:%d error:%d", bo, fd, error);
                _tbm_set_last_result(error);
                _tbm_bufmgr_mutex_unlock();
                return fd;
@@ -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;
 }
 
@@ -595,7 +553,7 @@ tbm_bo_size(tbm_bo bo)
 
        TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
-       size = tbm_module_bo_get_size(bo->bufmgr->module, bo, bo->bo_data, &error);
+       size = tbm_bo_data_get_size(bo->bo_data, &error);
        _tbm_set_last_result(error);
 
        TBM_TRACE_BO("bo(%p) size(%d)\n", bo, size);
@@ -647,9 +605,9 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
 
        TBM_TRACE_BO("before: bo1(%p) bo2(%p)\n", bo1, bo2);
 
-       size1 = tbm_module_bo_get_size(bo1->bufmgr->module, bo1, bo1->bo_data, &error1);
+       size1 = tbm_bo_data_get_size(bo1->bo_data, &error1);
        _tbm_set_last_result(error1);
-       size2 = tbm_module_bo_get_size(bo2->bufmgr->module, bo2, bo2->bo_data, &error2);
+       size2 = tbm_bo_data_get_size(bo2->bo_data, &error2);
        _tbm_set_last_result(error2);
 
        if (size1 != size2) {
@@ -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) {
@@ -871,7 +830,7 @@ _tbm_bo_free(tbm_bo bo)
                bo->lock_cnt--;
        }
 
-       tbm_module_bo_free(bo->bufmgr->module, bo, bo->bo_data, bo->get_from_hal_surface);
+       tbm_bo_data_free(bo->bo_data, bo->get_from_surface_data);
 
        _tbm_bo_deinit(bo);