From fc4676a31814542d4980c6f71f38f87aa98bc7b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 24 Jan 2009 20:42:11 +0200 Subject: [PATCH] Remove unused vlc_object_wait() --- include/vlc_objects.h | 7 ------- src/libvlc.h | 5 +---- src/libvlccore.sym | 1 - src/misc/objects.c | 35 ----------------------------------- 4 files changed, 1 insertion(+), 47 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 8edb63e58b..1513298012 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -123,13 +123,6 @@ VLC_EXPORT( void, __vlc_object_assert_locked, ( vlc_object_t * ) ); #define vlc_object_assert_locked( obj ) \ __vlc_object_assert_locked( VLC_OBJECT( obj ) ) -#if defined (__GNUC__) && !defined __cplusplus -__attribute__((deprecated)) -#endif -VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) ); -#define vlc_object_wait( obj ) \ - __vlc_object_wait( VLC_OBJECT( obj ) ) - VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) ); #define vlc_object_kill(a) \ __vlc_object_kill( VLC_OBJECT(a) ) diff --git a/src/libvlc.h b/src/libvlc.h index c9330e9b20..8d945b606a 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -45,9 +45,7 @@ void system_End ( libvlc_int_t * ); /* * Legacy object stuff that is still used within libvlccore (only) */ -void __vlc_object_signal_unlocked (vlc_object_t *); -#define vlc_object_signal_unlocked( obj ) \ - __vlc_object_signal_unlocked( VLC_OBJECT( obj ) ) +#define vlc_object_signal_unlocked( obj ) vlc_list_t *vlc_list_find( vlc_object_t *, int, int ); #define VLC_OBJECT_INTF (-4) @@ -168,7 +166,6 @@ typedef struct vlc_object_internals_t /* Objects thread synchronization */ vlc_mutex_t lock; - vlc_cond_t wait; int pipes[2]; /* Objects management */ diff --git a/src/libvlccore.sym b/src/libvlccore.sym index a6ed45edb6..f5896628f0 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -492,7 +492,6 @@ __vlc_object_lock __vlc_object_release __vlc_object_set_destructor __vlc_object_unlock -__vlc_object_wait vlc_poll vlc_rand_bytes vlc_recvmsg diff --git a/src/misc/objects.c b/src/misc/objects.c index 8e4f0ca9aa..8adf9d78a7 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -169,7 +169,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, /* Initialize mutexes and condvars */ vlc_mutex_init( &p_priv->lock ); - vlc_cond_init( &p_priv->wait ); vlc_mutex_init( &p_priv->var_lock ); vlc_cond_init( &p_priv->var_wait ); p_priv->pipes[0] = p_priv->pipes[1] = -1; @@ -299,7 +298,6 @@ static void vlc_object_destroy( vlc_object_t *p_this ) vlc_spin_destroy( &p_priv->ref_spin ); vlc_mutex_destroy( &p_priv->lock ); - vlc_cond_destroy( &p_priv->wait ); if( p_priv->pipes[1] != -1 && p_priv->pipes[1] != p_priv->pipes[0] ) close( p_priv->pipes[1] ); if( p_priv->pipes[0] != -1 ) @@ -423,38 +421,6 @@ int vlc_object_waitpipe( vlc_object_t *obj ) } -/** - * Suspends until another thread calls vlc_object_signal_unlocked(). - * The thread may be woken up earlier due to limitations of the underlying - * implementation. - * - * In new code, please use vlc_cond_wait() instead. - * - * This function is a cancellation point. In case of cancellation, the object - * will be in locked state. - */ -void __vlc_object_wait( vlc_object_t *obj ) -{ - vlc_object_internals_t *priv = vlc_internals( obj ); - vlc_assert_locked( &priv->lock); - vlc_cond_wait( &priv->wait, &priv->lock ); -} - - -/** - * Wakes up one thread waiting on the object. If no thread are (yet) waiting, - * nothing happens. - * - * Please do not use this function in new code as we are trying to untangle - * objects and threads. Use vlc_cond_wait() instead. - */ -void __vlc_object_signal_unlocked( vlc_object_t *obj ) -{ - vlc_assert_locked (&(vlc_internals(obj)->lock)); - vlc_cond_signal( &(vlc_internals(obj)->wait) ); -} - - /** * Requests termination of an object, cancels the object thread, and make the * object wait pipe (if it exists) readable. Not a cancellation point. @@ -472,7 +438,6 @@ void __vlc_object_kill( vlc_object_t *p_this ) p_this->b_die = true; } - vlc_cond_broadcast (&priv->wait); /* This also serves as a memory barrier toward vlc_object_alive(): */ vlc_object_unlock( p_this ); -- 2.39.2