1. Fix crash - change initialization for list of GMutex and GCond
Change-Id: I58717ed47e86fe85f1d7c5bcdd1be4e9919b5a42
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
gpointer user_cb[MUSE_RECORDER_EVENT_TYPE_NUM];
gpointer user_data[MUSE_RECORDER_EVENT_TYPE_NUM];
gchar recv_msg[MUSE_RECORDER_MSG_MAX_LENGTH];
gpointer user_cb[MUSE_RECORDER_EVENT_TYPE_NUM];
gpointer user_data[MUSE_RECORDER_EVENT_TYPE_NUM];
gchar recv_msg[MUSE_RECORDER_MSG_MAX_LENGTH];
- GCond *api_cond;
- GMutex *api_mutex;
+ GCond api_cond[MUSE_RECORDER_API_MAX];
+ GMutex api_mutex[MUSE_RECORDER_API_MAX];
gint *api_activating;
gint *api_ret;
tbm_bufmgr bufmgr;
gint *api_activating;
gint *api_ret;
tbm_bufmgr bufmgr;
Name: capi-media-recorder
Summary: A Recorder API
Name: capi-media-recorder
Summary: A Recorder API
-Version: 0.2.14
-Release: 2
+Version: 0.2.15
+Release: 0
Group: Multimedia/API
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Group: Multimedia/API
License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
}
rec_msg = (recorder_message_s *)g_queue_pop_head(cb_info->msg_queue);
}
rec_msg = (recorder_message_s *)g_queue_pop_head(cb_info->msg_queue);
g_mutex_unlock(&cb_info->msg_handler_mutex);
g_mutex_unlock(&cb_info->msg_handler_mutex);
if (rec_msg == NULL) {
LOGE("NULL message");
g_mutex_lock(&cb_info->msg_handler_mutex);
continue;
}
if (rec_msg == NULL) {
LOGE("NULL message");
g_mutex_lock(&cb_info->msg_handler_mutex);
continue;
}
if (api < MUSE_RECORDER_API_MAX) {
g_mutex_lock(&cb_info->api_mutex[api]);
if (api < MUSE_RECORDER_API_MAX) {
g_mutex_lock(&cb_info->api_mutex[api]);
if (muse_recorder_msg_get(ret, rec_msg->recv_msg)) {
cb_info->api_ret[api] = ret;
cb_info->api_activating[api] = 1;
if (muse_recorder_msg_get(ret, rec_msg->recv_msg)) {
cb_info->api_ret[api] = ret;
cb_info->api_activating[api] = 1;
static recorder_cb_info_s *_client_callback_new(gint sockfd)
{
recorder_cb_info_s *cb_info = NULL;
static recorder_cb_info_s *_client_callback_new(gint sockfd)
{
recorder_cb_info_s *cb_info = NULL;
- GCond *tmp_cond = NULL;
- GMutex *tmp_mutex = NULL;
gint *tmp_activating = NULL;
gint *tmp_ret = NULL;
gint *tmp_activating = NULL;
gint *tmp_ret = NULL;
g_return_val_if_fail(sockfd > 0, NULL);
g_return_val_if_fail(sockfd > 0, NULL);
g_mutex_init(&cb_info->idle_event_mutex);
g_cond_init(&cb_info->idle_event_cond);
g_mutex_init(&cb_info->idle_event_mutex);
g_cond_init(&cb_info->idle_event_cond);
- tmp_cond = g_new0(GCond, MUSE_RECORDER_API_MAX);
- if (tmp_cond == NULL) {
- LOGE("tmp_cond failed");
- goto ErrorExit;
- }
-
- tmp_mutex = g_new0(GMutex, MUSE_RECORDER_API_MAX);
- if (tmp_mutex == NULL) {
- LOGE("tmp_mutex failed");
- goto ErrorExit;
+ for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
+ g_mutex_init(&cb_info->api_mutex[i]);
+ g_cond_init(&cb_info->api_cond[i]);
}
tmp_activating = g_new0(gint, MUSE_RECORDER_API_MAX);
}
tmp_activating = g_new0(gint, MUSE_RECORDER_API_MAX);
- cb_info->api_cond = tmp_cond;
- cb_info->api_mutex = tmp_mutex;
cb_info->api_activating = tmp_activating;
cb_info->api_ret = tmp_ret;
cb_info->api_activating = tmp_activating;
cb_info->api_ret = tmp_ret;
cb_info->msg_handler_thread = NULL;
}
cb_info->msg_handler_thread = NULL;
}
+ for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
+ g_mutex_clear(&cb_info->api_mutex[i]);
+ g_cond_clear(&cb_info->api_cond[i]);
+ }
+
g_mutex_clear(&cb_info->msg_handler_mutex);
g_cond_clear(&cb_info->msg_handler_cond);
g_mutex_clear(&cb_info->idle_event_mutex);
g_mutex_clear(&cb_info->msg_handler_mutex);
g_cond_clear(&cb_info->msg_handler_cond);
g_mutex_clear(&cb_info->idle_event_mutex);
- if (tmp_cond) {
- g_free(tmp_cond);
- tmp_cond = NULL;
- }
- if (tmp_mutex) {
- g_free(tmp_mutex);
- tmp_mutex = NULL;
- }
if (tmp_activating) {
g_free(tmp_activating);
tmp_activating = NULL;
if (tmp_activating) {
g_free(tmp_activating);
tmp_activating = NULL;
static void _client_callback_destroy(recorder_cb_info_s *cb_info)
{
static void _client_callback_destroy(recorder_cb_info_s *cb_info)
{
g_return_if_fail(cb_info != NULL);
LOGD("MSG receive thread[%p] destroy", cb_info->msg_recv_thread);
g_return_if_fail(cb_info != NULL);
LOGD("MSG receive thread[%p] destroy", cb_info->msg_recv_thread);
g_mutex_clear(&cb_info->idle_event_mutex);
g_cond_clear(&cb_info->idle_event_cond);
g_mutex_clear(&cb_info->idle_event_mutex);
g_cond_clear(&cb_info->idle_event_cond);
+ for (i = 0 ; i < MUSE_RECORDER_API_MAX ; i++) {
+ g_mutex_clear(&cb_info->api_mutex[i]);
+ g_cond_clear(&cb_info->api_cond[i]);
+ }
+
LOGD("event thread removed");
if (cb_info->bufmgr) {
tbm_bufmgr_deinit(cb_info->bufmgr);
cb_info->bufmgr = NULL;
}
LOGD("event thread removed");
if (cb_info->bufmgr) {
tbm_bufmgr_deinit(cb_info->bufmgr);
cb_info->bufmgr = NULL;
}
- if (cb_info->api_cond) {
- g_free(cb_info->api_cond);
- cb_info->api_cond = NULL;
- }
- if (cb_info->api_mutex) {
- g_free(cb_info->api_mutex);
- cb_info->api_mutex = NULL;
- }
if (cb_info->api_activating) {
g_free(cb_info->api_activating);
cb_info->api_activating = NULL;
if (cb_info->api_activating) {
g_free(cb_info->api_activating);
cb_info->api_activating = NULL;