surface: clean up tbm_surface_internal_set_debug_data
[platform/core/uifw/libtbm.git] / src / tbm_surface_internal.c
index 493f507..872fb5c 100644 (file)
@@ -41,16 +41,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <png.h>
 #include <pixman.h>
 
+#define TBM_SURFACE_MAGIC 0xBF021234
+
 static tbm_bufmgr g_surface_bufmgr;
 static pthread_mutex_t tbm_surface_lock = PTHREAD_MUTEX_INITIALIZER;
 void _tbm_surface_mutex_unlock(void);
 
-#define C(b, m)              (((b) >> (m)) & 0xFF)
-#define B(c, s)              ((((unsigned int)(c)) & 0xff) << (s))
-#define FOURCC(a, b, c, d)     (B(d, 24) | B(c, 16) | B(b, 8) | B(a, 0))
-#define FOURCC_STR(id)      C(id, 0), C(id, 8), C(id, 16), C(id, 24)
-#define FOURCC_ID(str)      FOURCC(((char*)str)[0], ((char*)str)[1], ((char*)str)[2], ((char*)str)[3])
-
 /* check condition */
 #define TBM_SURFACE_RETURN_IF_FAIL(cond) {\
        if (!(cond)) {\
@@ -250,25 +246,30 @@ _deinit_surface_bufmgr(void)
 /* LCOV_EXCL_STOP */
 
 static int
-_tbm_surface_internal_is_valid(tbm_surface_h surface)
+_tbm_surface_internal_magic_check(tbm_surface_h surface)
 {
-       tbm_surface_h old_data = NULL;
+       if (surface->magic != TBM_SURFACE_MAGIC)
+               return 0;
 
-       TBM_RETURN_VAL_IF_FAIL(g_surface_bufmgr, 0);
-       TBM_RETURN_VAL_IF_FAIL(surface, 0);
+       return 1;
+}
 
-       if (!LIST_IS_EMPTY(&g_surface_bufmgr->surf_list)) {
-               LIST_FOR_EACH_ENTRY(old_data, &g_surface_bufmgr->surf_list, item_link) {
-                       if (old_data == surface)
-                               return 1;
-               }
+static int
+_tbm_surface_internal_is_valid(tbm_surface_h surface)
+{
+       if (!surface) {
+               _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);
+               TBM_ERR("error: No valid tbm_surface is NULL\n");
+               return 0;
        }
 
-       _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);
-
-       TBM_ERR("error: No valid tbm_surface(%p)\n", surface);
+       if (!_tbm_surface_internal_magic_check(surface)) {
+               _tbm_set_last_result(TBM_ERROR_INVALID_PARAMETER);
+               TBM_ERR("error: No valid tbm_surface(%p)\n", surface);
+               return 0;
+       }
 
-       return 0;
+       return 1;
 }
 
 static int
@@ -353,6 +354,7 @@ _tbm_surface_internal_destroy(tbm_surface_h surface)
        }
 
        LIST_DEL(&surface->item_link);
+       surface->magic = 0;
 
        free(surface);
        surface = NULL;
@@ -720,9 +722,6 @@ tbm_surface_internal_create_with_flags(int width, int height,
        int bo_idx;
        int i, j;
        bool bufmgr_initialized = false;
-       tbm_bo bo = NULL;
-       void *bo_priv = NULL;
-       tbm_backend_bo_data *bo_data = NULL;
        tbm_error_e error;
 
        _tbm_surface_mutex_lock();
@@ -752,6 +751,7 @@ tbm_surface_internal_create_with_flags(int width, int height,
                /* LCOV_EXCL_STOP */
        }
 
+       surf->magic = TBM_SURFACE_MAGIC;
        surf->bufmgr = bufmgr;
        surf->info.width = width;
        surf->info.height = height;
@@ -803,70 +803,20 @@ tbm_surface_internal_create_with_flags(int width, int height,
                if (bufmgr->backend_module_data) {
                        if (bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format) {
                                /* LCOV_EXCL_START */
-                               bo = calloc(1, sizeof(struct _tbm_bo));
-                               if (!bo) {
-                                       TBM_ERR("fail to alloc bo struct\n");
-                                       _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-                                       goto alloc_bo_fail;
-                               }
-
-                               bo->bufmgr = surf->bufmgr;
-
-                               _tbm_bufmgr_mutex_lock();
-
-                               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_format(bufmgr->bufmgr_data, format, i,
-                                                                                                                               width, height, flags, &error);
-                               if (!bo_data) {
-                                       TBM_ERR("fail to alloc bo priv. error(%d)\n", error);
-                                       _tbm_set_last_result(error);
-                                       free(bo);
-                                       _tbm_bufmgr_mutex_unlock();
+                               surf->bos[i] = tbm_bo_alloc_with_format(bufmgr, format, i, width, height, flags, &error);
+                               if (!surf->bos[i]) {
+                                       TBM_ERR("fail to tbm_bo_alloc_with_format idx:%d\n", i);
                                        goto alloc_bo_fail;
                                }
-                               bo->bo_data = bo_data;
-
-                               bo->ref_cnt = 1;
-                               bo->flags = flags;
-                               LIST_INITHEAD(&bo->user_data_list);
-
-                               LIST_ADD(&bo->item_link, &surf->bufmgr->bo_list);
-
-                               _tbm_bufmgr_mutex_unlock();
-
-                               surf->bos[i] = bo;
                                /* LCOV_EXCL_STOP */
                        } else if (bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format && (flags & TBM_BO_TILED)) {
-                               bo = calloc(1, sizeof(struct _tbm_bo));
-                               if (!bo) {
-                                       TBM_ERR("fail to alloc bo struct\n");
-                                       _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-                                       goto alloc_bo_fail;
-                               }
-
-                               bo->bufmgr = surf->bufmgr;
-
-                               _tbm_bufmgr_mutex_lock();
-
-                               bo_data = bufmgr->bufmgr_func->bufmgr_alloc_bo_with_tiled_format(bufmgr->bufmgr_data, width, height, surf->info.bpp/8, format, flags, i, &error);
-                               if (!bo_data) {
-                                       TBM_ERR("fail to alloc bo priv. error(%d)\n", error);
-                                       _tbm_set_last_result(error);
-                                       free(bo);
-                                       _tbm_bufmgr_mutex_unlock();
+                               /* LCOV_EXCL_START */
+                               surf->bos[i] = tbm_bo_alloc_with_tiled_format(bufmgr, width, height, surf->info.bpp/8, format, flags, i, &error);
+                               if (!surf->bos[i]) {
+                                       TBM_ERR("fail to tbm_bo_alloc_with_tiled_format idx:%d\n", i);
                                        goto alloc_bo_fail;
                                }
-                               bo->bo_data = bo_data;
-
-                               bo->ref_cnt = 1;
-                               bo->flags = flags;
-                               LIST_INITHEAD(&bo->user_data_list);
-
-                               LIST_ADD(&bo->item_link, &surf->bufmgr->bo_list);
-
-                               _tbm_bufmgr_mutex_unlock();
-
-                               surf->bos[i] = bo;
-
+                               /* LCOV_EXCL_STOP */
                        } else {
                                surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
                                if (!surf->bos[i]) {
@@ -877,37 +827,12 @@ tbm_surface_internal_create_with_flags(int width, int height,
                } else {
                        if (bufmgr->backend->surface_bo_alloc) {
                                /* LCOV_EXCL_START */
-                               bo = calloc(1, sizeof(struct _tbm_bo));
-                               if (!bo) {
-                                       TBM_ERR("fail to alloc bo struct\n");
-                                       _tbm_set_last_result(TBM_ERROR_OUT_OF_MEMORY);
-                                       goto alloc_bo_fail;
-                               }
-
-                               bo->bufmgr = surf->bufmgr;
-
-                               _tbm_bufmgr_mutex_lock();
-
-                               bo_priv = bufmgr->backend->surface_bo_alloc(bo, width, height, format, flags, i);
-                               if (!bo_priv) {
-                                       TBM_ERR("fail to alloc bo priv\n");
-                                       _tbm_set_last_result(TBM_ERROR_INVALID_OPERATION);
-                                       free(bo);
-                                       _tbm_bufmgr_mutex_unlock();
+                               surf->bos[i] = tbm_bo_alloc_with_surface(bufmgr, width, height, format, flags, i);
+                               if (!surf->bos[i]) {
+                                       TBM_ERR("fail to tbm_bo_alloc_with_surface idx:%d\n", i);
                                        goto alloc_bo_fail;
-                               }
-                               bo->priv = bo_priv;
-
-                               bo->ref_cnt = 1;
-                               bo->flags = flags;
-                               LIST_INITHEAD(&bo->user_data_list);
-
-                               LIST_ADD(&bo->item_link, &surf->bufmgr->bo_list);
-
-                               _tbm_bufmgr_mutex_unlock();
-
-                               surf->bos[i] = bo;
                                /* LCOV_EXCL_STOP */
+                               }
                        } else {
                                surf->bos[i] = tbm_bo_alloc(bufmgr, bo_size, flags);
                                if (!surf->bos[i]) {
@@ -998,6 +923,7 @@ tbm_surface_internal_create_with_bos(tbm_surface_info_s *info,
                /* LCOV_EXCL_STOP */
        }
 
+       surf->magic = TBM_SURFACE_MAGIC;
        surf->bufmgr = bufmgr;
        surf->info.width = info->width;
        surf->info.height = info->height;
@@ -1621,11 +1547,44 @@ _tbm_surface_internal_debug_data_create(char *key, char *value)
        return debug_data;
 }
 
+static void
+_tbm_surface_internal_debug_data_value_update(tbm_surface_debug_data *debug_data, char *value)
+{
+       if (!debug_data->value && !value)
+               return;
+
+       if (debug_data->value && value && !strncmp(debug_data->value, value, strlen(debug_data->value)))
+               return;
+
+       if (debug_data->value)
+               free(debug_data->value);
+
+       if (value)
+               debug_data->value = strdup(value);
+       else
+               debug_data->value = NULL;
+}
+
+static tbm_surface_debug_data *
+_tbm_surface_internal_debug_data_find(struct list_head *list, char *key)
+{
+       tbm_surface_debug_data *debug_data = NULL;
+
+       if (LIST_IS_EMPTY(list))
+               return NULL;
+
+       LIST_FOR_EACH_ENTRY(debug_data, list, item_link) {
+               if (!strncmp(debug_data->key, key, strlen(debug_data->key)))
+                       return debug_data;
+       }
+
+       return NULL;
+}
+
 int
 tbm_surface_internal_set_debug_data(tbm_surface_h surface, char *key, char *value)
 {
        tbm_surface_debug_data *debug_data = NULL;
-       tbm_surface_debug_data *old_data = NULL, *tmp = NULL;
        tbm_bufmgr bufmgr = NULL;
 
        _tbm_surface_mutex_lock();
@@ -1638,53 +1597,30 @@ tbm_surface_internal_set_debug_data(tbm_surface_h surface, char *key, char *valu
 
        TBM_SURFACE_RETURN_VAL_IF_FAIL(bufmgr, 0);
 
-       if (!LIST_IS_EMPTY(&surface->debug_data_list)) {
-               LIST_FOR_EACH_ENTRY(old_data, &surface->debug_data_list, item_link) {
-                       if (old_data) {
-                               if (!strcmp(old_data->key, key)) {
-                                       if (old_data->value && value && !strncmp(old_data->value, value, strlen(old_data->value))) {
-                                               TBM_TRACE_SURFACE_INTERNAL("tbm_surface(%p) Already exist key(%s) and value(%s)!\n", surface, key, value);
-                                               goto add_debug_key_list;
-                                       }
-
-                                       if (old_data->value)
-                                               free(old_data->value);
-
-                                       if (value)
-                                               old_data->value = strdup(value);
-                                       else
-                                               old_data->value = NULL;
-
-                                       goto add_debug_key_list;
-                               }
-                       }
+       debug_data = _tbm_surface_internal_debug_data_find(&surface->debug_data_list, key);
+       if (debug_data) {
+               _tbm_surface_internal_debug_data_value_update(debug_data, value);
+       } else {
+               debug_data = _tbm_surface_internal_debug_data_create(key, value);
+               if (!debug_data) {
+                       TBM_ERR("error: tbm_surface(%p) key(%s) value(%s)\n", surface, key, value);
+                       _tbm_surface_mutex_unlock();
+                       return 0;
                }
+
+               LIST_ADD(&debug_data->item_link, &surface->debug_data_list);
        }
 
-       debug_data = _tbm_surface_internal_debug_data_create(key, value);
+       /* add new debug key to list */
+       debug_data = _tbm_surface_internal_debug_data_find(&bufmgr->debug_key_list, key);
        if (!debug_data) {
-               TBM_ERR("error: tbm_surface(%p) key(%s) value(%s)\n", surface, key, value);
-               _tbm_surface_mutex_unlock();
-               return 0;
+               debug_data = _tbm_surface_internal_debug_data_create(key, NULL);
+               if (debug_data)
+                       LIST_ADDTAIL(&debug_data->item_link, &bufmgr->debug_key_list);
        }
 
        TBM_TRACE_SURFACE_INTERNAL("tbm_surface(%p) key(%s) value(%s)\n", surface, key, value);
 
-       LIST_ADD(&debug_data->item_link, &surface->debug_data_list);
-
-add_debug_key_list:
-       if (!LIST_IS_EMPTY(&bufmgr->debug_key_list)) {
-               LIST_FOR_EACH_ENTRY_SAFE(old_data, tmp, &bufmgr->debug_key_list, item_link) {
-                       if (!strcmp(old_data->key, key)) {
-                               _tbm_surface_mutex_unlock();
-                               return 1;
-                       }
-               }
-       }
-
-       debug_data = _tbm_surface_internal_debug_data_create(key, NULL);
-       LIST_ADD(&debug_data->item_link, &bufmgr->debug_key_list);
-
        _tbm_surface_mutex_unlock();
 
        return 1;