From: Laurent Aimar <fenrir@videolan.org>
Date: Mon, 22 Dec 2008 09:20:41 +0000 (+0100)
Subject: Added vlc_object_assert_locked utility.
X-Git-Tag: 1.0.0-pre1~1523
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5aa33f1fab766842d59a7dcb7aa462aab9c681cf;p=vlc

Added vlc_object_assert_locked utility.
---

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index d870d0df01..a034a6b654 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -127,6 +127,10 @@ VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
 #define vlc_object_unlock( obj ) \
     __vlc_object_unlock( VLC_OBJECT( obj ) )
 
+VLC_EXPORT( void, __vlc_object_assert_locked, ( vlc_object_t * ) );
+#define vlc_object_assert_locked( obj ) \
+    __vlc_object_assert_locked( VLC_OBJECT( obj ) )
+
 VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
 #define vlc_object_wait( obj ) \
     __vlc_object_wait( VLC_OBJECT( obj ) )
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 61869c6cc1..7ec2be26b4 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -481,6 +481,7 @@ vlc_mutex_init
 vlc_mutex_init_recursive
 vlc_mutex_lock
 vlc_mutex_unlock
+__vlc_object_assert_locked
 __vlc_object_attach
 __vlc_object_create
 __vlc_object_detach
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 070193dd40..36aeb7631e 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -331,6 +331,10 @@ void __vlc_object_unlock( vlc_object_t *obj )
     vlc_assert_locked( &(vlc_internals(obj)->lock) );
     vlc_mutex_unlock( &(vlc_internals(obj)->lock) );
 }
+void __vlc_object_assert_locked( vlc_object_t *obj )
+{
+    vlc_assert_locked( &(vlc_internals(obj)->lock) );
+}
 
 #ifdef WIN32
 # include <winsock2.h>