[vlc-devel] [PATCH 2/5] upnp: remove m_server_list_lock, p_server_list is already protected by s_lock

[Steve Lhomme]

---
 modules/services_discovery/upnp.cpp | 8 ++------
 modules/services_discovery/upnp.hpp | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index adc2329..7facaad 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1224,14 +1224,12 @@ UpnpInstanceWrapper::UpnpInstanceWrapper()
     : m_handle( -1 )
     , m_refcount( 0 )
 {
-    vlc_mutex_init( &m_server_list_lock );
 }
 
 UpnpInstanceWrapper::~UpnpInstanceWrapper()
 {
     UpnpUnRegisterClient( m_handle );
     UpnpFinish();
-    vlc_mutex_destroy( &m_server_list_lock );
 }
 
 UpnpInstanceWrapper *UpnpInstanceWrapper::get(vlc_object_t *p_obj, services_discovery_t *p_sd)
@@ -1297,7 +1295,6 @@ UpnpInstanceWrapper *UpnpInstanceWrapper::get(vlc_object_t *p_obj, services_disc
     // This assumes a single UPNP SD instance
     if (p_server_list != NULL)
     {
-        vlc_mutex_locker lock( &s_instance->m_server_list_lock );
         assert(!UpnpInstanceWrapper::p_server_list);
         UpnpInstanceWrapper::p_server_list = p_server_list;
     }
@@ -1309,7 +1306,6 @@ void UpnpInstanceWrapper::release(bool isSd)
     vlc_mutex_locker lock( &s_lock );
     if ( isSd )
     {
-        vlc_mutex_locker lock( &m_server_list_lock );
         delete UpnpInstanceWrapper::p_server_list;
         UpnpInstanceWrapper::p_server_list = NULL;
     }
@@ -1327,8 +1323,8 @@ UpnpClient_Handle UpnpInstanceWrapper::handle() const
 
 int UpnpInstanceWrapper::Callback(Upnp_EventType event_type, void *p_event, void *p_user_data)
 {
-    UpnpInstanceWrapper* self = static_cast<UpnpInstanceWrapper*>( p_user_data );
-    vlc_mutex_locker lock( &self->m_server_list_lock );
+    VLC_UNUSED(p_user_data);
+    vlc_mutex_locker lock( &s_lock );
     if ( !UpnpInstanceWrapper::p_server_list )
         return 0;
     SD::MediaServerList::Callback( event_type, p_event, UpnpInstanceWrapper::p_server_list );
diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp
index 44fde4f..f30dfeb 100644
--- a/modules/services_discovery/upnp.hpp
+++ b/modules/services_discovery/upnp.hpp
@@ -72,7 +72,6 @@ private:
     static UpnpInstanceWrapper* s_instance;
     static vlc_mutex_t s_lock;
     UpnpClient_Handle m_handle;
-    vlc_mutex_t m_server_list_lock; // protect p_server_list
     static SD::MediaServerList* p_server_list;
     int m_refcount;
 };
-- 
2.8.1