From 7d522cc28f64715dc9a2f19eb84cad8f45f8cba6 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Fri, 7 Dec 2018 16:03:06 +0900 Subject: [PATCH] tbm_bo: use mutex lock of bufmgr instead bo it is possible that tbm_bufmgr is deinit when tbm_bo use bufmgr. so use same mutex lock tbm_bo and tbm_bufmgr. Change-Id: I4f59123d3ba67897e3be6f1bc0bf3d28145c84d4 --- src/tbm_bo.c | 215 +++++++++++++++++++++------------------------------ src/tbm_bufmgr.c | 6 +- src/tbm_bufmgr_int.h | 3 + 3 files changed, 94 insertions(+), 130 deletions(-) diff --git a/src/tbm_bo.c b/src/tbm_bo.c index f2870c9..7e190b1 100644 --- a/src/tbm_bo.c +++ b/src/tbm_bo.c @@ -34,15 +34,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "tbm_bufmgr_int.h" #include "list.h" -static pthread_mutex_t tbm_bo_lock = PTHREAD_MUTEX_INITIALIZER; -static void _tbm_bo_mutex_unlock(void); - /* check condition */ #define TBM_BO_RETURN_IF_FAIL(cond) {\ if (!(cond)) {\ TBM_ERR("'%s' failed.\n", #cond);\ _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);\ - _tbm_bo_mutex_unlock();\ + _tbm_bufmgr_mutex_unlock();\ return;\ } \ } @@ -51,47 +48,11 @@ static void _tbm_bo_mutex_unlock(void); if (!(cond)) {\ TBM_ERR("'%s' failed.\n", #cond);\ _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);\ - _tbm_bo_mutex_unlock();\ + _tbm_bufmgr_mutex_unlock();\ return val;\ } \ } -/* LCOV_EXCL_START */ -static bool -_tbm_bo_mutex_init(void) -{ - static bool tbm_bo_mutex_init = false; - - if (tbm_bo_mutex_init) - return true; - - if (pthread_mutex_init(&tbm_bo_lock, NULL)) { - TBM_ERR("fail: Cannot pthread_mutex_init for tbm_bo_lock.\n"); - return false; - } - - tbm_bo_mutex_init = true; - - return true; -} - -static void -_tbm_bo_mutex_lock(void) -{ - if (!_tbm_bo_mutex_init()) { - TBM_ERR("fail: _tbm_bo_mutex_init()\n"); - return; - } - - pthread_mutex_lock(&tbm_bo_lock); -} - -static void -_tbm_bo_mutex_unlock(void) -{ - pthread_mutex_unlock(&tbm_bo_lock); -} - static char * _tbm_flag_to_str(int f) { @@ -254,18 +215,18 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt) switch (bo->bufmgr->bo_lock_type) { case TBM_BUFMGR_BO_LOCK_TYPE_ONCE: if (bo->lock_cnt == 0) { - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); ret = _bo_lock(bo, device, opt); - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); if (ret) bo->lock_cnt++; } else ret = 1; break; case TBM_BUFMGR_BO_LOCK_TYPE_ALWAYS: - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); ret = _bo_lock(bo, device, opt); - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); if (ret) bo->lock_cnt++; break; @@ -358,7 +319,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) tbm_backend_bo_data *bo_data; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); @@ -370,7 +331,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) TBM_ERR("error: fail to create of tbm_bo size(%d) flag(%s)\n", size, _tbm_flag_to_str(flags)); _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -387,7 +348,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) size, _tbm_flag_to_str(flags)); _tbm_set_last_result(error); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -400,7 +361,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) size, _tbm_flag_to_str(flags)); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -418,7 +379,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -426,7 +387,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags) tbm_bo tbm_bo_ref(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), NULL); @@ -435,7 +396,7 @@ tbm_bo_ref(tbm_bo bo) TBM_TRACE_BO("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -443,7 +404,7 @@ tbm_bo_ref(tbm_bo bo) void tbm_bo_unref(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_IF_FAIL(_tbm_bo_is_valid(bo)); @@ -451,7 +412,7 @@ tbm_bo_unref(tbm_bo bo) TBM_TRACE_BO("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt - 1); if (bo->ref_cnt <= 0) { - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return; } @@ -459,7 +420,7 @@ tbm_bo_unref(tbm_bo bo) if (bo->ref_cnt == 0) _tbm_bo_free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); } tbm_bo_handle @@ -468,14 +429,14 @@ tbm_bo_map(tbm_bo bo, int device, int opt) tbm_bo_handle bo_handle; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL); if (!_tbm_bo_lock(bo, device, opt)) { TBM_ERR("error: fail to lock bo:%p)\n", bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; } @@ -486,7 +447,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt) _tbm_set_last_result(error); TBM_ERR("error: fail to map bo:%p error:%d\n", bo, error); _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; /* LCOV_EXCL_STOP */ } @@ -497,7 +458,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt) _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); TBM_ERR("error: fail to map bo:%p\n", bo); _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; /* LCOV_EXCL_STOP */ } @@ -508,7 +469,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt) TBM_TRACE_BO("bo(%p) map_cnt(%d)\n", bo, bo->map_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo_handle; } @@ -519,7 +480,7 @@ tbm_bo_unmap(tbm_bo bo) int ret = 1; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -532,7 +493,7 @@ tbm_bo_unmap(tbm_bo bo) TBM_ERR("error: bo(%p) map_cnt(%d) error(%d)\n", bo, bo->map_cnt, error); _tbm_set_last_result(error); ret = 0; - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } @@ -542,7 +503,7 @@ tbm_bo_unmap(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) map_cnt(%d)\n", bo, bo->map_cnt); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } @@ -555,7 +516,7 @@ tbm_bo_unmap(tbm_bo bo) _tbm_bo_unlock(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -566,7 +527,7 @@ tbm_bo_get_handle(tbm_bo bo, int device) tbm_bo_handle bo_handle; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL); @@ -577,7 +538,7 @@ tbm_bo_get_handle(tbm_bo bo, int device) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) bo_handle(%p) error(%d)\n", bo, bo_handle.ptr, error); _tbm_set_last_result(error); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; /* LCOV_EXCL_STOP */ } @@ -587,7 +548,7 @@ tbm_bo_get_handle(tbm_bo bo, int device) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return (tbm_bo_handle) NULL; /* LCOV_EXCL_STOP */ } @@ -595,7 +556,7 @@ tbm_bo_get_handle(tbm_bo bo, int device) TBM_TRACE_BO("bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo_handle; } @@ -606,7 +567,7 @@ tbm_bo_export(tbm_bo bo) tbm_key ret; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -614,7 +575,7 @@ tbm_bo_export(tbm_bo bo) if (bo->bufmgr->backend_module_data) { if (!bo->bufmgr->bo_func->bo_export_key) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return 0; /* LCOV_EXCL_STOP */ @@ -625,14 +586,14 @@ tbm_bo_export(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_key(%d) error(%d)\n", bo, ret, error); _tbm_set_last_result(error); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } } else { if (!bo->bufmgr->backend->bo_export) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return 0; /* LCOV_EXCL_STOP */ @@ -643,7 +604,7 @@ tbm_bo_export(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_key(%d)\n", bo, ret); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } @@ -651,7 +612,7 @@ tbm_bo_export(tbm_bo bo) TBM_TRACE_BO("bo(%p) tbm_key(%u)\n", bo, ret); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -662,7 +623,7 @@ tbm_bo_export_fd(tbm_bo bo) tbm_fd ret; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1); @@ -670,7 +631,7 @@ tbm_bo_export_fd(tbm_bo bo) if (bo->bufmgr->backend_module_data) { if (!bo->bufmgr->bo_func->bo_export_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return -1; /* LCOV_EXCL_STOP */ @@ -681,14 +642,14 @@ tbm_bo_export_fd(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_fd(%d) error(%d)\n", bo, ret, error); _tbm_set_last_result(error); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } } else { if (!bo->bufmgr->backend->bo_export_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return -1; /* LCOV_EXCL_STOP */ @@ -699,7 +660,7 @@ tbm_bo_export_fd(tbm_bo bo) /* LCOV_EXCL_START */ TBM_ERR("error: bo(%p) tbm_fd(%d)\n", bo, ret); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; /* LCOV_EXCL_STOP */ } @@ -707,7 +668,7 @@ tbm_bo_export_fd(tbm_bo bo) TBM_TRACE_BO("bo(%p) tbm_fd(%d)\n", bo, ret); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return ret; } @@ -721,7 +682,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) tbm_error_e error; tbm_backend_bo_data *bo_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); @@ -729,7 +690,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) if (bufmgr->backend_module_data) { if (!bufmgr->bufmgr_func->bufmgr_import_key) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return NULL; /* LCOV_EXCL_STOP */ @@ -737,7 +698,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) } else { if (!bufmgr->backend->bo_import) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return NULL; /* LCOV_EXCL_STOP */ @@ -751,7 +712,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) /* LCOV_EXCL_START */ TBM_ERR("error: fail to import of tbm_bo by key(%d)\n", key); _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -765,7 +726,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) TBM_ERR("error: fail to import of tbm_bo by key(%d). error(%d)\n", key, error); _tbm_set_last_result(error); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -778,7 +739,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo2; } } @@ -791,7 +752,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) TBM_ERR("error: fail to import of tbm_bo by key(%d)\n", key); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -804,7 +765,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo2; } } @@ -836,7 +797,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key) LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -850,7 +811,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) tbm_backend_bo_data *bo_data; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL); @@ -858,7 +819,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) if (bufmgr->backend_module_data) { if (!bufmgr->bufmgr_func->bufmgr_import_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return NULL; /* LCOV_EXCL_STOP */ @@ -866,7 +827,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) } else { if (!bufmgr->backend->bo_import_fd) { /* LCOV_EXCL_START */ - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); _tbm_set_last_result(TBM_ERROR_NOT_SUPPORTED); return NULL; /* LCOV_EXCL_STOP */ @@ -880,7 +841,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) /* LCOV_EXCL_START */ TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d)\n", fd); _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -894,7 +855,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d). error(%d)\n", fd, error); _tbm_set_last_result(error); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -907,7 +868,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo2; } } @@ -920,7 +881,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) TBM_ERR("error: fail to import tbm_bo by tbm_fd(%d)\n", fd); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return NULL; /* LCOV_EXCL_STOP */ } @@ -933,7 +894,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) _tbm_flag_to_str(bo2->flags)); bo2->ref_cnt++; free(bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo2; } } @@ -965,7 +926,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd) LIST_ADD(&bo->item_link, &bo->bufmgr->bo_list); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return bo; } @@ -976,7 +937,7 @@ tbm_bo_size(tbm_bo bo) int size; tbm_error_e error; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -992,7 +953,7 @@ tbm_bo_size(tbm_bo bo) TBM_TRACE_BO("bo(%p) size(%d)\n", bo, size); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return size; } @@ -1000,7 +961,7 @@ tbm_bo_size(tbm_bo bo) int tbm_bo_locked(tbm_bo bo) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1008,18 +969,18 @@ tbm_bo_locked(tbm_bo bo) if (bo->bufmgr->bo_lock_type == TBM_BUFMGR_BO_LOCK_TYPE_NEVER) { TBM_ERR("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } if (bo->lock_cnt > 0) { TBM_TRACE_BO("error: bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } TBM_TRACE_BO("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1031,7 +992,7 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) int size1 = -1, size2 = -2; void *temp; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo1), 0); @@ -1069,13 +1030,13 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2) bo1->priv = bo2->priv; bo2->priv = temp; - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; fail: TBM_ERR("error: bo1(%p) bo2(%p)\n", bo1, bo2); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1086,7 +1047,7 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, { tbm_user_data *data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1096,7 +1057,7 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, if (data) { TBM_TRACE_BO("warning: user data already exist key(%ld)\n", key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1104,7 +1065,7 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, if (!data) { TBM_ERR("error: bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1112,7 +1073,7 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key, LIST_ADD(&data->item_link, &bo->user_data_list); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1122,7 +1083,7 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1130,7 +1091,7 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) if (LIST_IS_EMPTY(&bo->user_data_list)) { TBM_TRACE_BO("bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1138,7 +1099,7 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) if (!old_data) { TBM_TRACE_BO("bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1146,7 +1107,7 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) user_data_delete(old_data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1156,7 +1117,7 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1164,7 +1125,7 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) if (LIST_IS_EMPTY(&bo->user_data_list)) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1172,7 +1133,7 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) if (!old_data) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1182,7 +1143,7 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data) TBM_TRACE_BO("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1192,7 +1153,7 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) { tbm_user_data *old_data; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); _tbm_set_last_result(TBM_ERROR_NONE); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1200,7 +1161,7 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) if (!data || LIST_IS_EMPTY(&bo->user_data_list)) { TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1209,7 +1170,7 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) *data = NULL; TBM_TRACE_BO("error: bo(%p) key(%lu)\n", bo, key); _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 0; } @@ -1217,7 +1178,7 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data) TBM_TRACE_BO("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } @@ -1227,7 +1188,7 @@ tbm_bo_get_flags(tbm_bo bo) { int flags; - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); @@ -1235,7 +1196,7 @@ tbm_bo_get_flags(tbm_bo bo) TBM_TRACE_BO("bo(%p)\n", bo); - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return flags; } @@ -1245,13 +1206,13 @@ tbm_bo_get_flags(tbm_bo bo) int _tbm_bo_set_surface(tbm_bo bo, tbm_surface_h surface) { - _tbm_bo_mutex_lock(); + _tbm_bufmgr_mutex_lock(); TBM_BO_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0); bo->surface = surface; - _tbm_bo_mutex_unlock(); + _tbm_bufmgr_mutex_unlock(); return 1; } diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index 0a15b7b..c92e0ea 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -50,7 +50,7 @@ int b_dump_queue; static pthread_mutex_t gLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t tbm_bufmgr_lock = PTHREAD_MUTEX_INITIALIZER; static double scale_factor = 0; -static void _tbm_bufmgr_mutex_unlock(void); +void _tbm_bufmgr_mutex_unlock(void); //#define TBM_BUFMGR_INIT_TIME @@ -110,7 +110,7 @@ _tbm_bufmgr_mutex_init(void) return true; } -static void +void _tbm_bufmgr_mutex_lock(void) { if (!_tbm_bufmgr_mutex_init()) { @@ -121,7 +121,7 @@ _tbm_bufmgr_mutex_lock(void) pthread_mutex_lock(&tbm_bufmgr_lock); } -static void +void _tbm_bufmgr_mutex_unlock(void) { pthread_mutex_unlock(&tbm_bufmgr_lock); diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index f4cc290..d892426 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -287,4 +287,7 @@ tbm_bufmgr tbm_bufmgr_get(void); void _tbm_set_last_result(tbm_error_e err); +void _tbm_bufmgr_mutex_lock(void); +void _tbm_bufmgr_mutex_unlock(void); + #endif /* _TBM_BUFMGR_INT_H_ */ -- 2.7.4