tbm_bufmgr: clean up tbm_bo_***() functions
[platform/core/uifw/libtbm.git] / src / tbm_bufmgr.c
index 8586100..9bc61de 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,52 +75,138 @@ 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;
 }
 
-char * tbm_flag_to_str(int f)
+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);
+}
+
+static char *
+_tbm_flag_to_str(int f)
 {
        static char str[255];
-       int c = 0;
+
        if (f == TBM_BO_DEFAULT)
-                snprintf(str, 255, "DEFAULT\n");
+                snprintf(str, 255, "DEFAULT");
        else {
+               int c = 0;
+
                if (f & TBM_BO_SCANOUT)
-                       c = snprintf(&str[c], 255, "SCANOUT,");
-               if (f & TBM_BO_NONCACHABLE)
+                       c = snprintf(&str[c], 255, "SCANOUT");
+
+               if (f & TBM_BO_NONCACHABLE) {
+                       if (c)
+                               c = snprintf(&str[c], 255, ", ");
                        c = snprintf(&str[c], 255, "NONCACHABLE,");
-               if (f & TBM_BO_WC)
+               }
+
+               if (f & TBM_BO_WC) {
+                       if (c)
+                               c = snprintf(&str[c], 255, ", ");
                        c = snprintf(&str[c], 255, "WC");
+               }
        }
+
        return str;
 }
 
 /* LCOV_EXCL_START */
-static int last_chk_bo_cnt = 0;
 static void
 _tbm_util_check_bo_cnt(tbm_bufmgr bufmgr)
 {
-       if (bufmgr->bo_cnt >= 500 && ((bufmgr->bo_cnt % 20) == 0)) {
-               if (bufmgr->bo_cnt > last_chk_bo_cnt) {
-                       TBM_DEBUG("============TBM BO CNT DEBUG: bo_cnt=%d\n", bufmgr->bo_cnt);
-                       tbm_bufmgr_debug_show(bufmgr);
-                       last_chk_bo_cnt = bufmgr->bo_cnt;
+       static int last_chk_bo_cnt = 0;
+
+       if ((bufmgr->bo_cnt >= 500) && ((bufmgr->bo_cnt % 20) == 0) &&
+               (bufmgr->bo_cnt > last_chk_bo_cnt)) {
+               TBM_DEBUG("============TBM BO CNT DEBUG: bo_cnt=%d\n",
+                               bufmgr->bo_cnt);
+
+               tbm_bufmgr_debug_show(bufmgr);
+
+               last_chk_bo_cnt = bufmgr->bo_cnt;
+       }
+}
+
+static int
+_tbm_util_get_max_surface_size(int *w, int *h)
+{
+       tbm_surface_info_s info;
+       tbm_surface_h surface = NULL;
+       int count = 0;
+
+       *w = 0;
+       *h = 0;
+
+       if (gBufMgr == NULL || !LIST_IS_EMPTY(&gBufMgr->surf_list))
+               return count;
+
+       LIST_FOR_EACH_ENTRY(surface, &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
@@ -134,25 +231,24 @@ _tbm_util_get_appname_brief(char *brief)
 static void
 _tbm_util_get_appname_from_pid(long pid, char *str)
 {
+       char fn_cmdline[255] = {0, }, cmdline[255];
        FILE *fp;
        int len;
-       long app_pid = pid;
-       char fn_cmdline[255] = {0,};
-       char cmdline[255] = {0,};
 
-       snprintf(fn_cmdline, sizeof(fn_cmdline), "/proc/%ld/cmdline", app_pid);
+       snprintf(fn_cmdline, sizeof(fn_cmdline), "/proc/%ld/cmdline", pid);
 
        fp = fopen(fn_cmdline, "r");
        if (fp == 0) {
-               fprintf(stderr, "cannot file open /proc/%ld/cmdline", app_pid);
+               fprintf(stderr, "cannot file open %s\n", fn_cmdline);
                return;
        }
 
        if (!fgets(cmdline, 255, fp)) {
-               fprintf(stderr, "fail to get appname for pid(%ld)\n", app_pid);
+               fprintf(stderr, "fail to get appname for pid(%ld)\n", pid);
                fclose(fp);
                return;
        }
+
        fclose(fp);
 
        len = strlen(cmdline);
@@ -168,25 +264,23 @@ _tbm_util_get_appname_from_pid(long pid, char *str)
 tbm_user_data
 *user_data_lookup(struct list_head *user_data_list, unsigned long key)
 {
-       tbm_user_data *user_data = NULL;
-       tbm_user_data *old_data = NULL, *tmp = NULL;
-
-       if (!LIST_IS_EMPTY(user_data_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, user_data_list, item_link) {
-                       if (old_data->key == key) {
-                               user_data = old_data;
-                               return user_data;
-                       }
-               }
+       tbm_user_data *old_data = NULL;
+
+       if (LIST_IS_EMPTY(user_data_list))
+               return NULL;
+
+       LIST_FOR_EACH_ENTRY(old_data, user_data_list, item_link) {
+               if (old_data->key == key)
+                       return old_data;
        }
 
-       return user_data;
+       return NULL;
 }
 
 tbm_user_data
 *user_data_create(unsigned long key, tbm_data_free data_free_func)
 {
-       tbm_user_data *user_data = NULL;
+       tbm_user_data *user_data;
 
        user_data = calloc(1, sizeof(tbm_user_data));
        if (!user_data)
@@ -194,7 +288,6 @@ tbm_user_data
 
        user_data->key = key;
        user_data->free_func = data_free_func;
-       user_data->data = (void *)0;
 
        return user_data;
 }
@@ -214,12 +307,10 @@ static int
 _bo_lock(tbm_bo bo, int device, int opt)
 {
        tbm_bufmgr bufmgr = bo->bufmgr;
-       int ret = 0;
+       int ret = 1;
 
        if (bufmgr->backend->bo_lock)
                ret = bufmgr->backend->bo_lock(bo, device, opt);
-       else
-               ret = 1;
 
        return ret;
 }
@@ -236,9 +327,8 @@ _bo_unlock(tbm_bo bo)
 static int
 _tbm_bo_lock(tbm_bo bo, int device, int opt)
 {
-       tbm_bufmgr bufmgr = NULL;
-       int old;
-       int ret = 0;
+       tbm_bufmgr bufmgr;
+       int old, ret;
 
        if (!bo)
                return 0;
@@ -252,31 +342,37 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt)
        if (bo->lock_cnt < 0) {
                TBM_LOG_E("error bo:%p LOCK_CNT=%d\n",
                        bo, bo->lock_cnt);
+               return 0;
        }
 
        old = bo->lock_cnt;
-       if (bufmgr->lock_type == LOCK_TRY_ONCE) {
+
+       switch (bufmgr->lock_type) {
+       case 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);
+               break;
+       case LOCK_TRY_ALWAYS:
+               _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 {
-               TBM_LOG_E("error bo:%p lock_type is wrong.\n",
-                       bo);
+               break;
+       default:
+               TBM_LOG_E("error bo:%p lock_type[%d] is wrong.\n",
+                               bo, bufmgr->lock_type);
+               ret = 0;
+               break;
        }
 
-       DBG_LOCK(">> LOCK bo:%p(%d->%d)\n",
-                bo, old, bo->lock_cnt);
+       TBM_DBG_LOCK(">> LOCK bo:%p(%d->%d)\n", bo, old, bo->lock_cnt);
 
        return ret;
 }
@@ -284,8 +380,7 @@ _tbm_bo_lock(tbm_bo bo, int device, int opt)
 static void
 _tbm_bo_unlock(tbm_bo bo)
 {
-       tbm_bufmgr bufmgr = NULL;
-
+       tbm_bufmgr bufmgr;
        int old;
 
        if (!bo)
@@ -298,89 +393,52 @@ _tbm_bo_unlock(tbm_bo bo)
                return;
 
        old = bo->lock_cnt;
-       if (bufmgr->lock_type == LOCK_TRY_ONCE) {
+
+       switch (bufmgr->lock_type) {
+       case LOCK_TRY_ONCE:
                if (bo->lock_cnt > 0) {
                        bo->lock_cnt--;
                        if (bo->lock_cnt == 0)
                                _bo_unlock(bo);
                }
-       } else if (bufmgr->lock_type == LOCK_TRY_ALWAYS) {
+               break;
+       case LOCK_TRY_ALWAYS:
                if (bo->lock_cnt > 0) {
                        bo->lock_cnt--;
                        _bo_unlock(bo);
                }
-       } else {
-               TBM_LOG_E("error bo:%p lock_type is wrong.\n",
-                       bo);
+               break;
+       default:
+               TBM_LOG_E("error bo:%p lock_type[%d] is wrong.\n",
+                               bo, bufmgr->lock_type);
+               break;
        }
 
        if (bo->lock_cnt < 0)
                bo->lock_cnt = 0;
 
-       DBG_LOCK(">> UNLOCK bo:%p(%d->%d)\n",
-                bo, old, bo->lock_cnt);
+       TBM_DBG_LOCK(">> UNLOCK bo:%p(%d->%d)\n", bo, old, bo->lock_cnt);
 }
 
 static int
 _tbm_bo_is_valid(tbm_bo bo)
 {
-       tbm_bo old_data = NULL, tmp = NULL;
+       tbm_bo old_data;
 
-       if (bo == NULL)
+       if (bo == NULL || gBufMgr == NULL) {
+               TBM_LOG_E("error: bo is NULL or 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)
-                               return 1;
-               }
-
        }
-       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;
+       if (LIST_IS_EMPTY(&gBufMgr->bo_list))
+               return 0;
 
-               bufmgr->bo_cnt--;
+       LIST_FOR_EACH_ENTRY(old_data, &gBufMgr->bo_list, item_link) {
+               if (old_data == bo)
+                       return 1;
        }
 
+       return 0;
 }
 
 /* LCOV_EXCL_START */
@@ -393,14 +451,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) {
@@ -412,108 +470,102 @@ _check_version(TBMModuleVersionInfo *data)
                        abimin, vermin);
                return 0;
        }
+
        return 1;
 }
 
 static int
 _tbm_bufmgr_load_module(tbm_bufmgr bufmgr, int fd, const char *file)
 {
-       char path[PATH_MAX] = { 0, };
-       TBMModuleData *initdata = NULL;
+       char path[PATH_MAX] = {0, };
+       TBMModuleVersionInfo *vers;
+       TBMModuleData *initdata;
+       ModuleInitProc init;
        void *module_data;
 
        snprintf(path, sizeof(path), BUFMGR_MODULE_DIR "/%s", file);
 
        module_data = dlopen(path, RTLD_LAZY);
        if (!module_data) {
-               TBM_LOG_E("failed to load module: %s(%s)\n",
-                       dlerror(), file);
+               TBM_LOG_E("failed to load module: %s(%s)\n", dlerror(), file);
                return 0;
        }
 
        initdata = dlsym(module_data, "tbmModuleData");
-       if (initdata) {
-               ModuleInitProc init;
-               TBMModuleVersionInfo *vers;
+       if (!initdata) {
+               TBM_LOG_E("Error: module does not have data object.\n");
+               goto err;
+       }
 
-               vers = initdata->vers;
-               init = initdata->init;
+       vers = initdata->vers;
+       if (!vers) {
+               TBM_LOG_E("Error: module does not supply version information.\n");
+               goto err;
+       }
 
-               if (vers) {
-                       if (!_check_version(vers)) {
-                               dlclose(module_data);
-                               return 0;
-                       }
-               } else {
-                       TBM_LOG_E("Error: module does not supply version information.\n");
+       init = initdata->init;
+       if (!init) {
+               TBM_LOG_E("Error: module does not supply init symbol.\n");
+               goto err;
+       }
 
-                       dlclose(module_data);
-                       return 0;
-               }
+       if (!_check_version(vers)) {
+               TBM_LOG_E("Fail to check version.\n");
+               goto err;
+       }
 
-               if (init) {
-                       if (!init(bufmgr, fd)) {
-                               TBM_LOG_E("Fail to init module(%s)\n",
-                                       file);
-                               dlclose(module_data);
-                               return 0;
-                       }
+       if (!init(bufmgr, fd)) {
+               TBM_LOG_E("Fail to init module(%s)\n", file);
+               goto err;
+       }
 
-                       if (!bufmgr->backend || !bufmgr->backend->priv) {
-                               TBM_LOG_E("Error: module(%s) wrong operation. Check backend or backend's priv.\n",
-                                       file);
-                               dlclose(module_data);
-                               return 0;
-                       }
-               } else {
-                       TBM_LOG_E("Error: module does not supply init symbol.\n");
-                       dlclose(module_data);
-                       return 0;
-               }
-       } else {
-               TBM_LOG_E("Error: module does not have data object.\n");
-               dlclose(module_data);
-               return 0;
+       if (!bufmgr->backend || !bufmgr->backend->priv) {
+               TBM_LOG_E("Error: module(%s) wrong operation. Check backend or backend's priv.\n", file);
+               goto err;
        }
 
        bufmgr->module_data = module_data;
 
-       DBG("Success to load module(%s)\n",
-           file);
+       TBM_DBG("Success to load module(%s)\n", file);
 
        return 1;
+
+err:
+       dlclose(module_data);
+       return 0;
 }
 
 static int
 _tbm_load_module(tbm_bufmgr bufmgr, int fd)
 {
        struct dirent **namelist;
-       const char *p = NULL;
-       int n;
-       int ret = 0;
+       int ret = 0, n;
 
        /* load bufmgr priv from default lib */
-       ret = _tbm_bufmgr_load_module(bufmgr, fd, DEFAULT_LIB);
+       if (_tbm_bufmgr_load_module(bufmgr, fd, DEFAULT_LIB))
+               return 1;
 
        /* load bufmgr priv from configured path */
-       if (!ret) {
-               n = scandir(BUFMGR_MODULE_DIR, &namelist, 0, alphasort);
-               if (n < 0) {
-                       TBM_LOG_E("no files : %s\n",
-                               BUFMGR_MODULE_DIR);
-               } else {
-                       while (n--) {
-                               if (!ret && strstr(namelist[n]->d_name, PREFIX_LIB)) {
-                                       p = strstr(namelist[n]->d_name, SUFFIX_LIB);
-                                       if (p && !strcmp(p, SUFFIX_LIB))
-                                               ret = _tbm_bufmgr_load_module(bufmgr, fd, namelist[n]->d_name);
-                               }
-                               free(namelist[n]);
-                       }
-                       free(namelist);
+       n = scandir(BUFMGR_MODULE_DIR, &namelist, 0, alphasort);
+       if (n < 0) {
+               TBM_LOG_E("no files : %s\n", BUFMGR_MODULE_DIR);
+               return 0;
+       }
+
+       while (n--) {
+               if (!ret && strstr(namelist[n]->d_name, PREFIX_LIB)) {
+                       const char *p = strstr(namelist[n]->d_name, SUFFIX_LIB);
+
+                       if (p && !strcmp(p, SUFFIX_LIB))
+                               ret = _tbm_bufmgr_load_module(bufmgr, fd,
+                                                       namelist[n]->d_name);
                }
+
+               free(namelist[n]);
        }
 
+       free(namelist);
+
        return ret;
 }
 /* LCOV_EXCL_STOP */
@@ -521,9 +573,15 @@ _tbm_load_module(tbm_bufmgr bufmgr, int fd)
 tbm_bufmgr
 tbm_bufmgr_init(int fd)
 {
+#ifdef TBM_BUFMGR_INIT_TIME
+       struct timeval start_tv, end_tv;
+#endif
        char *env;
 
-       pthread_mutex_lock(&gLock);
+#ifdef TBM_BUFMGR_INIT_TIME
+       /* get the start tv */
+       gettimeofday(&start_tv, NULL);
+#endif
 
        /* LCOV_EXCL_START */
 #ifdef HAVE_DLOG
@@ -531,9 +589,8 @@ tbm_bufmgr_init(int fd)
        if (env) {
                bDlog = atoi(env);
                TBM_LOG_D("TBM_DLOG=%s\n", env);
-       } else {
+       } else
                bDlog = 1;
-       }
 #endif
 
 #ifdef DEBUG
@@ -541,9 +598,8 @@ tbm_bufmgr_init(int fd)
        if (env) {
                bDebug = atoi(env);
                TBM_LOG_D("TBM_DEBUG=%s\n", env);
-       } else {
+       } else
                bDebug = 0;
-       }
 #endif
 
 #ifdef TRACE
@@ -551,12 +607,13 @@ tbm_bufmgr_init(int fd)
        if (env) {
                bTrace = atoi(env);
                TBM_LOG_D("TBM_TRACE=%s\n", env);
-       } else {
+       } else
                bTrace = 0;
-       }
 #endif
        /* LCOV_EXCL_STOP */
 
+       pthread_mutex_lock(&gLock);
+
        /* initialize buffer manager */
        if (gBufMgr) {
                gBufMgr->ref_count++;
@@ -565,7 +622,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 +648,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,8 +667,7 @@ tbm_bufmgr_init(int fd)
        else
                gBufMgr->lock_type = LOCK_TRY_ALWAYS;
 
-       DBG("BUFMGR_LOCK_TYPE=%s\n",
-           env ? env : "default:once");
+       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,10 +677,20 @@ tbm_bufmgr_init(int fd)
        /* intialize surf_list */
        LIST_INITHEAD(&gBufMgr->surf_list);
 
+       /* intialize surf_queue_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;
 }
 
@@ -646,12 +699,6 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
 {
        TBM_RETURN_IF_FAIL(TBM_BUFMGR_IS_VALID(bufmgr));
 
-       tbm_bo bo = NULL;
-       tbm_bo tmp = NULL;
-
-       tbm_surface_h surf = NULL;
-       tbm_surface_h tmp_surf = NULL;
-
        pthread_mutex_lock(&gLock);
 
        if (!gBufMgr) {
@@ -669,9 +716,10 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
 
        /* destroy bo_list */
        if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
+               tbm_bo bo = NULL, tmp;
+
                LIST_FOR_EACH_ENTRY_SAFE(bo, tmp, &bufmgr->bo_list, item_link) {
-                       TBM_LOG_E("Un-freed bo(%p, ref:%d)\n",
-                               bo, bo->ref_cnt);
+                       TBM_LOG_E("Un-freed bo(%p, ref:%d)\n", bo, bo->ref_cnt);
                        bo->ref_cnt = 1;
                        tbm_bo_unref(bo);
                }
@@ -679,9 +727,10 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
 
        /* destroy surf_list */
        if (!LIST_IS_EMPTY(&bufmgr->surf_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(surf, tmp_surf, &bufmgr->surf_list, item_link) {
-                       TBM_LOG_E("Un-freed surf(%p, ref:%d)\n",
-                               surf, surf->refcnt);
+               tbm_surface_h surf = NULL, tmp;
+
+               LIST_FOR_EACH_ENTRY_SAFE(surf, tmp, &bufmgr->surf_list, item_link) {
+                       TBM_LOG_E("Un-freed surf(%p, ref:%d)\n", surf, surf->refcnt);
                        tbm_surface_destroy(surf);
                }
        }
@@ -692,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);
@@ -702,7 +749,6 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
                close(bufmgr->fd);
 
        free(bufmgr);
-       bufmgr = NULL;
        gBufMgr = NULL;
 
        pthread_mutex_unlock(&gLock);
@@ -711,18 +757,19 @@ 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 = gBufMgr;
        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);
 
        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;
 }
@@ -730,17 +777,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_mutex_lock();
 
-       tbm_bufmgr bufmgr = bo->bufmgr;
-
-       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;
 }
@@ -748,61 +794,101 @@ 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 = gBufMgr;
 
-       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));
 
        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)) {
+                       tbm_user_data *old_data = NULL, *tmp;
+
+                       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);
+                       }
+               }
+
+               while (bo->lock_cnt > 0) {
+                       TBM_LOG_E("error lock_cnt:%d\n", bo->lock_cnt);
+                       _bo_unlock(bo);
+                       bo->lock_cnt--;
+               }
+
+               /* call the bo_free */
+               bufmgr->backend->bo_free(bo);
+               bo->priv = NULL;
+
+               LIST_DEL(&bo->item_link);
+               free(bo);
+
+               bufmgr->bo_cnt--;
+       }
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _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);
+       void *bo_priv;
+       tbm_bo bo;
+
+       _tbm_bufmgr_mutex_lock();
 
-       tbm_bo bo = NULL;
-       void *bo_priv = NULL;
+       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_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;
        }
 
        _tbm_util_check_bo_cnt(bufmgr);
-       bufmgr->bo_cnt++;
 
        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_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;
        }
 
+       bufmgr->bo_cnt++;
+
        bo->ref_cnt = 1;
        bo->flags = flags;
        bo->priv = bo_priv;
 
-       TBM_TRACE("bo(%p) size(%d) refcnt(%d), flag(%s)\n", bo, size, bo->ref_cnt, tbm_flag_to_str(bo->flags));
+       TBM_TRACE("bo(%p) size(%d) refcnt(%d), flag(%s)\n", bo, size, bo->ref_cnt,
+                       _tbm_flag_to_str(bo->flags));
 
        LIST_INITHEAD(&bo->user_data_list);
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -810,26 +896,28 @@ 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);
+       void *bo_priv;
+       tbm_bo bo;
 
-       tbm_bo bo = NULL;
-       tbm_bo bo2 = NULL;
-       tbm_bo tmp = NULL;
-       void *bo_priv = NULL;
+       _tbm_bufmgr_mutex_lock();
 
-       _tbm_util_check_bo_cnt(bufmgr);
+       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) {
+               _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;
        }
 
-       bufmgr->bo_cnt++;
-
        bo->bufmgr = bufmgr;
 
        bo_priv = bufmgr->backend->bo_import(bo, key);
@@ -837,23 +925,28 @@ 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;
        }
 
        if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(bo2, tmp, &bufmgr->bo_list, item_link) {
+               tbm_bo bo2 = NULL;
+
+               LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) {
                        if (bo2->priv == bo_priv) {
                                TBM_TRACE("find bo(%p) ref(%d) key(%d) flag(%s) in list\n",
-                                                       bo2, bo2->ref_cnt, key, tbm_flag_to_str(bo2->flags));
+                                               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;
                        }
                }
        }
 
+       bufmgr->bo_cnt++;
+
        bo->ref_cnt = 1;
        bo->priv = bo_priv;
 
@@ -863,13 +956,13 @@ tbm_bo_import(tbm_bufmgr bufmgr, unsigned int key)
                bo->flags = TBM_BO_DEFAULT;
 
        TBM_TRACE("import new bo(%p) ref(%d) key(%d) flag(%s) in list\n",
-                         bo, bo->ref_cnt, key, tbm_flag_to_str(bo->flags));
+                         bo, bo->ref_cnt, key, _tbm_flag_to_str(bo->flags));
 
        LIST_INITHEAD(&bo->user_data_list);
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -877,26 +970,28 @@ 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);
+       void *bo_priv;
+       tbm_bo bo;
 
-       tbm_bo bo = NULL;
-       tbm_bo bo2 = NULL;
-       tbm_bo tmp = NULL;
-       void *bo_priv = NULL;
+       _tbm_bufmgr_mutex_lock();
 
-       _tbm_util_check_bo_cnt(bufmgr);
+       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;
        }
 
-       bufmgr->bo_cnt++;
-
        bo->bufmgr = bufmgr;
 
        bo_priv = bufmgr->backend->bo_import_fd(bo, fd);
@@ -904,23 +999,28 @@ 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;
        }
 
        if (!LIST_IS_EMPTY(&bufmgr->bo_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(bo2, tmp, &bufmgr->bo_list, item_link) {
+               tbm_bo bo2 = NULL;
+
+               LIST_FOR_EACH_ENTRY(bo2, &bufmgr->bo_list, item_link) {
                        if (bo2->priv == bo_priv) {
                                TBM_TRACE("find bo(%p) ref(%d) fd(%d) flag(%s) in list\n",
-                                                       bo2, bo2->ref_cnt, fd, tbm_flag_to_str(bo2->flags));
+                                               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;
                        }
                }
        }
 
+       bufmgr->bo_cnt++;
+
        bo->ref_cnt = 1;
        bo->priv = bo_priv;
 
@@ -930,13 +1030,13 @@ tbm_bo_import_fd(tbm_bufmgr bufmgr, tbm_fd fd)
                bo->flags = TBM_BO_DEFAULT;
 
        TBM_TRACE("import bo(%p) ref(%d) fd(%d) flag(%s)in list\n",
-                               bo, bo->ref_cnt, fd, tbm_flag_to_str(bo->flags));
+                       bo, bo->ref_cnt, fd, _tbm_flag_to_str(bo->flags));
 
        LIST_INITHEAD(&bo->user_data_list);
 
        LIST_ADD(&bo->item_link, &bufmgr->bo_list);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return bo;
 }
@@ -944,26 +1044,30 @@ 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 = gBufMgr;
        tbm_key ret;
 
-       bufmgr = bo->bufmgr;
+       _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);
 
-       pthread_mutex_lock(&bufmgr->lock);
+       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);
+       TBM_TRACE("bo(%p) tbm_key(%u)\n", bo, ret);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return ret;
 }
@@ -971,26 +1075,30 @@ 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 = gBufMgr;
+       tbm_fd ret;
 
-       tbm_bufmgr bufmgr;
-       int ret;
+       _tbm_bufmgr_mutex_lock();
 
-       bufmgr = bo->bufmgr;
+       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);
+       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;
 }
@@ -998,26 +1106,25 @@ 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 = gBufMgr;
        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);
 
        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;
 }
@@ -1025,19 +1132,18 @@ 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 = gBufMgr;
        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);
 
        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;
        }
 
@@ -1046,7 +1152,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;
        }
 
@@ -1055,7 +1161,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;
 }
@@ -1063,20 +1169,19 @@ 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 = gBufMgr;
        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);
 
        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;
        }
 
@@ -1087,7 +1192,7 @@ tbm_bo_unmap(tbm_bo bo)
 
        _tbm_bo_unlock(bo);
 
-       pthread_mutex_unlock(&bufmgr->lock);
+       _tbm_bufmgr_mutex_unlock();
 
        return ret;
 }
@@ -1095,19 +1200,21 @@ 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 = gBufMgr;
        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);
 
        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;
        }
 
@@ -1117,7 +1224,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;
 }
@@ -1125,28 +1232,27 @@ 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 = gBufMgr;
 
-       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);
 
        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;
 }
@@ -1155,20 +1261,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;
        }
 
@@ -1176,46 +1287,58 @@ 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;
        }
 
        if (old_data->data && old_data->free_func)
                old_data->free_func(old_data->data);
-
        old_data->data = 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;
        }
 
@@ -1223,6 +1346,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;
        }
 
@@ -1230,24 +1354,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;
+
+       _tbm_bufmgr_mutex_lock();
 
-       tbm_user_data *old_data = (void *)0;
+       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;
        }
 
@@ -1255,27 +1386,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 */
@@ -1288,10 +1439,8 @@ 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;
@@ -1303,6 +1452,12 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
 
        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);
@@ -1312,7 +1467,7 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
        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, "  ", 2);
+                       strncat(title, "  ", 3);
                        strncat(title, debug_old_data->key, strlen(debug_old_data->key) + 1);
                }
        }
@@ -1349,15 +1504,13 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
 
                        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, "  ", 2);
+                                       strncat(data, "  ", 3);
 
                                        value = _tbm_surface_internal_get_debug_data(surf, debug_old_data->key);
-                                       if (value) {
+                                       if (value)
                                                strncat(data, value, strlen(value) + 1);
-                                       }
-                                       else {
-                                               strncat(data, "none", strlen("none") + 1);
-                                       }
+                                       else
+                                               strncat(data, "none", 5);
                                }
                        }
                        TBM_DEBUG("%s\n", data);
@@ -1366,7 +1519,7 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
                                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(surf->bos[i]) / 1024);
                        }
 
                        memset(app_name, 0x0, 255 * sizeof(char));
@@ -1386,7 +1539,7 @@ tbm_bufmgr_debug_show(tbm_bufmgr bufmgr)
                                  ++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,
@@ -1400,16 +1553,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 */
@@ -1422,38 +1643,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;
 }