Set whether to measure the memory through the configure file

 - It can be disabled according to needs, such as performance issues

Change-Id: I937233f4cd3fb3d0bfdad23783c21beba972533d
(cherry picked from commit 6da42e63e253555cbf36322cd86804dbf791f04e)

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

diff --git a/server/include/muse_server_config.h b/server/include/muse_server_config.h
index 8ce974fdf6a378e908e86a6638e545a5855f6cb2..2ce7d596820a2b318e64a725a1ac76fd78987d8e 100644 (file)
--- a/server/include/muse_server_config.h
+++ b/server/include/muse_server_config.h
@@ -31,6 +31,7 @@ extern "C" {
 
 #define MUSE_LOG                                                               "muse:logfile"
 #define MUSE_LOCK                                                              "muse:lockfile"
+#define MUSE_CHECK_CPU_MEMORY                                  "muse:check_cpu_memory"
 #define MUSE_LOG_PERIOD                                                        "muse:log_period"
 #define MUSE_WATCHDOG_MIN_TIMEOUT                              "muse:min_timeout"
 #define MUSE_WATCHDOG_MAX_TIMEOUT                              "muse:max_timeout"
@@ -76,6 +77,7 @@ typedef struct host_info {
 typedef struct ms_config {
        char *host[MUSE_MODULE_MAX];
        int host_cnt;
+       gboolean check_cpu_memory;
        gboolean log_enabled;
        char *lockfile;
        int log_period;
@@ -107,6 +109,7 @@ char *ms_config_get_preloaded_value(int idx);
 char *ms_config_get_lockfile(void);
 gboolean ms_config_is_log_enabled(void);
 void ms_config_remove_lockfile(void);
+gboolean ms_config_is_check_cpu_memory(void);
 int ms_config_get_log_period(void);
 int ms_config_get_min_timeout(void);
 int ms_config_get_max_timeout(void);

diff --git a/server/src/muse_server_config.c b/server/src/muse_server_config.c
index 57d02f06cd1a8cb56af825e139d1676b415c64a0..4da261cfaf077d2ada98826d2ecb970d1a679e74 100644 (file)
--- a/server/src/muse_server_config.c
+++ b/server/src/muse_server_config.c
@@ -89,6 +89,8 @@ static int _ms_config_parser(ms_config_t *conf)
                goto out;
        }
 
+       conf->check_cpu_memory = (gboolean)_ms_config_get_int(conf->muse_dict, MUSE_CHECK_CPU_MEMORY, TRUE);
+
        conf->log_period = _ms_config_get_int(conf->muse_dict, MUSE_LOG_PERIOD, DEFAULT_LOG_PERIOD);
 
        conf->min_timeout = _ms_config_get_int(conf->muse_dict, MUSE_WATCHDOG_MIN_TIMEOUT, DEFAULT_WATCHDOG_MIN_TIMEOUT);
@@ -331,6 +333,14 @@ void ms_config_remove_lockfile(void)
        unlink(conf->lockfile);
 }
 
+gboolean ms_config_is_check_cpu_memory(void)
+{
+       ms_config_t *conf = _ms_config_get_instance();
+       muse_return_val_if_fail(conf, FALSE);
+
+       return conf->check_cpu_memory;
+}
+
 int ms_config_get_log_period(void)
 {
        ms_config_t *conf = _ms_config_get_instance();

diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c
index 2522703a3f4d48df63d10d680b2d72838b569fd4..834626d42917e2263dfabfa15e31abfdf0c81f11 100644 (file)
--- a/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@ -499,7 +499,8 @@ static gpointer _ms_diag_check_connection_event_thread(gpointer data)
                if (dm->cmd == API_CREATE) {
                        /* can be updated if connection at the next patch */
                } else if (dm->cmd == API_DESTROY) {
-                       ms_check_cpu_memory();
+                       if (ms_config_is_check_cpu_memory())
+                               ms_check_cpu_memory();
                }
 
                g_free(dm);