Disable MUSE_USE_RM_READY to avoid deadlock issue

 - It is for avoiding the deadlock issue, which is MUSE_USE_RM_READY's _ms_resource_manager_owner_name_changed_cb()
   executing through dbus when dbus error (eg. GDBus.Error:net.stc.iptables.Error.Failed: OPERATION_FAILED) occurs.
   Thread 2 (LWP 2715):
   #0  __lll_lock_wait_private (futex=0xf7567584 <main_arena>) at ./lowlevellock.c:35
   #1  0xf74a0dc0 in __GI___libc_malloc (bytes=bytes@entry=6) at malloc.c:3064
   #2  0xf75d3c64 in g_malloc (n_bytes=6) at ../glib/gmem.c:99
   #3  0xf75fa978 in g_variant_format_string_scan_type (string=string@entry=0xf76e359c "(sss)", limit=limit@entry=0x0, endptr=endptr@entry=0xffdc7e60) at ../glib/gvariant.c:4597
   #4  0xf75faa06 in valid_format_string (format_string=format_string@entry=0xf76e359c "(sss)", single=single@entry=1, value=value@entry=0xf3eb42a0) at ../glib/gvariant.c:4617
   #5  0xf75fb040 in g_variant_get (value=value@entry=0xf3eb42a0, format_string=0xf76e359c "(sss)") at ../glib/gvariant.c:5499
   #6  0xf76ddf4a in _ms_resource_manager_owner_name_changed_cb (con=<optimized out>, sender_name=<optimized out>, object_path=0xf580ec60 "", interface_name=<optimized out>, signal_name=0xe3fef958 "", parameters=0xf3eb42a0, user_data=0x0) at /usr/src/debug/mused-0.3.131/server/src/muse_server_system.c:269
 - Remove unnecessary log

Change-Id: I7aaab8ce0b6fae86ebed8b912ca2b00fa87363e0

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 6416b2c190c8ea42431b38a91bfffe29338401ef..a951dcd5e68943c6ea7fd035a18094e5a1a78921 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.131
+Version:    0.3.132
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -78,8 +78,8 @@ export LDFLAGS+=" -lgcov "
 export CFLAGS+=" -DMUSE_REGISTER_VIP -DMUSE_USE_LWIPC -DMUSE_TTRACE_LOG"
 %cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1 -DMUSE_TTRACE_LOG=1 -DMUSE_USE_LWIPC=1
 %else
-export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE -DMUSE_USE_WATCHDOG -DMUSE_USE_RM_READY"
-%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_GTESTS_BUILD=%{?gtests:1}%{!?gtests:0} -DMUSE_USE_RM_READY=1
+export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE -DMUSE_USE_WATCHDOG"
+%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_GTESTS_BUILD=%{?gtests:1}%{!?gtests:0}
 %endif
 
 make %{?jobs:-j%jobs}

diff --git a/server/src/muse_server_module.c b/server/src/muse_server_module.c
index 9bfa397e0157ef804fd47b76f2412472d3365d30..6d3b9b66ec6a009666690266f6141bb14b91deef 100644 (file)
--- a/server/src/muse_server_module.c
+++ b/server/src/muse_server_module.c
@@ -150,11 +150,9 @@ int ms_module_dispatch(muse_module_h m)
        }
 #endif
 
-       LOGD(">>> module lock");
        g_mutex_lock(&module->lock);
        g_module_symbol(module->dllsym, DISPATCHER, (gpointer *)&dispatcher);
        g_mutex_unlock(&module->lock);
-       LOGD("<<< module unlock");
 
        if (dispatcher && dispatcher[api]) {
                if (ms_is_log_enabled()) {