Commit 5aa33f1f authored by Laurent Aimar's avatar Laurent Aimar

Added vlc_object_assert_locked utility.

parent 3e8dca47
...@@ -127,6 +127,10 @@ VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) ); ...@@ -127,6 +127,10 @@ VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
#define vlc_object_unlock( obj ) \ #define vlc_object_unlock( obj ) \
__vlc_object_unlock( VLC_OBJECT( 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 * ) ); VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
#define vlc_object_wait( obj ) \ #define vlc_object_wait( obj ) \
__vlc_object_wait( VLC_OBJECT( obj ) ) __vlc_object_wait( VLC_OBJECT( obj ) )
......
...@@ -481,6 +481,7 @@ vlc_mutex_init ...@@ -481,6 +481,7 @@ vlc_mutex_init
vlc_mutex_init_recursive vlc_mutex_init_recursive
vlc_mutex_lock vlc_mutex_lock
vlc_mutex_unlock vlc_mutex_unlock
__vlc_object_assert_locked
__vlc_object_attach __vlc_object_attach
__vlc_object_create __vlc_object_create
__vlc_object_detach __vlc_object_detach
......
...@@ -331,6 +331,10 @@ void __vlc_object_unlock( vlc_object_t *obj ) ...@@ -331,6 +331,10 @@ void __vlc_object_unlock( vlc_object_t *obj )
vlc_assert_locked( &(vlc_internals(obj)->lock) ); vlc_assert_locked( &(vlc_internals(obj)->lock) );
vlc_mutex_unlock( &(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 #ifdef WIN32
# include <winsock2.h> # include <winsock2.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment