Merge branch 'tizen' into tizen_8.0

 - Update the threshold memory

Change-Id: Id38bace3ac5a86952bb2dc0b0287a86f3b62b460

diff --cc server/include/muse_server_config.h
index 64b0079433ab9a2fc3a37a444373e1e5325f89f5,64b0079433ab9a2fc3a37a444373e1e5325f89f5..76e2d44af116a9579e40da31bf1efd04a55a4cd7
--- 1/server/include/muse_server_config.h
--- 2/server/include/muse_server_config.h
+++ b/server/include/muse_server_config.h
@@@ -57,7 -57,7 +57,7 @@@ extern "C" 
  #define DEFAULT_WATCHDOG_MIN_TIMEOUT                  5
  #define DEFAULT_WATCHDOG_MAX_TIMEOUT                  60
  #define DEFAULT_DISPATCH_WATCHDOG_TIMEOUT             10
--#define DEFAULT_MEMORY_LEAK_THRESHOLD                 50000 /* 50MB */
++#define DEFAULT_MEMORY_LEAK_THRESHOLD                 100000 /* 100MB */
  #define DEFAULT_CPU_THRESHOLD                                 100 /* 100% */
  #define DEFAULT_WATCHDOG_DISABLED_API_INDEX           -1 /* Watchdog is applied to all dispatcher functions */
  #define DEFAULT_MAX_INSTANCE                                  -1 /* Unlimited */

diff --cc server/src/muse_server_private.c
index a91646200e483850c880484e1b9e5922b382773f,e8bada8d10b6aac8aea21c4aba934bc4e1bed720..03d066f446638c3a46c9374726bfd87e83b59b34
--- 1/server/src/muse_server_private.c
--- 2/server/src/muse_server_private.c
+++ b/server/src/muse_server_private.c
@@@ -1188,11 -1188,11 +1188,11 @@@ void ms_check_cpu_memory(void
                used_pss = ms_system_get_memory_usage(muse_server->pid);
                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();
  
++              LOGW("[%d] Proportional set size %d ( > %d ? ) KB (CPU %d %%)", muse_server->pid, used_pss, memory_threshold, cpu_usage);
++
                if (used_pss >= memory_threshold) {
                        ms_log_process_info(muse_server->pid);