From: YoungHun Kim Date: Tue, 6 Dec 2016 11:30:11 +0000 (+0900) Subject: Fix the issue of qdata X-Git-Tag: accepted/tizen/common/20161214.160305~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d73f1ca1f236ad38272721e0a1156fd310eada42;p=platform%2Fcore%2Fmultimedia%2Fmmsvc-core.git Fix the issue of qdata Change-Id: Ibda3e18d083d88897d9f5b79c0b54b82e81d6e9f --- diff --git a/packaging/mused.spec b/packaging/mused.spec index 8d1c8ee..37160bf 100644 --- a/packaging/mused.spec +++ b/packaging/mused.spec @@ -1,6 +1,6 @@ Name: mused Summary: A Multimedia Daemon in Tizen Native API -Version: 0.1.38 +Version: 0.1.39 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/muse_core_ipc.c b/src/muse_core_ipc.c index 958250f..7a53e27 100644 --- a/src/muse_core_ipc.c +++ b/src/muse_core_ipc.c @@ -229,8 +229,7 @@ static gpointer _muse_core_ipc_data_worker(gpointer data) } else { if (module) { module->ch[MUSE_CHANNEL_DATA].fd = fd; - qdata = _muse_core_ipc_new_qdata(&recv_buf, cur_len, &alloc_size); - while (qdata) { + while ((qdata = _muse_core_ipc_new_qdata(&recv_buf, cur_len, &alloc_size)) != NULL) { qdata_size = qdata->header.size + sizeof(muse_recv_data_head_t); if (cur_len > qdata_size) { alloc_size = alloc_size - qdata_size; @@ -692,7 +691,7 @@ int muse_core_ipc_push_data(int sock_fd, const char *data, int size, uint64_t da header.size = size; header.id = data_id; - LOGI("header.marker : %x [fd (%d) is valid : %d]", header.marker, sock_fd, muse_core_ipc_fd_is_valid(sock_fd)); + LOGI("header.marker : %x header.size : %d header.id : %"G_GUINT64_FORMAT"", header.marker, sock_fd, header.size, header.id); if ((ret = send(sock_fd, &header, sizeof(muse_recv_data_head_t), 0)) < 0) LOGE("fail to send msg"); diff --git a/src/muse_core_server.c b/src/muse_core_server.c index de79bcb..da7d668 100644 --- a/src/muse_core_server.c +++ b/src/muse_core_server.c @@ -93,10 +93,6 @@ int main(int argc, char **argv) trace_begin("MUSE:START"); #endif -#ifdef MUSE_TTRACE_LOG - trace_begin("MUSE:START"); -#endif - _muse_core_server_setup_syslog(); /* daemonizing */