From 67ba6a0480287f670a129789e6a8a215abf361e4 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Fri, 20 May 2016 17:15:33 +0900 Subject: Add excluding coverage comment Change-Id: I17890ea2be57f587ab86a070a6ae4182cc6361b7 --- src/tbm_bufmgr.c | 25 ++++++++++++++++++------- src/tbm_bufmgr_backend.c | 2 ++ src/tbm_drm_helper_client.c | 2 ++ src/tbm_drm_helper_server.c | 3 ++- src/tbm_surface_internal.c | 41 ++++++++++++++++++++++------------------- src/tbm_surface_queue.c | 2 ++ 6 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/tbm_bufmgr.c b/src/tbm_bufmgr.c index 5923b6d..e115b5f 100644 --- a/src/tbm_bufmgr.c +++ b/src/tbm_bufmgr.c @@ -77,6 +77,7 @@ _tbm_set_last_result(tbm_error_e err) tbm_last_error = err; } +/* LCOV_EXCL_START */ static void _tbm_util_get_appname_brief(char *brief) { @@ -128,6 +129,7 @@ _tbm_util_get_appname_from_pid(long pid, char *str) snprintf(str, sizeof(cmdline), "%s", cmdline); } +/* LCOV_EXCL_STOP */ tbm_user_data *user_data_lookup(struct list_head *user_data_list, unsigned long key) @@ -347,6 +349,7 @@ _tbm_bo_unref(tbm_bo bo) } +/* LCOV_EXCL_START */ static int _check_version(TBMModuleVersionInfo *data) { @@ -479,6 +482,7 @@ _tbm_load_module(tbm_bufmgr bufmgr, int fd) return ret; } +/* LCOV_EXCL_STOP */ tbm_bufmgr tbm_bufmgr_init(int fd) @@ -487,6 +491,7 @@ tbm_bufmgr_init(int fd) pthread_mutex_lock(&gLock); + /* LCOV_EXCL_START */ #ifdef HAVE_DLOG env = getenv("TBM_DLOG"); if (env) { @@ -506,6 +511,7 @@ tbm_bufmgr_init(int fd) bDebug = 0; } #endif + /* LCOV_EXCL_STOP */ /* initialize buffer manager */ if (gBufMgr) { @@ -531,6 +537,7 @@ tbm_bufmgr_init(int fd) /* load bufmgr priv from env */ if (!_tbm_load_module(gBufMgr, gBufMgr->fd)) { + /* LCOV_EXCL_START */ _tbm_set_last_result(TBM_BO_ERROR_LOAD_MODULE_FAILED); TBM_LOG_E("error : Fail to load bufmgr backend\n"); @@ -538,6 +545,7 @@ tbm_bufmgr_init(int fd) gBufMgr = NULL; pthread_mutex_unlock(&gLock); return NULL; + /* LCOV_EXCL_STOP */ } /* log for tbm backend_flag */ @@ -550,6 +558,7 @@ tbm_bufmgr_init(int fd) 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); @@ -558,6 +567,7 @@ tbm_bufmgr_init(int fd) gBufMgr = NULL; pthread_mutex_unlock(&gLock); return NULL; + /* LCOV_EXCL_STOP */ } /* setup the lock_type */ @@ -1128,12 +1138,6 @@ tbm_bo_delete_user_data(tbm_bo bo, unsigned long key) return 1; } -tbm_error_e -tbm_get_last_error(void) -{ - return tbm_last_error; -} - unsigned int tbm_bufmgr_get_capability(tbm_bufmgr bufmgr) { @@ -1158,6 +1162,13 @@ tbm_bo_get_flags(tbm_bo bo) return bo->flags; } +/* LCOV_EXCL_START */ +tbm_error_e +tbm_get_last_error(void) +{ + return tbm_last_error; +} + void tbm_bufmgr_debug_show(tbm_bufmgr bufmgr) { @@ -1291,4 +1302,4 @@ tbm_bufmgr_bind_native_display(tbm_bufmgr bufmgr, void *NativeDisplay) return 1; } - +/* LCOV_EXCL_STOP */ \ No newline at end of file diff --git a/src/tbm_bufmgr_backend.c b/src/tbm_bufmgr_backend.c index a467d2a..f2fa37e 100644 --- a/src/tbm_bufmgr_backend.c +++ b/src/tbm_bufmgr_backend.c @@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "tbm_bufmgr_int.h" +/* LCOV_EXCL_START */ tbm_bufmgr_backend tbm_backend_alloc(void) { tbm_bufmgr_backend bufmgr_backend; @@ -108,3 +109,4 @@ int tbm_backend_is_display_server(void) return 1; } +/* LCOV_EXCL_STOP */ \ No newline at end of file diff --git a/src/tbm_drm_helper_client.c b/src/tbm_drm_helper_client.c index 9f85694..aaf096d 100644 --- a/src/tbm_drm_helper_client.c +++ b/src/tbm_drm_helper_client.c @@ -50,6 +50,7 @@ struct wayland_tbm_drm_auth_client { uint32_t capabilities; }; +/* LCOV_EXCL_START */ static void handle_tbm_drm_authentication_info(void *data, struct wl_tbm_drm_auth *wl_tbm_drm_auth, const char *device_name, uint32_t capabilities, int32_t auth_fd) { @@ -169,3 +170,4 @@ tbm_drm_helper_get_auth_info(int *auth_fd, char **device, uint32_t *capabilities return 1; } +/* LCOV_EXCL_STOP */ \ No newline at end of file diff --git a/src/tbm_drm_helper_server.c b/src/tbm_drm_helper_server.c index 3a30fd3..1c0395b 100644 --- a/src/tbm_drm_helper_server.c +++ b/src/tbm_drm_helper_server.c @@ -58,6 +58,7 @@ struct wayland_tbm_drm_auth_server { struct wayland_tbm_drm_auth_server *tbm_drm_auth_srv; +/* LCOV_EXCL_START */ static void _send_server_auth_info(struct wayland_tbm_drm_auth_server *tbm_drm_auth_srv, struct wl_resource *resource) @@ -263,4 +264,4 @@ tbm_drm_helper_unset_tbm_master_fd(void) return; } } - +/* LCOV_EXCL_STOP */ \ No newline at end of file diff --git a/src/tbm_surface_internal.c b/src/tbm_surface_internal.c index a193779..7c678e5 100644 --- a/src/tbm_surface_internal.c +++ b/src/tbm_surface_internal.c @@ -45,6 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static tbm_bufmgr g_surface_bufmgr; static pthread_mutex_t tbm_surface_lock; +/* LCOV_EXCL_START */ char * _tbm_surface_internal_format_to_str(tbm_format format) { @@ -171,6 +172,7 @@ _tbm_surface_internal_format_to_str(tbm_format format) return "unknwon"; } } +/* LCOV_EXCL_STOP */ static bool _tbm_surface_mutex_init(void) @@ -568,7 +570,7 @@ tbm_surface_internal_create_with_flags(int width, int height, } if (mgr->backend->surface_bo_alloc) { - + /* LCOV_EXCL_START */ tbm_bo bo = NULL; void *bo_priv = NULL; @@ -601,7 +603,7 @@ tbm_surface_internal_create_with_flags(int width, int height, pthread_mutex_unlock(&surf->bufmgr->lock); surf->bos[i] = bo; - + /* LCOV_EXCL_STOP */ } else { surf->bos[i] = tbm_bo_alloc(mgr, bo_size, flags); } @@ -1030,22 +1032,6 @@ tbm_surface_internal_get_plane_bo_idx(tbm_surface_h surface, int plane_idx) return bo_idx; } -unsigned int -_tbm_surface_internal_get_debug_pid(tbm_surface_h surface) -{ - TBM_RETURN_VAL_IF_FAIL(surface, 0); - - return surface->debug_pid; -} - -void -tbm_surface_internal_set_debug_pid(tbm_surface_h surface, unsigned int pid) -{ - TBM_RETURN_IF_FAIL(tbm_surface_internal_is_valid(surface)); - - surface->debug_pid = pid; -} - int tbm_surface_internal_add_user_data(tbm_surface_h surface, unsigned long key, tbm_data_free data_free_func) @@ -1135,6 +1121,23 @@ tbm_surface_internal_delete_user_data(tbm_surface_h surface, return 1; } +/* LCOV_EXCL_START */ +unsigned int +_tbm_surface_internal_get_debug_pid(tbm_surface_h surface) +{ + TBM_RETURN_VAL_IF_FAIL(surface, 0); + + return surface->debug_pid; +} + +void +tbm_surface_internal_set_debug_pid(tbm_surface_h surface, unsigned int pid) +{ + TBM_RETURN_IF_FAIL(tbm_surface_internal_is_valid(surface)); + + surface->debug_pid = pid; +} + typedef struct _tbm_surface_dump_info tbm_surface_dump_info; typedef struct _tbm_surface_dump_buf_info tbm_surface_dump_buf_info; @@ -1598,4 +1601,4 @@ void tbm_surface_internal_dump_shm_buffer(void *ptr, int w, int h, int stride, TBM_LOG_I("Dump %s \n", buf_info->name); } - +/*LCOV_EXCL_STOP*/ diff --git a/src/tbm_surface_queue.c b/src/tbm_surface_queue.c index 62adc52..95406a2 100644 --- a/src/tbm_surface_queue.c +++ b/src/tbm_surface_queue.c @@ -109,6 +109,7 @@ struct _tbm_surface_queue { void *alloc_cb_data; }; +/* LCOV_EXCL_START */ static queue_node * _queue_node_create(void) { @@ -1184,3 +1185,4 @@ tbm_surface_queue_sequence_create(int queue_size, int width, return surface_queue; } +/* LCOV_EXCL_STOP */ \ No newline at end of file -- cgit v1.2.3