Remove the duplicate ms_log_get_cmd_info

Change-Id: I37d6c5aaa4d2a9120cfdc9388166ffd349cc6d6b

diff --git a/core/include/muse_core.h b/core/include/muse_core.h
index 76e0075e753868d82e024cef20bdfcf40ed98adf..2b504b7a0e4b658cd5dbcb716c88da58dc87adf7 100644 (file)
--- a/core/include/muse_core.h
+++ b/core/include/muse_core.h
@@ -109,8 +109,11 @@ void muse_core_dump_fd_state(int fd);
 void muse_core_create_fd_table(void);
 void muse_core_remove_all_fd_table(void);
 void muse_core_destroy_fd_table(void);
-void muse_core_log_process_info(int pid);
-void muse_core_log_file_info(const char *path);
+void muse_core_log_process_thread_info(int pid);
+void muse_core_log_process_opened_fd(int pid);
+void muse_core_log_process_cpu_memory(int pid);
+void muse_core_log_file_list(const char *path);
+void muse_core_log_cmd_info(char *cmd);
 void muse_core_remove_symlink(const char *path);
 
 #ifdef __cplusplus

diff --git a/core/src/muse_core.c b/core/src/muse_core.c
index 6a7742ae47f3cb80af62bf2a9515a811449d5479..074a99dfb54ac78d19e9a9aa44afd6ee96fcd0e9 100644 (file)
--- a/core/src/muse_core.c
+++ b/core/src/muse_core.c
@@ -188,7 +188,7 @@ static json_object *_muse_msg_json_find_obj(json_object *jobj, const char *find_
        return NULL;
 }
 
-static void _muse_log_get_cmd_info(char *cmd)
+void muse_core_log_cmd_info(char *cmd)
 {
        FILE *fp;
        char buf[MUSE_MSG_LEN_MAX];
@@ -416,7 +416,7 @@ int muse_core_msg_recv_fd(int sock_fd, char *buf, int buf_len, int *out_fd)
        if (!muse_core_msg_recv_len(sock_fd, (char *)&msg_info, sizeof(muse_msg_info_t))) {
                pid = (int)getpid();
                LOGE("[pid : %d] [fd : %d] msg info receive failed", pid, sock_fd);
-               muse_core_log_process_info(pid);
+               muse_core_log_process_thread_info(pid);
                return RECV_FAIL;
        }
 
@@ -759,20 +759,36 @@ void muse_core_get_cur_time(char *time_buf)
        snprintf(time_buf, MUSE_MSG_LEN_MAX, "%s.%03ld", cur_time, tv.tv_usec / 1000);
 }
 
-void muse_core_log_process_info(int pid)
+void muse_core_log_process_thread_info(int pid)
 {
        char cmd[MUSE_MSG_LEN_MAX];
 
        snprintf(cmd, sizeof(cmd), "/bin/cat /proc/%d/status | /bin/grep Threads", pid);
-       _muse_log_get_cmd_info(cmd);
+       muse_core_log_cmd_info(cmd);
 }
 
-void muse_core_log_file_info(const char *path)
+void muse_core_log_process_opened_fd(int pid)
+{
+       char cmd[MUSE_MSG_LEN_MAX];
+
+       snprintf(cmd, sizeof(cmd), "/bin/ls -alt /proc/%d/fd", pid);
+       muse_core_log_cmd_info(cmd);
+}
+
+void muse_core_log_process_cpu_memory(int pid)
+{
+       char cmd[MUSE_MSG_LEN_MAX];
+
+       snprintf(cmd, sizeof(cmd), "/bin/ps -Lo pcpu,pmem,tid,comm -p %d", pid);
+       muse_core_log_cmd_info(cmd);
+}
+
+void muse_core_log_file_list(const char *path)
 {
        char cmd[MUSE_MSG_LEN_MAX];
 
        snprintf(cmd, sizeof(cmd), "/bin/ls -alt %s", path);
-       _muse_log_get_cmd_info(cmd);
+       muse_core_log_cmd_info(cmd);
 }
 
 void muse_core_remove_symlink(const char *path)

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 08158314b98fe431fb2f2f7f6fa5f9c465f3149e..c8cf47128063217577c98ee1838e8d66a9a44814 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.65
+Version:    0.3.66
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause

diff --git a/server/include/muse_server_log.h b/server/include/muse_server_log.h
index 2418ae7391bb8cd6478b24017a68350ecfa381b8..a1f9e6753b0789521da6a3eae3d31cabbe1c14fd 100644 (file)
--- a/server/include/muse_server_log.h
+++ b/server/include/muse_server_log.h
@@ -45,7 +45,6 @@ void ms_log_deinit(ms_log_t *log);
 void ms_log_save_addr_name(int pid, gpointer addr);
 void ms_log_debug_pid_info(int pid);
 void ms_log_write(char *buf);
-void ms_log_get_cmd_info(char *cmd);
 
 #ifdef __cplusplus
 }

diff --git a/server/src/muse_server_log.c b/server/src/muse_server_log.c
index 150acada8fbac551887d7dd420742a0a2cc60e99..2c587d3673ac9e319e05999c4adc507399c31da5 100644 (file)
--- a/server/src/muse_server_log.c
+++ b/server/src/muse_server_log.c
@@ -374,21 +374,3 @@ void ms_log_write(char *buf)
                LOGE("fail to write new line character");
 }
 
-void ms_log_get_cmd_info(char *cmd)
-{
-       FILE *fp;
-       char buf[MUSE_MSG_LEN_MAX];
-
-       muse_return_if_fail(cmd);
-
-       fp = popen(cmd, "r");
-
-       if (fp) {
-               while (fgets(buf, MUSE_MSG_LEN_MAX, fp))
-                       LOGW("%s", buf);
-
-               if (pclose(fp) == -1)
-                       LOGE("Fail to pclose");
-       }
-}
-

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 5aca0883a72e073fde4a0f6f0a8aea2342629004..004bca7c132d327bf5cc9001548275d8da02cab6 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -208,7 +208,7 @@ static int _ms_new(muse_channel_e channel)
                errsv = errno;
                strerror_r(errsv, err_msg, MUSE_MSG_LEN_MAX);
                LOGE("[%d] socket bind failed (%d) %s", fd, errsv, err_msg);
-               muse_core_log_file_info(UDS_files[channel]);
+               muse_core_log_file_list(UDS_files[channel]);
                ms_log_user_group_info();
                if (errsv == EADDRINUSE)
                        unlink(addr_un.sun_path);
@@ -220,7 +220,7 @@ static int _ms_new(muse_channel_e channel)
        if (listen(fd, 5) == MUSE_ERR) {
                strerror_r(errno, err_msg, MUSE_MSG_LEN_MAX);
                LOGE("[%d] listen failed (%d) %s", fd, errno, err_msg);
-               muse_core_log_file_info(UDS_files[channel]);
+               muse_core_log_file_list(UDS_files[channel]);
                ms_log_user_group_info();
                close(fd);
                return MUSE_ERR;
@@ -851,16 +851,11 @@ int ms_get_pid(muse_module_h m)
 
 void ms_log_process_info(int pid)
 {
-       char cmd[MUSE_MSG_LEN_MAX];
+       muse_core_log_process_thread_info(pid);
 
-       snprintf(cmd, sizeof(cmd), "/bin/cat /proc/%d/status | grep Threads", pid);
-       ms_log_get_cmd_info(cmd);
+       muse_core_log_process_opened_fd(pid);
 
-       snprintf(cmd, sizeof(cmd), "/bin/ls -alt /proc/%d/fd", pid);
-       ms_log_get_cmd_info(cmd);
-
-       snprintf(cmd, sizeof(cmd), "/bin/ps -Lo pcpu,pmem,tid,comm -p %d", pid);
-       ms_log_get_cmd_info(cmd);
+       muse_core_log_process_cpu_memory(pid);
 }
 
 void ms_log_user_group_info(void)