Remove the unnecessary g_thread_exit call

 - Remove warning log

Change-Id: I32e4faccc901f877048589aaa48456a4e89b017c

diff --git a/packaging/mused.spec b/packaging/mused.spec
index b9d8959b36ca811e92a6c4b98a2139acc3022d44..2bdfa4f472e214144cd0872d7bc03a57624bea05 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.112
+Version:    0.3.113
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server_connection.c b/server/src/muse_server_connection.c
index b1fe5007bf05c48f9e9b95776161732badd054c5..20dede24345d1515cb74e405760f5331d96f309a 100644 (file)
--- a/server/src/muse_server_connection.c
+++ b/server/src/muse_server_connection.c
@@ -180,10 +180,8 @@ gboolean ms_connection_get_state(ms_connection_state_e *state)
 
        if (fd_count == 0) { /* There is no muse instance during timeout, which is not error case */
                timersub(&tv_c, &tv_s, &tv_r);
-               if (tv_r.tv_sec != MS_TIMEOUT_SEC) {
-                       LOGW("sleep (10 ms) because epoll_wait does not wait for events during timeout, which would occur high cpu usage");
+               if (tv_r.tv_sec != MS_TIMEOUT_SEC)
                        usleep(10000); /* 10ms */
-               }
                return FALSE;
        } else if (fd_count < 0) { /* When an error occurs, epoll_wait() returns -1 */
                strerror_r(errno, err_msg, MUSE_MSG_LEN_MAX);

diff --git a/server/src/muse_server_ipc.c b/server/src/muse_server_ipc.c
index c845f3d95ebbe74aa73590c1da1923f2608162fa..679976a4ad57a58f0f73ee11c41f3f04e5bcda57 100644 (file)
--- a/server/src/muse_server_ipc.c
+++ b/server/src/muse_server_ipc.c
@@ -317,8 +317,6 @@ static gpointer _ms_ipc_dispatch_worker(gpointer data)
        muse_core_gcov_flush();
 #endif
 
-       g_thread_exit(NULL);
-
        return NULL;
 }