diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/recorder.c | 46 |
2 files changed, 45 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6fe52a..257929d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -fprofile-arcs -ftest-coverage") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") diff --git a/src/recorder.c b/src/recorder.c index 846cc9d..54ec1a6 100644 --- a/src/recorder.c +++ b/src/recorder.c @@ -350,6 +350,7 @@ static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *re } break; } +//LCOV_EXCL_START case MUSE_RECORDER_EVENT_TYPE_ERROR: { int error = 0; @@ -370,6 +371,7 @@ static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *re cb_info->user_data[event]); break; } +//LCOV_EXCL_STOP case MUSE_RECORDER_EVENT_TYPE_FOREACH_SUPPORTED_AUDIO_ENCODER: { int codec = 0; @@ -959,9 +961,11 @@ static void *_recorder_msg_recv_func(gpointer data) while (g_atomic_int_get(&cb_info->msg_recv_running)) { recv_length = muse_core_msg_recv(cb_info->fd, recv_msg); if (recv_length <= 0) { +//LCOV_EXCL_START cb_info->is_server_connected = FALSE; LOGE("receive msg failed - server disconnected"); break; +//LCOV_EXCL_STOP } recv_msg[recv_length] = '\0'; @@ -980,6 +984,7 @@ static void *_recorder_msg_recv_func(gpointer data) if (single_length < MUSE_RECORDER_MSG_MAX_LENGTH) { /* check remained msg */ if (remained_length > 0) { +//LCOV_EXCL_START if (remained_msg) { strncpy(single_msg, remained_msg, remained_length); strncpy(single_msg + remained_length, recv_msg + prev_pos, single_length); @@ -994,6 +999,7 @@ static void *_recorder_msg_recv_func(gpointer data) } remained_length = 0; +//LCOV_EXCL_STOP } else { strncpy(single_msg, recv_msg + prev_pos, single_length); single_msg[single_length] = '\0'; @@ -1016,6 +1022,7 @@ static void *_recorder_msg_recv_func(gpointer data) /* check incompleted message */ if (recv_msg[recv_length - 1] != '}') { +//LCOV_EXCL_START remained_length = recv_length - prev_pos; LOGW("incompleted message [len %d]", remained_length); @@ -1027,6 +1034,7 @@ static void *_recorder_msg_recv_func(gpointer data) } else { LOGE("failed to alloc for remained msg"); } +//LCOV_EXCL_STOP } else { remained_length = 0; } @@ -1035,6 +1043,7 @@ static void *_recorder_msg_recv_func(gpointer data) LOGD("client cb exit - server connected %d", cb_info->is_server_connected); if (!cb_info->is_server_connected) { +//LCOV_EXCL_START /* send error msg for server disconnection */ char *error_msg = muse_core_msg_new(MUSE_RECORDER_CB_EVENT, MUSE_TYPE_INT, "error", RECORDER_ERROR_SERVICE_DISCONNECTED, @@ -1058,6 +1067,7 @@ static void *_recorder_msg_recv_func(gpointer data) error_msg = NULL; LOGE("add error msg for service disconnection done"); +//LCOV_EXCL_STOP } CB_HANDLER_EXIT: @@ -1102,6 +1112,7 @@ static bool __create_msg_handler_thread(recorder_msg_handler_info_s *handler_inf handler_info->thread = g_thread_try_new(thread_name, _recorder_msg_handler_func, (gpointer)handler_info, NULL); if (handler_info->thread == NULL) { +//LCOV_EXCL_START LOGE("t:%d thread failed", type); g_mutex_clear(&handler_info->mutex); @@ -1110,6 +1121,7 @@ static bool __create_msg_handler_thread(recorder_msg_handler_info_s *handler_inf handler_info->queue = NULL; return false; +//LCOV_EXCL_STOP } LOGD("t:%d done", type); @@ -1213,7 +1225,7 @@ static recorder_cb_info_s *_recorder_client_callback_new(gint sockfd) cb_info->is_server_connected = TRUE; return cb_info; - +//LCOV_EXCL_START ErrorExit: if (cb_info) { __destroy_msg_handler_thread(&cb_info->msg_handler_info); @@ -1233,6 +1245,7 @@ ErrorExit: } return NULL; +//LCOV_EXCL_STOP } static int _recorder_client_wait_for_cb_return(muse_recorder_api_e api, recorder_cb_info_s *cb_info, int time_out) @@ -1519,9 +1532,11 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty sock_fd = muse_client_new(); if (sock_fd < 0) { +//LCOV_EXCL_START LOGE("muse_client_new failed - returned fd %d", sock_fd); ret = RECORDER_ERROR_INVALID_OPERATION; goto _ERR_RECORDER_EXIT; +//LCOV_EXCL_STOP } if (type == MUSE_RECORDER_TYPE_AUDIO) { @@ -1542,9 +1557,11 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty } if (!send_msg) { +//LCOV_EXCL_START LOGE("NULL msg"); ret = RECORDER_ERROR_OUT_OF_MEMORY; goto _ERR_RECORDER_EXIT; +//LCOV_EXCL_STOP } LOGD("sock_fd : %d, msg : %s", sock_fd, send_msg); @@ -1555,9 +1572,11 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty send_msg = NULL; if (send_ret < 0) { +//LCOV_EXCL_START LOGE("send msg failed %d", errno); ret = RECORDER_ERROR_INVALID_OPERATION; goto _ERR_RECORDER_EXIT; +//LCOV_EXCL_STOP } pc->cb_info = _recorder_client_callback_new(sock_fd); @@ -1579,15 +1598,19 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty muse_recorder_msg_get_pointer(handle, pc->cb_info->recv_msg); if (handle == 0) { +//LCOV_EXCL_START LOGE("Receiving Handle Failed!!"); ret = RECORDER_ERROR_INVALID_OPERATION; goto _ERR_RECORDER_AFTER_CREATE; +//LCOV_EXCL_STOP } if (!_recorder_client_get_root_directory(&root_directory) || root_directory == NULL) { +//LCOV_EXCL_START LOGE("failed to get root directory of internal storage"); ret = RECORDER_ERROR_INVALID_OPERATION; goto _ERR_RECORDER_AFTER_CREATE; +//LCOV_EXCL_STOP } LOGD("root directory [%s]", root_directory); @@ -1616,7 +1639,7 @@ static int _recorder_create_common(recorder_h *recorder, muse_recorder_type_e ty LOGD("done"); return RECORDER_ERROR_NONE; - +//LCOV_EXCL_START _ERR_RECORDER_AFTER_CREATE: _recorder_msg_send(MUSE_RECORDER_API_DESTROY, pc->cb_info, &destroy_ret, RECORDER_CB_TIMEOUT); LOGE("destroy return 0x%x", destroy_ret); @@ -1645,6 +1668,7 @@ _ERR_RECORDER_EXIT: } return ret; +//LCOV_EXCL_STOP } @@ -1759,6 +1783,7 @@ int recorder_unprepare(recorder_h recorder) LOGD("ENTER"); if (pc->camera) { +//LCOV_EXCL_START ret = camera_get_state(pc->camera, &camera_state); if (ret != CAMERA_ERROR_NONE) { LOGE("failed to get camera state 0x%x", ret); @@ -1772,6 +1797,7 @@ int recorder_unprepare(recorder_h recorder) return RECORDER_ERROR_INVALID_OPERATION; } } +//LCOV_EXCL_STOP } _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT); @@ -1797,6 +1823,7 @@ int recorder_start(recorder_h recorder) LOGD("ENTER"); if (pc->camera) { +//LCOV_EXCL_START ret = recorder_get_state(recorder, ¤t_state); if (ret != RECORDER_ERROR_NONE) { LOGE("failed to get current state 0x%x", ret); @@ -1810,6 +1837,7 @@ int recorder_start(recorder_h recorder) return RECORDER_ERROR_INVALID_OPERATION; } } +//LCOV_EXCL_STOP } _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_NO_TIMEOUT); @@ -1859,6 +1887,7 @@ int recorder_commit(recorder_h recorder) LOGD("ENTER"); if (pc->camera) { +//LCOV_EXCL_START ret = recorder_get_state(recorder, ¤t_state); if (ret != RECORDER_ERROR_NONE) { LOGE("failed to get current state 0x%x", ret); @@ -1872,6 +1901,7 @@ int recorder_commit(recorder_h recorder) return RECORDER_ERROR_INVALID_OPERATION; } } +//LCOV_EXCL_STOP } _recorder_msg_send(api, pc->cb_info, &ret, RECORDER_CB_TIMEOUT); @@ -3399,9 +3429,11 @@ int recorder_get_device_state(recorder_type_e type, recorder_device_state_e *sta sock_fd = muse_client_new(); if (sock_fd < 0) { +//LCOV_EXCL_START LOGE("muse_client_new failed - returned fd %d", sock_fd); ret = RECORDER_ERROR_INVALID_OPERATION; goto _GET_DEVICE_STATE_EXIT; +//LCOV_EXCL_STOP } send_msg = muse_core_msg_new(MUSE_RECORDER_API_GET_DEVICE_STATE, @@ -3409,9 +3441,11 @@ int recorder_get_device_state(recorder_type_e type, recorder_device_state_e *sta MUSE_TYPE_INT, PARAM_RECORDER_TYPE, type, NULL); if (!send_msg) { +//LCOV_EXCL_START LOGE("NULL msg"); ret = RECORDER_ERROR_OUT_OF_MEMORY; goto _GET_DEVICE_STATE_EXIT; +//LCOV_EXCL_STOP } LOGD("sock_fd : %d, msg : %s", sock_fd, send_msg); @@ -3422,22 +3456,28 @@ int recorder_get_device_state(recorder_type_e type, recorder_device_state_e *sta send_msg = NULL; if (ret < 0) { +//LCOV_EXCL_START LOGE("send msg failed %d", errno); ret = RECORDER_ERROR_INVALID_OPERATION; goto _GET_DEVICE_STATE_EXIT; +//LCOV_EXCL_STOP } ret = muse_core_msg_recv(sock_fd, recv_msg); if (ret <= 0) { +//LCOV_EXCL_START LOGE("recv msg failed %d", errno); ret = RECORDER_ERROR_INVALID_OPERATION; goto _GET_DEVICE_STATE_EXIT; +//LCOV_EXCL_STOP } if (!muse_recorder_msg_get(ret, recv_msg)) { +//LCOV_EXCL_START LOGE("failed to get return value from msg [%s]", recv_msg); ret = RECORDER_ERROR_INVALID_OPERATION; goto _GET_DEVICE_STATE_EXIT; +//LCOV_EXCL_STOP } if (ret == RECORDER_ERROR_NONE) { @@ -3528,6 +3568,7 @@ int recorder_add_device_state_changed_cb(recorder_device_state_changed_cb callba _DONE: if (ret != RECORDER_ERROR_NONE) { +//LCOV_EXCL_START if (info) { g_free(info); info = NULL; @@ -3537,6 +3578,7 @@ _DONE: g_object_unref(g_rec_dev_state_changed_cb_conn); g_rec_dev_state_changed_cb_conn = NULL; } +//LCOV_EXCL_STOP } g_mutex_unlock(&g_rec_dev_state_changed_cb_lock); |