queue: added TBM_SURFACE_QUEUE_ERROR_INVALID_SEQUENCE

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

diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c
index d8978e6..8f39d72 100644 (file)
--- a/src/tbm_bufmgr.c
+++ b/src/tbm_bufmgr.c
@@ -207,29 +207,29 @@ _tbm_util_get_appname_from_pid(long pid, char *str)
 static int
 _check_version(TBMModuleVersionInfo *data)
 {
-       int abimaj, abimin;
-       int vermaj, vermin;
+       int backend_module_major, backend_module_minor;
+       int tbm_backend_major, tbm_backend_minor;
 
-       abimaj = GET_ABI_MAJOR(data->abiversion);
-       abimin = GET_ABI_MINOR(data->abiversion);
+       backend_module_major = GET_ABI_MAJOR(data->abiversion);
+       backend_module_minor = GET_ABI_MINOR(data->abiversion);
 
        TBM_DBG("TBM module %s: vendor=\"%s\" ABI=%d,%d\n",
            data->modname ? data->modname : "UNKNOWN!",
-           data->vendor ? data->vendor : "UNKNOWN!", abimaj, abimin);
+           data->vendor ? data->vendor : "UNKNOWN!", backend_module_major, backend_module_minor);
 
-       vermaj = GET_ABI_MAJOR(TBM_ABI_VERSION);
-       vermin = GET_ABI_MINOR(TBM_ABI_VERSION);
+       tbm_backend_major = GET_ABI_MAJOR(TBM_ABI_VERSION);
+       tbm_backend_minor = GET_ABI_MINOR(TBM_ABI_VERSION);
 
        TBM_DBG("TBM ABI version %d.%d\n",
-           vermaj, vermin);
+           tbm_backend_major, tbm_backend_minor);
 
-       if (abimaj != vermaj) {
+       if (backend_module_major != tbm_backend_major) {
                TBM_ERR("TBM module ABI major ver(%d) doesn't match the TBM's ver(%d)\n",
-                       abimaj, vermaj);
+                       backend_module_major, tbm_backend_major);
                return 0;
-       } else if (abimin > vermin) {
+       } else if (backend_module_minor > tbm_backend_minor) {
                TBM_ERR("TBM module ABI minor ver(%d) is newer than the TBM's ver(%d)\n",
-                       abimin, vermin);
+                       backend_module_minor, tbm_backend_minor);
                return 0;
        }
 
@@ -282,8 +282,8 @@ _tbm_backend_load_module(tbm_bufmgr bufmgr, const char *file)
        void *module_data = NULL;
        tbm_backend_module *backend_module_data = NULL;
        tbm_backend_bufmgr_data *bufmgr_data = NULL;
-       int abimaj, abimin;
-       int vermaj, vermin;
+       int backend_module_major, backend_module_minor;
+       int tbm_backend_major, tbm_backend_minor;
        tbm_error_e error;
 
        snprintf(path, sizeof(path), BUFMGR_MODULE_DIR "/%s", file);
@@ -300,25 +300,25 @@ _tbm_backend_load_module(tbm_bufmgr bufmgr, const char *file)
                goto err;
        }
 
-       abimaj = GET_ABI_MAJOR(backend_module_data->abi_version);
-       abimin = GET_ABI_MINOR(backend_module_data->abi_version);
+       tbm_backend_major = GET_ABI_MAJOR(TBM_BACKEND_ABI_LATEST_VERSION);
+       tbm_backend_minor = GET_ABI_MINOR(TBM_BACKEND_ABI_LATEST_VERSION);
+       TBM_INFO("TBM Backend ABI version %d.%d\n", tbm_backend_major, tbm_backend_minor);
 
-       TBM_DBG("TBM module %s: vendor=\"%s\" ABI=%d,%d\n",
+       backend_module_major = GET_ABI_MAJOR(backend_module_data->abi_version);
+       backend_module_minor = GET_ABI_MINOR(backend_module_data->abi_version);
+
+       TBM_INFO("TBM module %s: vendor=\"%s\" Backend ABI version=%d.%d\n",
            backend_module_data->name ? backend_module_data->name : "UNKNOWN!",
            backend_module_data->vendor ? backend_module_data->vendor : "UNKNOWN!",
-               abimaj, abimin);
-
-       vermaj = GET_ABI_MAJOR(TBM_BACKEND_ABI_LATEST_VERSION);
-       vermin = GET_ABI_MINOR(TBM_BACKEND_ABI_LATEST_VERSION);
-       TBM_DBG("TBM ABI version %d.%d\n", vermaj, vermin);
+               backend_module_major, backend_module_minor);
 
-       if (abimaj > vermaj) {
+       if (backend_module_major > tbm_backend_major) {
                TBM_ERR("TBM module ABI major ver(%d) is newer than the TBM's ver(%d)\n",
-                       abimaj, vermaj);
+                       backend_module_major, tbm_backend_major);
                goto err;
-       } else if (abimin > vermin) {
+       } else if (backend_module_minor > tbm_backend_minor) {
                TBM_ERR("TBM module ABI minor ver(%d) is newer than the TBM's ver(%d)\n",
-                       abimin, vermin);
+                       backend_module_minor, tbm_backend_minor);
                goto err;
        }
 
@@ -530,7 +530,7 @@ _tbm_bufmgr_init(int fd, int server)
        /* initialize buffer manager */
        if (gBufMgr) {
                gBufMgr->ref_count++;
-               TBM_INFO("reuse  tbm_bufmgr(%p) ref_count(%d) fd(%d)\n", gBufMgr, gBufMgr->ref_count, gBufMgr->fd);
+               TBM_DBG("reuse  tbm_bufmgr(%p) ref_count(%d) fd(%d)\n", gBufMgr, gBufMgr->ref_count, gBufMgr->fd);
                pthread_mutex_unlock(&gLock);
                return gBufMgr;
        }
@@ -635,7 +635,7 @@ tbm_bufmgr_deinit(tbm_bufmgr bufmgr)
 
        bufmgr->ref_count--;
        if (bufmgr->ref_count > 0) {
-               TBM_INFO("reduce a ref_count(%d) of tbm_bufmgr(%p)\n", bufmgr->ref_count, bufmgr);
+               TBM_DBG("reduce a ref_count(%d) of tbm_bufmgr(%p)\n", bufmgr->ref_count, bufmgr);
                pthread_mutex_unlock(&gLock);
                _tbm_bufmgr_mutex_unlock();
                return;
@@ -1006,14 +1006,19 @@ tbm_bufmgr_debug_dump_all(char *path)
        pthread_mutex_lock(&gLock);
        _tbm_set_last_result(TBM_ERROR_NONE);
 
-       TBM_RETURN_VAL_IF_FAIL(path != NULL, 0);
+       if (!path) {
+               TBM_ERR("path is null.\n");
+               pthread_mutex_unlock(&gLock);
+               return 0;
+       }
+
        TBM_DBG("path=%s\n", path);
 
        count = _tbm_util_get_max_surface_size(&w, &h);
        if (count == 0) {
                TBM_ERR("No tbm_surface.\n");
                pthread_mutex_unlock(&gLock);
-               return 1;
+               return 0;
        }
 
        tbm_surface_internal_dump_with_scale_start(path, w, h, count, scale_factor);