Change remove with unlink of async-signal-safe function

Change-Id: I9851fccfb38337802ceb59bf96ff32d738a691dc

diff --git a/server/src/muse_server_config.c b/server/src/muse_server_config.c
index 1b32b40..f9af605 100644 (file)
--- a/server/src/muse_server_config.c
+++ b/server/src/muse_server_config.c
@@ -328,8 +328,7 @@ void ms_config_remove_lockfile(void)
 
        muse_return_if_fail(conf);
 
-       if (remove(conf->lockfile) == -1)
-               LOGE("remove %s failed [errno : %d]", conf->lockfile, errno);
+       (void)unlink(conf->lockfile);
 }
 
 int ms_config_get_min_timeout(void)

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 3127a3b..b34662f 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -982,12 +982,7 @@ int ms_deinit(void)
                LOGE("Fail to deinitialize server watchdog");
 #endif
 
-#ifdef MUSE_USE_LWIPC
-       if (LwipcResetEvent(MUSE_SERVER_READY) < 0)
-               LOGE("Fail to reset light weight IPC");
-#else
        ms_remove_ready_file();
-#endif
 
        retval = muse_server->retval;
        muse_core_fd_close(muse_server->msg_fd);
@@ -1046,11 +1041,10 @@ void ms_check_memory(int pid)
 
        ms_connection_lock(connection);
 
-       used_pss = ms_system_get_memory_usage(pid);
-
-       LOGW("[%d] Proportional set size %d (KByte)", pid, used_pss);
-
        if (g_queue_is_empty(connection->instance_queue) && ms_is_server_ready()) {
+               used_pss = ms_system_get_memory_usage(pid);
+
+               LOGW("[%d] Proportional set size %d (KByte)", pid, used_pss);
                memory_threshold = ms_config_get_memory_threshold();
                if (used_pss > memory_threshold) {
                        ms_set_state(MUSE_SERVER_STATE_IDLE);
@@ -1286,13 +1280,10 @@ gboolean ms_create_ready_file(void)
 void ms_remove_ready_file(void)
 {
 #ifdef MUSE_USE_LWIPC
-       if (LwipcResetEvent(MUSE_SERVER_READY) < 0)
-               LOGE("Fail to reset light weight IPC");
+       (void)LwipcResetEvent(MUSE_SERVER_READY);
 #else
-       if (remove(MUSE_SERVER_READY) == -1)
-               LOGE("remove %s failed [errno : %d]", MUSE_SERVER_READY, errno);
-
-       if (remove(MUSE_DEFAULT_PIDFILE) == -1)
-               LOGE("remove %s failed [errno : %d]", MUSE_DEFAULT_PIDFILE, errno);
+       (void)unlink(MUSE_SERVER_READY);
+       (void)unlink(MUSE_DEFAULT_PIDFILE);
 #endif
 }
+

diff --git a/server/src/muse_server_signal.c b/server/src/muse_server_signal.c
index b5e85c4..74909e9 100644 (file)
--- a/server/src/muse_server_signal.c
+++ b/server/src/muse_server_signal.c
@@ -33,7 +33,6 @@ static struct sigaction ms_pipe_old_action;
 static GMutex signal_lock;
 
 static void _ms_signal_handler(int signo);
-static void _ms_signal_debug_pid_info(int pid);
 static void _ms_signal_backtrace(void *arg);
 static void _ms_signal_sigaction(int signo, siginfo_t *si, void *arg);
 
@@ -66,12 +65,6 @@ static void _ms_signal_handler(int signo)
        raise(signo);
 }
 
-static void _ms_signal_debug_pid_info(int pid)
-{
-       if (ms_is_log_enabled())
-               ms_log_debug_pid_info(pid);
-}
-
 static void _ms_signal_backtrace(void *arg)
 {
        void *trace[MUSE_MSG_LEN];
@@ -132,10 +125,8 @@ static void _ms_signal_sigaction(int signo, siginfo_t *si, void *arg)
        muse_return_if_fail(arg);
 
        ms_remove_ready_file();
-
        ms_config_remove_lockfile();
 
-       _ms_signal_debug_pid_info(si->si_pid);
        _ms_signal_backtrace(arg);
        _ms_signal_handler(signo);
 }