fixed deadlock issues
[platform/core/uifw/libtbm.git] / src / tbm_bufmgr.c
index bc4bb2a..44f57f2 100644 (file)
@@ -48,6 +48,17 @@ int bTrace;
 int bDlog;
 #endif
 
+tbm_bufmgr gBufMgr;
+int b_dump_queue;
+
+static pthread_mutex_t gLock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t tbm_bufmgr_lock = PTHREAD_MUTEX_INITIALIZER;
+static __thread tbm_error_e tbm_last_error = TBM_ERROR_NONE;
+
+static void _tbm_bufmgr_mutex_unlock(void);
+
+//#define TBM_BUFMGR_INIT_TIME
+
 #define PREFIX_LIB    "libtbm_"
 #define SUFFIX_LIB    ".so"
 #define DEFAULT_LIB   PREFIX_LIB"default"SUFFIX_LIB
@@ -64,23 +75,68 @@ int bDlog;
 #define GET_MODULE_MINOR_VERSION(vers)    (((vers) >> 16) & 0xFF)
 #define GET_MODULE_PATCHLEVEL(vers)    ((vers) & 0xFFFF)
 
+/* check condition */
+#define TBM_BUFMGR_RETURN_IF_FAIL(cond) {\
+       if (!(cond)) {\
+               TBM_LOG_E("'%s' failed.\n", #cond);\
+               _tbm_bufmgr_mutex_unlock();\
+               return;\
+       } \
+}
+
+#define TBM_BUFMGR_RETURN_VAL_IF_FAIL(cond, val) {\
+       if (!(cond)) {\
+               TBM_LOG_E("'%s' failed.\n", #cond);\
+               _tbm_bufmgr_mutex_unlock();\
+               return val;\
+       } \
+}
+
 enum {
        LOCK_TRY_ONCE,
        LOCK_TRY_ALWAYS,
        LOCK_TRY_NEVER
 };
 
-pthread_mutex_t gLock = PTHREAD_MUTEX_INITIALIZER;
-tbm_bufmgr gBufMgr;
-
-static __thread tbm_error_e tbm_last_error = TBM_ERROR_NONE;
-
 static void
 _tbm_set_last_result(tbm_error_e err)
 {
        tbm_last_error = err;
 }
 
+static bool
+_tbm_bufmgr_mutex_init(void)
+{
+       static bool tbm_bufmgr_mutex_init = false;
+
+       if (tbm_bufmgr_mutex_init)
+               return true;
+
+       if (pthread_mutex_init(&tbm_bufmgr_lock, NULL)) {
+               TBM_LOG_E("fail: tbm_bufmgr mutex init\n");
+               return false;
+       }
+
+       tbm_bufmgr_mutex_init = true;
+
+       return true;
+}
+
+static void
+_tbm_bufmgr_mutex_lock(void)
+{
+       if (!_tbm_bufmgr_mutex_init())
+               return;
+
+       pthread_mutex_lock(&tbm_bufmgr_lock);
+}
+
+static void
+_tbm_bufmgr_mutex_unlock(void)
+{
+       pthread_mutex_unlock(&tbm_bufmgr_lock);
+}
+
 char * tbm_flag_to_str(int f)
 {
        static char str[255];
@@ -112,6 +168,32 @@ _tbm_util_check_bo_cnt(tbm_bufmgr bufmgr)
        }
 }
 
+static int
+_tbm_util_get_max_surface_size(int * w, int * h)
+{
+       int count = 0;
+       tbm_surface_h surface = NULL, tmp = NULL;
+       tbm_surface_info_s info;
+
+       *w = 0;
+       *h = 0;
+
+       if (gBufMgr == NULL)
+               return count;
+
+       if (!LIST_IS_EMPTY(&gBufMgr->surf_list)) {
+               LIST_FOR_EACH_ENTRY_SAFE(surface, tmp, &gBufMgr->surf_list, item_link) {
+                       if (tbm_surface_get_info(surface, &info) == TBM_SURFACE_ERROR_NONE) {
+                               count++;
+                               if (*w < info.width) *w = info.width;
+                               if (*h < info.height) *h = info.height;
+                       }
+               }
+       }
+
+       return count;
+}
+
 static void
 _tbm_util_get_appname_brief(char *brief)
 {
@@ -257,17 +339,17 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt)
        old = bo->lock_cnt;
        if (bufmgr->lock_type == LOCK_TRY_ONCE) {
                if (bo->lock_cnt == 0) {
-                       pthread_mutex_unlock(&bufmgr->lock);
+                       _tbm_bufmgr_mutex_unlock();
                        ret = _bo_lock(bo, device, opt);
-                       pthread_mutex_lock(&bufmgr->lock);
+                       _tbm_bufmgr_mutex_lock();
                        if (ret)
                                bo->lock_cnt++;
                } else
                        ret = 1;
        } else if (bufmgr->lock_type == LOCK_TRY_ALWAYS) {
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                ret = _bo_lock(bo, device, opt);
-               pthread_mutex_lock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_lock();
                if (ret)
                        bo->lock_cnt++;
        } else {
@@ -275,7 +357,7 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt)
                        bo);
        }
 
-       DBG_LOCK(">> LOCK bo:%p(%d->%d)\n",
+       TBM_DBG_LOCK(">> LOCK bo:%p(%d->%d)\n",
                 bo, old, bo->lock_cnt);
 
        return ret;
@@ -317,7 +399,7 @@ _tbm_bo_unlock(tbm_bo bo)
        if (bo->lock_cnt < 0)
                bo->lock_cnt = 0;
 
-       DBG_LOCK(">> UNLOCK bo:%p(%d->%d)\n",
+       TBM_DBG_LOCK(">> UNLOCK bo:%p(%d->%d)\n",
                 bo, old, bo->lock_cnt);
 }
 
@@ -329,6 +411,11 @@ _tbm_bo_is_valid(tbm_bo bo)
        if (bo == NULL)
                return 0;
 
+       if (gBufMgr == NULL) {
+               TBM_LOG_E("error tbm_bufmgr was deinited\n");
+               return 0;
+       }
+
        if (!LIST_IS_EMPTY(&gBufMgr->bo_list)) {
                LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &gBufMgr->bo_list, item_link) {
                        if (old_data == bo)
@@ -339,50 +426,6 @@ _tbm_bo_is_valid(tbm_bo bo)
        return 0;
 }
 
-static void
-_tbm_bo_ref(tbm_bo bo)
-{
-       bo->ref_cnt++;
-}
-
-static void
-_tbm_bo_unref(tbm_bo bo)
-{
-       tbm_bufmgr bufmgr = bo->bufmgr;
-       tbm_user_data *old_data = NULL, *tmp = NULL;
-
-       if (bo->ref_cnt <= 0)
-               return;
-
-       bo->ref_cnt--;
-       if (bo->ref_cnt == 0) {
-               /* destory the user_data_list */
-               if (!LIST_IS_EMPTY(&bo->user_data_list)) {
-                       LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &bo->user_data_list, item_link) {
-                               DBG("free user_data\n");
-                               user_data_delete(old_data);
-                       }
-               }
-
-               if (bo->lock_cnt > 0) {
-                       TBM_LOG_E("error lock_cnt:%d\n",
-                               bo->lock_cnt);
-                       _bo_unlock(bo);
-               }
-
-               /* call the bo_free */
-               bufmgr->backend->bo_free(bo);
-               bo->priv = NULL;
-
-               LIST_DEL(&bo->item_link);
-               free(bo);
-               bo = NULL;
-
-               bufmgr->bo_cnt--;
-       }
-
-}
-
 /* LCOV_EXCL_START */
 static int
 _check_version(TBMModuleVersionInfo *data)
@@ -393,14 +436,14 @@ _check_version(TBMModuleVersionInfo *data)
        abimaj = GET_ABI_MAJOR(data->abiversion);
        abimin = GET_ABI_MINOR(data->abiversion);
 
-       DBG("TBM module %s: vendor=\"%s\" ABI=%d,%d\n",
+       TBM_DBG("TBM module %s: vendor=\"%s\" ABI=%d,%d\n",
            data->modname ? data->modname : "UNKNOWN!",
            data->vendor ? data->vendor : "UNKNOWN!", abimaj, abimin);
 
        vermaj = GET_ABI_MAJOR(TBM_ABI_VERSION);
        vermin = GET_ABI_MINOR(TBM_ABI_VERSION);
 
-       DBG("TBM ABI version %d.%d\n",
+       TBM_DBG("TBM ABI version %d.%d\n",
            vermaj, vermin);
 
        if (abimaj != vermaj) {
@@ -478,7 +521,7 @@ _tbm_bufmgr_load_module(tbm_bufmgr bufmgr, int fd, const char *file)
 
        bufmgr->module_data = module_data;
 
-       DBG("Success to load module(%s)\n",
+       TBM_DBG("Success to load module(%s)\n",
            file);
 
        return 1;
@@ -523,8 +566,17 @@ tbm_bufmgr_init(int fd)
 {
        char *env;
 
+#ifdef TBM_BUFMGR_INIT_TIME
+       struct timeval start_tv, end_tv;
+#endif
+
        pthread_mutex_lock(&gLock);
 
+#ifdef TBM_BUFMGR_INIT_TIME
+       /* get the start tv */
+       gettimeofday(&start_tv, NULL);
+#endif
+
        /* LCOV_EXCL_START */
 #ifdef HAVE_DLOG
        env = getenv("TBM_DLOG");
@@ -565,7 +617,7 @@ tbm_bufmgr_init(int fd)
                return gBufMgr;
        }
 
-       DBG("bufmgr init\n");
+       TBM_DBG("bufmgr init\n");
 
        /* allocate bufmgr */
        gBufMgr = calloc(1, sizeof(struct _tbm_bufmgr));
@@ -591,27 +643,14 @@ tbm_bufmgr_init(int fd)
        }
 
        /* log for tbm backend_flag */
-       DBG("backend flag:%x:", gBufMgr->backend->flags);
-       DBG("\n");
+       TBM_DBG("backend flag:%x:", gBufMgr->backend->flags);
+       TBM_DBG("\n");
 
        gBufMgr->ref_count = 1;
 
-       DBG("create tizen bufmgr:%p ref_count:%d\n",
+       TBM_DBG("create tizen bufmgr:%p ref_count:%d\n",
            gBufMgr, gBufMgr->ref_count);
 
-       if (pthread_mutex_init(&gBufMgr->lock, NULL) != 0) {
-               /* LCOV_EXCL_START */
-               _tbm_set_last_result(TBM_BO_ERROR_THREAD_INIT_FAILED);
-               gBufMgr->backend->bufmgr_deinit(gBufMgr->backend->priv);
-               tbm_backend_free(gBufMgr->backend);
-               dlclose(gBufMgr->module_data);
-               free(gBufMgr);
-               gBufMgr = NULL;
-               pthread_mutex_unlock(&gLock);
-               return NULL;
-               /* LCOV_EXCL_STOP */
-       }
-
        /* setup the lock_type */
        env = getenv("BUFMGR_LOCK_TYPE");
        if (env && !strcmp(env, "always"))
@@ -623,7 +662,7 @@ tbm_bufmgr_init(int fd)
        else
                gBufMgr->lock_type = LOCK_TRY_ALWAYS;
 
-       DBG("BUFMGR_LOCK_TYPE=%s\n",
+       TBM_DBG("BUFMGR_LOCK_TYPE=%s\n",
            env ? env : "default:once");
 
        TBM_TRACE("create tbm_bufmgr(%p) ref_count(%d) fd(%d)\n", gBufMgr, gBufMgr->ref_count, fd);
@@ -634,7 +673,20 @@ tbm_bufmgr_init(int fd)
        /* intialize surf_list */
        LIST_INITHEAD(&gBufMgr->surf_list);
 
+       /* intialize surf_list */
+       LIST_INITHEAD(&gBufMgr->surf_queue_list);
+
+       /* intialize debug_key_list */
+       LIST_INITHEAD(&gBufMgr->debug_key_list);
+
+#ifdef TBM_BUFMGR_INIT_TIME
+       /* get the end tv */
+       gettimeofday(&end_tv, NULL);
+       TBM_LOG_I("tbm_bufmgr_init time: %ld ms", ((end_tv.tv_sec * 1000 + end_tv.tv_usec / 1000) - (start_tv.tv_sec * 1000 + start_tv.tv_usec / 1000)));
+#endif
+
        pthread_mutex_unlock(&gLock);
+
        return gBufMgr;
 }
 
@@ -689,8 +741,6 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
        tbm_backend_free(bufmgr->backend);
        bufmgr->backend = NULL;
 
-       pthread_mutex_destroy(&bufmgr->lock);
-
        TBM_TRACE("destroy tbm_bufmgr(%p)\n", bufmgr);
 
        dlclose(bufmgr->module_data);
@@ -708,18 +758,21 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
 int
 tbm_bo_size(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
-       tbm_bufmgr bufmgr = bo->bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        int size;
 
-       pthread_mutex_lock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
+       bufmgr = gBufMgr;
 
        size = bufmgr->backend->bo_size(bo);
 
        TBM_TRACE("bo(%p) size(%d)\n", bo, size);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return size;
 }
@@ -727,17 +780,16 @@ tbm_bo_size(tbm_bo bo)
 tbm_bo
 tbm_bo_ref(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), NULL);
-
-       tbm_bufmgr bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), NULL);
 
-       _tbm_bo_ref(bo);
+       bo->ref_cnt++;
 
        TBM_TRACE("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -745,31 +797,69 @@ tbm_bo_ref(tbm_bo bo)
 void
 tbm_bo_unref(tbm_bo bo)
 {
-       TBM_RETURN_IF_FAIL(_tbm_bo_is_valid(bo));
+       tbm_bufmgr bufmgr = NULL;
+       tbm_user_data *old_data = NULL, *tmp = NULL;
 
-       tbm_bufmgr bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_IF_FAIL(gBufMgr);
+       TBM_BUFMGR_RETURN_IF_FAIL(_tbm_bo_is_valid(bo));
+
+       bufmgr = gBufMgr;
 
        TBM_TRACE("bo(%p) ref_cnt(%d)\n", bo, bo->ref_cnt - 1);
 
-       _tbm_bo_unref(bo);
+       if (bo->ref_cnt <= 0) {
+               _tbm_bufmgr_mutex_unlock();
+               return;
+       }
+
+       bo->ref_cnt--;
+       if (bo->ref_cnt == 0) {
+               /* destory the user_data_list */
+               if (!LIST_IS_EMPTY(&bo->user_data_list)) {
+                       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);
+                       }
+               }
+
+               if (bo->lock_cnt > 0) {
+                       TBM_LOG_E("error lock_cnt:%d\n",
+                               bo->lock_cnt);
+                       _bo_unlock(bo);
+               }
+
+               /* call the bo_free */
+               bufmgr->backend->bo_free(bo);
+               bo->priv = NULL;
+
+               LIST_DEL(&bo->item_link);
+               free(bo);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+               bufmgr->bo_cnt--;
+       }
+
+       _tbm_bufmgr_mutex_unlock();
 }
 
 tbm_bo
 tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 {
-       TBM_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr) && (size > 0), NULL);
-
        tbm_bo bo = NULL;
        void *bo_priv = NULL;
 
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(bufmgr == gBufMgr, NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(size > 0, NULL);
+
        bo = calloc(1, sizeof(struct _tbm_bo));
        if (!bo) {
                TBM_TRACE("error: fail to create of tbm_bo size(%d) flag(%s)\n", size, tbm_flag_to_str(flags));
                _tbm_set_last_result(TBM_BO_ERROR_HEAP_ALLOC_FAILED);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -778,14 +868,12 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 
        bo->bufmgr = bufmgr;
 
-       pthread_mutex_lock(&bufmgr->lock);
-
        bo_priv = bufmgr->backend->bo_alloc(bo, size, flags);
        if (!bo_priv) {
                TBM_TRACE("error: fail to create of tbm_bo size(%d) flag(%s)\n", size, tbm_flag_to_str(flags));
                _tbm_set_last_result(TBM_BO_ERROR_BO_ALLOC_FAILED);
                free(bo);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -799,7 +887,7 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -807,21 +895,27 @@ tbm_bo_alloc(tbm_bufmgr bufmgr, int size, int flags)
 tbm_bo
 tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
 {
-       TBM_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-
        tbm_bo bo = NULL;
        tbm_bo bo2 = NULL;
        tbm_bo tmp = NULL;
        void *bo_priv = NULL;
 
-       _tbm_util_check_bo_cnt(bufmgr);
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(bufmgr == gBufMgr, NULL);
+
+       if (!bufmgr->backend->bo_import) {
+               _tbm_bufmgr_mutex_unlock();
+               return NULL;
+       }
+
+       _tbm_util_check_bo_cnt(bufmgr);
 
        bo = calloc(1, sizeof(struct _tbm_bo));
        if (!bo) {
                TBM_TRACE("error: fail to import of tbm_bo by key(%d)\n", key);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -834,7 +928,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
                TBM_TRACE("error: fail to import of tbm_bo by key(%d)\n", key);
                _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FAILED);
                free(bo);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -845,7 +939,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
                                                        bo2, bo2->ref_cnt, key, tbm_flag_to_str(bo2->flags));
                                bo2->ref_cnt++;
                                free(bo);
-                               pthread_mutex_unlock(&bufmgr->lock);
+                               _tbm_bufmgr_mutex_unlock();
                                return bo2;
                        }
                }
@@ -866,7 +960,7 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -874,21 +968,27 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
 tbm_bo
 tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
 {
-       TBM_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
-
        tbm_bo bo = NULL;
        tbm_bo bo2 = NULL;
        tbm_bo tmp = NULL;
        void *bo_priv = NULL;
 
-       _tbm_util_check_bo_cnt(bufmgr);
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(bufmgr == gBufMgr, NULL);
 
-       pthread_mutex_lock(&bufmgr->lock);
+       if (!bufmgr->backend->bo_import_fd) {
+               _tbm_bufmgr_mutex_unlock();
+               return NULL;
+       }
+
+       _tbm_util_check_bo_cnt(bufmgr);
 
        bo = calloc(1, sizeof(struct _tbm_bo));
        if (!bo) {
                TBM_TRACE("error: fail to import tbm_bo by tbm_fd(%d)\n", fd);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -901,7 +1001,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
                TBM_TRACE("error: fail to import tbm_bo by tbm_fd(%d)\n", fd);
                _tbm_set_last_result(TBM_BO_ERROR_IMPORT_FD_FAILED);
                free(bo);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return NULL;
        }
 
@@ -912,7 +1012,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
                                                        bo2, bo2->ref_cnt, fd, tbm_flag_to_str(bo2->flags));
                                bo2->ref_cnt++;
                                free(bo);
-                               pthread_mutex_unlock(&bufmgr->lock);
+                               _tbm_bufmgr_mutex_unlock();
                                return bo2;
                        }
                }
@@ -933,7 +1033,7 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -941,26 +1041,32 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
 tbm_key
 tbm_bo_export(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
-       tbm_bufmgr bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        tbm_key ret;
 
-       bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
+       bufmgr = gBufMgr;
+
+       if (!bufmgr->backend->bo_export) {
+               _tbm_bufmgr_mutex_unlock();
+               return 0;
+       }
 
        ret = bufmgr->backend->bo_export(bo);
        if (!ret) {
                _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FAILED);
                TBM_TRACE("error: bo(%p) tbm_key(%d)\n", bo, ret);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return ret;
        }
 
        TBM_TRACE("bo(%p) tbm_key(%d)\n", bo, ret);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return ret;
 }
@@ -968,26 +1074,32 @@ tbm_bo_export(tbm_bo bo)
 tbm_fd
 tbm_bo_export_fd(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1);
-
-       tbm_bufmgr bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        int ret;
 
-       bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), -1);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), -1);
 
-       pthread_mutex_lock(&bufmgr->lock);
+       bufmgr = gBufMgr;
+
+       if (!bufmgr->backend->bo_export_fd) {
+               _tbm_bufmgr_mutex_unlock();
+               return -1;
+       }
 
        ret = bufmgr->backend->bo_export_fd(bo);
        if (ret < 0) {
                _tbm_set_last_result(TBM_BO_ERROR_EXPORT_FD_FAILED);
                TBM_TRACE("error: bo(%p) tbm_fd(%d)\n", bo, ret);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return ret;
        }
 
        TBM_TRACE("bo(%p) tbm_fd(%d)\n", bo, ret);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return ret;
 }
@@ -995,26 +1107,27 @@ tbm_bo_export_fd(tbm_bo bo)
 tbm_bo_handle
 tbm_bo_get_handle(tbm_bo bo, int device)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) 0);
-
-       tbm_bufmgr bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        tbm_bo_handle bo_handle;
 
-       bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), (tbm_bo_handle) NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL);
+
+       bufmgr = gBufMgr;
 
        bo_handle = bufmgr->backend->bo_get_handle(bo, device);
        if (bo_handle.ptr == NULL) {
                _tbm_set_last_result(TBM_BO_ERROR_GET_HANDLE_FAILED);
                TBM_TRACE("error: bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return (tbm_bo_handle) NULL;
        }
 
        TBM_TRACE("bo(%p) bo_handle(%p)\n", bo, bo_handle.ptr);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo_handle;
 }
@@ -1022,19 +1135,20 @@ tbm_bo_get_handle(tbm_bo bo, int device)
 tbm_bo_handle
 tbm_bo_map(tbm_bo bo, int device, int opt)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) 0);
-
-       tbm_bufmgr bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        tbm_bo_handle bo_handle;
 
-       bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), (tbm_bo_handle) NULL);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), (tbm_bo_handle) NULL);
+
+       bufmgr = gBufMgr;
 
        if (!_tbm_bo_lock(bo, device, opt)) {
                _tbm_set_last_result(TBM_BO_ERROR_LOCK_FAILED);
                TBM_TRACE("error: fail to lock bo:%p)\n", bo);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return (tbm_bo_handle) NULL;
        }
 
@@ -1043,7 +1157,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt)
                _tbm_set_last_result(TBM_BO_ERROR_MAP_FAILED);
                TBM_TRACE("error: fail to map bo:%p\n", bo);
                _tbm_bo_unlock(bo);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return (tbm_bo_handle) NULL;
        }
 
@@ -1052,7 +1166,7 @@ tbm_bo_map(tbm_bo bo, int device, int opt)
 
        TBM_TRACE("bo(%p) map_cnt(%d)\n", bo, bo->map_cnt);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo_handle;
 }
@@ -1060,20 +1174,21 @@ tbm_bo_map(tbm_bo bo, int device, int opt)
 int
 tbm_bo_unmap(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
-       tbm_bufmgr bufmgr;
+       tbm_bufmgr bufmgr = NULL;
        int ret;
 
-       bufmgr = bo->bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       pthread_mutex_lock(&bufmgr->lock);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
+       bufmgr = gBufMgr;
 
        ret = bufmgr->backend->bo_unmap(bo);
        if (!ret) {
                TBM_TRACE("error: bo(%p) map_cnt(%d)\n", bo, bo->map_cnt);
                _tbm_set_last_result(TBM_BO_ERROR_UNMAP_FAILED);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return ret;
        }
 
@@ -1084,7 +1199,7 @@ tbm_bo_unmap(tbm_bo bo)
 
        _tbm_bo_unlock(bo);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return ret;
 }
@@ -1092,19 +1207,23 @@ tbm_bo_unmap(tbm_bo bo)
 int
 tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo1), 0);
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo2), 0);
-
+       tbm_bufmgr bufmgr = NULL;
        void *temp;
 
-       pthread_mutex_lock(&bo1->bufmgr->lock);
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo1), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo2), 0);
+
+       bufmgr = gBufMgr;
 
        TBM_TRACE("before: bo1(%p) bo2(%p)\n", bo1, bo2);
 
-       if (bo1->bufmgr->backend->bo_size(bo1) != bo2->bufmgr->backend->bo_size(bo2)) {
+       if (bufmgr->backend->bo_size(bo1) != bufmgr->backend->bo_size(bo2)) {
                _tbm_set_last_result(TBM_BO_ERROR_SWAP_FAILED);
                TBM_TRACE("error: bo1(%p) bo2(%p)\n", bo1, bo2);
-       pthread_mutex_unlock(&bo1->bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1114,7 +1233,7 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
        bo1->priv = bo2->priv;
        bo2->priv = temp;
 
-       pthread_mutex_unlock(&bo1->bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return 1;
 }
@@ -1122,28 +1241,29 @@ tbm_bo_swap(tbm_bo bo1, tbm_bo bo2)
 int
 tbm_bo_locked(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+       tbm_bufmgr bufmgr = NULL;
 
-       tbm_bufmgr bufmgr;
+       _tbm_bufmgr_mutex_lock();
 
-       bufmgr = bo->bufmgr;
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
+       bufmgr = gBufMgr;
 
        if (bufmgr->lock_type == LOCK_TRY_NEVER) {
                TBM_TRACE("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
-       pthread_mutex_lock(&bufmgr->lock);
-
-
        if (bo->lock_cnt > 0) {
                TBM_TRACE("error: bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return 1;
        }
 
        TBM_TRACE("bo(%p) lock_cnt(%d)\n", bo, bo->lock_cnt);
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return 0;
 }
@@ -1152,20 +1272,25 @@ int
 tbm_bo_add_user_data(tbm_bo bo, unsigned long key,
                     tbm_data_free data_free_func)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
        tbm_user_data *data;
 
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
        /* check if the data according to the key exist if so, return false. */
        data = user_data_lookup(&bo->user_data_list, key);
        if (data) {
                TBM_TRACE("warning: user data already exist key(%ld)\n", key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
        data = user_data_create(key, data_free_func);
        if (!data) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1173,24 +1298,31 @@ tbm_bo_add_user_data(tbm_bo bo, unsigned long key,
 
        LIST_ADD(&data->item_link, &bo->user_data_list);
 
+       _tbm_bufmgr_mutex_unlock();
+
        return 1;
 }
 
 int
 tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
        tbm_user_data *old_data;
 
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
        if (LIST_IS_EMPTY(&bo->user_data_list)) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
        old_data = user_data_lookup(&bo->user_data_list, key);
        if (!old_data) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1201,18 +1333,24 @@ tbm_bo_set_user_data(tbm_bo bo, unsigned long key, void *data)
 
        TBM_TRACE("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data);
 
+       _tbm_bufmgr_mutex_unlock();
+
        return 1;
 }
 
 int
 tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
        tbm_user_data *old_data;
 
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
        if (!data || LIST_IS_EMPTY(&bo->user_data_list)) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1220,6 +1358,7 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data)
        if (!old_data) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
                *data = NULL;
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1227,24 +1366,31 @@ tbm_bo_get_user_data(tbm_bo bo, unsigned long key, void **data)
 
        TBM_TRACE("bo(%p) key(%lu) data(%p)\n", bo, key, old_data->data);
 
+       _tbm_bufmgr_mutex_unlock();
+
        return 1;
 }
 
 int
 tbm_bo_delete_user_data(tbm_bo bo, unsigned long key)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
-
        tbm_user_data *old_data = (void *)0;
 
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
        if (LIST_IS_EMPTY(&bo->user_data_list)) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
        old_data = user_data_lookup(&bo->user_data_list, key);
        if (!old_data) {
                TBM_TRACE("error: bo(%p) key(%lu)\n", bo, key);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
@@ -1252,27 +1398,47 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key)
 
        user_data_delete(old_data);
 
+       _tbm_bufmgr_mutex_unlock();
+
        return 1;
 }
 
 unsigned int
 tbm_bufmgr_get_capability(tbm_bufmgr bufmgr)
 {
-       TBM_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), 0);
+       int capabilities = TBM_BUFMGR_CAPABILITY_NONE;
+
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), TBM_BUFMGR_CAPABILITY_NONE);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(bufmgr == gBufMgr, TBM_BUFMGR_CAPABILITY_NONE);
 
        TBM_TRACE("tbm_bufmgr(%p) capability(%d)\n", bufmgr, bufmgr->capabilities);
 
-       return bufmgr->capabilities;
+       capabilities = bufmgr->capabilities;
+
+       _tbm_bufmgr_mutex_unlock();
+
+       return capabilities;
 }
 
 int
 tbm_bo_get_flags(tbm_bo bo)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+       int flags;
+
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+
+       flags = bo->flags;
 
        TBM_TRACE("bo(%p)\n", bo);
 
-       return bo->flags;
+       _tbm_bufmgr_mutex_unlock();
+
+       return flags;
 }
 
 /* LCOV_EXCL_START */
@@ -1285,29 +1451,45 @@ tbm_get_last_error(void)
 void
 tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
 {
-       TBM_RETURN_IF_FAIL(bufmgr != NULL);
        tbm_bo bo = NULL, tmp_bo = NULL;
        int bo_cnt = 0;
-
        tbm_surface_h surf = NULL, tmp_surf = NULL;
        int surf_cnt = 0;
        int i;
        char app_name[255] = {0,};
        unsigned int pid = 0;
+       char title[255] = {0,};
+       char data[255] = {0,};
+       tbm_surface_debug_data *debug_old_data = NULL, *debug_tmp = NULL;
 
        pthread_mutex_lock(&gLock);
 
+       if (!TBM_BUFMGR_IS_VALID(bufmgr) || (bufmgr != gBufMgr)) {
+               TBM_LOG_E("invalid bufmgr\n");
+               pthread_mutex_unlock(&gLock);
+               return;
+       }
+
        TBM_DEBUG("\n");
        _tbm_util_get_appname_from_pid(getpid(), app_name);
        _tbm_util_get_appname_brief(app_name);
        TBM_DEBUG("============TBM DEBUG: %s(%d)===========================\n",
                  app_name, getpid());
        memset(app_name, 0x0, 255 * sizeof(char));
+       snprintf(title, 255, "%s", "no  surface     refcnt  width  height  bpp  size    n_b  n_p  flags  format    app_name       ");
+       if (!LIST_IS_EMPTY(&bufmgr->debug_key_list)) {
+               LIST_FOR_EACH_ENTRY_SAFE(debug_old_data, debug_tmp, &bufmgr->debug_key_list, item_link) {
+                       strncat(title, "  ", 3);
+                       strncat(title, debug_old_data->key, strlen(debug_old_data->key) + 1);
+               }
+       }
 
        TBM_DEBUG("[tbm_surface information]\n");
-       TBM_DEBUG("no  surface              refcnt  width  height  bpp  size      num_bos num_planes flags format              app_name\n");
+       TBM_DEBUG("%s\n", title);
        /* show the tbm_surface information in surf_list */
        if (!LIST_IS_EMPTY(&bufmgr->surf_list)) {
+               char *value = NULL;
+
                LIST_FOR_EACH_ENTRY_SAFE(surf, tmp_surf, &bufmgr->surf_list, item_link) {
                        pid = _tbm_surface_internal_get_debug_pid(surf);
                        if (!pid) {
@@ -1318,7 +1500,7 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
                        _tbm_util_get_appname_from_pid(pid, app_name);
                        _tbm_util_get_appname_brief(app_name);
 
-                       TBM_DEBUG("%-4d%-23p%-6d%-7d%-8d%-5d%-12d%-10d%-9d%-4d%-20s%s\n",
+                       snprintf(data, 255, "%-2d  %-9p    %-4d  %-5d  %-6d  %-3d  %-6d   %-2d   %-2d    %-3d  %-8s  %-15s",
                                  ++surf_cnt,
                                  surf,
                                  surf->refcnt,
@@ -1329,14 +1511,27 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
                                  surf->num_bos,
                                  surf->num_planes,
                                  surf->flags,
-                                 _tbm_surface_internal_format_to_str(surf->info.format),
+                                 _tbm_surface_internal_format_to_str(surf->info.format) + 11,
                                  app_name);
 
+                       if (!LIST_IS_EMPTY(&bufmgr->debug_key_list)) {
+                               LIST_FOR_EACH_ENTRY_SAFE(debug_old_data, debug_tmp, &bufmgr->debug_key_list, item_link) {
+                                       strncat(data, "  ", 3);
+
+                                       value = _tbm_surface_internal_get_debug_data(surf, debug_old_data->key);
+                                       if (value)
+                                               strncat(data, value, strlen(value) + 1);
+                                       else
+                                               strncat(data, "none", 5);
+                               }
+                       }
+                       TBM_DEBUG("%s\n", data);
+
                        for (i = 0; i < surf->num_bos; i++) {
                                TBM_DEBUG(" bo:%-12p  %-26d%-10d\n",
                                          surf->bos[i],
                                          surf->bos[i]->ref_cnt,
-                                         tbm_bo_size(surf->bos[i]) / 1024);
+                                         bufmgr->backend->bo_size(bo) / 1024);
                        }
 
                        memset(app_name, 0x0, 255 * sizeof(char));
@@ -1347,16 +1542,16 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
        TBM_DEBUG("\n");
 
        TBM_DEBUG("[tbm_bo information]\n");
-       TBM_DEBUG("no  bo                   refcnt  size     lock_cnt map_cnt flags surface\n");
+       TBM_DEBUG("no  bo          refcnt  size    lock_cnt  map_cnt  flags  surface\n");
 
        /* show the tbm_bo information in bo_list */
        if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
                LIST_FOR_EACH_ENTRY_SAFE(bo, tmp_bo, &bufmgr->bo_list, item_link) {
-                       TBM_DEBUG("%-4d%-11p   %-6d%-12d%-9d%-9d%-4d%-11p\n",
+                       TBM_DEBUG("%-4d%-11p   %-4d  %-6d     %-5d     %-4d    %-3d  %-11p\n",
                                  ++bo_cnt,
                                  bo,
                                  bo->ref_cnt,
-                                 tbm_bo_size(bo) / 1024,
+                                 bufmgr->backend->bo_size(bo) / 1024,
                                  bo->lock_cnt,
                                  bo->map_cnt,
                                  bo->flags,
@@ -1370,16 +1565,84 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
        TBM_DEBUG("===============================================================\n");
 
        pthread_mutex_unlock(&gLock);
-
 }
 
 void
 tbm_bufmgr_debug_trace(tbm_bufmgr bufmgr, int onoff)
 {
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr));
+       TBM_BUFMGR_RETURN_IF_FAIL(bufmgr == gBufMgr);
+
 #ifdef TRACE
        TBM_LOG_D("bufmgr=%p onoff=%d\n", bufmgr, onoff);
        bTrace = onoff;
 #endif
+
+       _tbm_bufmgr_mutex_unlock();
+}
+
+int
+tbm_bufmgr_debug_queue_dump(char *path, int count, int onoff)
+{
+       int w = 0, h = 0;
+
+       TBM_RETURN_VAL_IF_FAIL(path != NULL, 0);
+       TBM_LOG_D("path=%s count=%d onoff=%d\n", path, count, onoff);
+
+       pthread_mutex_lock(&gLock);
+
+       if (onoff == 1) {
+               if (_tbm_util_get_max_surface_size(&w, &h) == 0) {
+                       TBM_LOG_I("No tbm_surface.\n");
+                       pthread_mutex_unlock(&gLock);
+                       return 0;
+               }
+
+               tbm_surface_internal_dump_start(path, w, h, count);
+               b_dump_queue = 1;
+       } else if (onoff == 0) {
+               tbm_surface_internal_dump_end();
+               b_dump_queue = 0;
+       } else {
+               pthread_mutex_unlock(&gLock);
+               return 0;
+       }
+
+       pthread_mutex_unlock(&gLock);
+       return 1;
+}
+
+int
+tbm_bufmgr_debug_dump_all(char *path)
+{
+       int w = 0, h = 0, count = 0;
+       tbm_surface_h surface = NULL, tmp = NULL;
+
+       TBM_RETURN_VAL_IF_FAIL(path != NULL, 0);
+       TBM_LOG_D("path=%s\n", path);
+
+       pthread_mutex_lock(&gLock);
+
+       count = _tbm_util_get_max_surface_size(&w, &h);
+       if (count == 0) {
+               TBM_LOG_I("No tbm_surface.\n");
+               pthread_mutex_unlock(&gLock);
+               return 1;
+       }
+
+       tbm_surface_internal_dump_start(path, w, h, count);
+
+       LIST_FOR_EACH_ENTRY_SAFE(surface, tmp, &gBufMgr->surf_list, item_link) {
+               tbm_surface_internal_dump_buffer(surface, "dump_all");
+       }
+
+       tbm_surface_internal_dump_end();
+
+       pthread_mutex_unlock(&gLock);
+
+       return 1;
 }
 
 /* internal function */
@@ -1392,38 +1655,43 @@ _tbm_bufmgr_get_bufmgr(void)
 int
 _tbm_bo_set_surface(tbm_bo bo, tbm_surface_h surface)
 {
-       TBM_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(_tbm_bo_is_valid(bo), 0);
 
        bo->surface = surface;
 
+       _tbm_bufmgr_mutex_unlock();
+
        return 1;
 }
 
 int
 tbm_bufmgr_bind_native_display(tbm_bufmgr bufmgr, void *NativeDisplay)
 {
-       TBM_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr), 0);
-
        int ret;
 
-       pthread_mutex_lock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_lock();
+
+       TBM_BUFMGR_RETURN_VAL_IF_FAIL(TBM_BUFMGR_IS_VALID(gBufMgr), 0);
 
        if (!bufmgr->backend->bufmgr_bind_native_display) {
                TBM_TRACE("error: tbm_bufmgr(%p) NativeDisplay(%p)\n", bufmgr, NativeDisplay);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return 1;
        }
 
        ret = bufmgr->backend->bufmgr_bind_native_display(bufmgr, NativeDisplay);
        if (!ret) {
                TBM_TRACE("error: tbm_bufmgr(%p) NativeDisplay(%p)\n", bufmgr, NativeDisplay);
-               pthread_mutex_unlock(&bufmgr->lock);
+               _tbm_bufmgr_mutex_unlock();
                return 0;
        }
 
        TBM_TRACE("tbm_bufmgr(%p) NativeDisplay(%p)\n", bufmgr, NativeDisplay);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return 1;
 }