From: YoungHun Kim <yh8004.kim@samsung.com>
Date: Mon, 7 Feb 2022 04:50:41 +0000 (+0900)
Subject: Remove the duplicate variable of server structure
X-Git-Tag: submit/tizen/20220207.085737^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e77e6413cd8a07ee99b94a896228c2573a6e9ff;p=platform%2Fcore%2Fmultimedia%2Fmmsvc-core.git

Remove the duplicate variable of server structure

Change-Id: I8d1259d42e5a4056dd7991d0ab6eed936d37c298
---

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 9a6070dd..7e8e2245 100644
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.140
+Version:    0.3.141
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
diff --git a/server/include/muse_server_private.h b/server/include/muse_server_private.h
index 6add38f0..02e4bbbc 100644
--- a/server/include/muse_server_private.h
+++ b/server/include/muse_server_private.h
@@ -81,7 +81,6 @@ typedef struct _muse_server {
 	int stop;
 	int retval;
 	int pid;
-	int cpu_threshold;
 	tbm_bufmgr bufmgr;
 	GMainLoop *main_loop;
 	ms_diag_t diag;
diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index bcbe8ae0..1b8867c7 100644
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -645,8 +645,6 @@ static void _ms_init(void)
 
 	muse_core_create_fd_table();
 
-	muse_server->cpu_threshold = ms_config_get_cpu_threshold();
-
 	muse_server->main_loop = g_main_loop_new(NULL, FALSE);
 	muse_return_if_fail(muse_server->main_loop);
 
@@ -1111,7 +1109,7 @@ int ms_deinit(void)
 
 void ms_check_cpu_memory(void)
 {
-	int used_pss, memory_threshold, cpu_usage;
+	int used_pss, memory_threshold, cpu_usage, cpu_threshold;
 	char err_msg[MUSE_MSG_LEN_MAX] = {'\0',};
 	ms_connection_t *connection = NULL;
 
@@ -1127,13 +1125,15 @@ void ms_check_cpu_memory(void)
 		cpu_usage = muse_core_get_process_cpu_usage(muse_server->pid);
 
 		LOGW("[%d] Proportional set size %d (KByte) (CPU %d %%)", muse_server->pid, used_pss, cpu_usage);
+
 		memory_threshold = ms_config_get_memory_threshold();
+		cpu_threshold = ms_config_get_cpu_threshold();
 
-		if (used_pss >= memory_threshold || cpu_usage >= muse_server->cpu_threshold) {
+		if (used_pss >= memory_threshold || cpu_usage >= cpu_threshold) {
 			ms_log_process_info(muse_server->pid);
 
 			snprintf(err_msg, sizeof(err_msg), "[Memory Leak] %d >= %d (KByte) [CPU] %d >= %d %%",
-				used_pss, memory_threshold, cpu_usage, muse_server->cpu_threshold);
+				used_pss, memory_threshold, cpu_usage, cpu_threshold);
 
 			LOGE("%s", err_msg);
 			ms_connection_unlock(connection);