#include <vlc_common.h>
#include "../libvlc.h"
-#include <vlc_vout.h>
#include <vlc_aout.h>
#include "audio_output/aout_internal.h"
-#include <vlc_access.h>
-#include <vlc_demux.h>
-#include <vlc_stream.h>
-
-#include <vlc_sout.h>
-#include "stream_output/stream_output.h"
-
#include "vlc_interface.h"
#include "vlc_codec.h"
-#include "vlc_filter.h"
#include "variables.h"
#ifndef WIN32
# include <fcntl.h>
# include <errno.h> /* ENOSYS */
#endif
-#ifdef HAVE_SYS_EVENTFD_H
+
+#include <assert.h>
+
+#if defined (HAVE_SYS_EVENTFD_H)
# include <sys/eventfd.h>
+# define HAVE_EVENTFD 1
#endif
-#include <assert.h>
+
/*****************************************************************************
* Local prototypes
p_new->p_private = NULL;
/* 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;
switch( i_type )
{
- case VLC_OBJECT_INTF:
- i_size = sizeof(intf_thread_t);
- psz_type = "interface";
- break;
case VLC_OBJECT_DECODER:
i_size = sizeof(decoder_t);
psz_type = "decoder";
break;
- case VLC_OBJECT_PACKETIZER:
- i_size = sizeof(decoder_t);
- psz_type = "packetizer";
- break;
case VLC_OBJECT_AOUT:
i_size = sizeof(aout_instance_t);
psz_type = "audio output";
vlc_destructor_t pf_destructor )
{
vlc_object_internals_t *p_priv = vlc_internals(p_this );
+
+ vlc_spin_lock( &p_priv->ref_spin );
p_priv->pf_destructor = pf_destructor;
+ vlc_spin_unlock( &p_priv->ref_spin );
}
/**
FREENULL( p_this->psz_object_name );
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 )
}
-/** Inter-object signaling */
-
-void __vlc_object_lock( vlc_object_t *obj )
-{
- vlc_mutex_lock( &(vlc_internals(obj)->lock) );
-}
-
-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>
# include <ws2tcpip.h>
#define close( a ) closesocket (a)
#endif /* WIN32 */
+static vlc_mutex_t pipe_lock = VLC_STATIC_MUTEX;
+
/**
* Returns the readable end of a pipe that becomes readable once termination
* of the object is requested (vlc_object_kill()).
{
vlc_object_internals_t *internals = vlc_internals( obj );
- vlc_object_lock (obj);
+ vlc_mutex_lock (&pipe_lock);
if (internals->pipes[0] == -1)
{
/* This can only ever happen if someone killed us without locking: */
write (internals->pipes[1], &(uint64_t){ 1 }, sizeof (uint64_t));
}
}
- vlc_object_unlock (obj);
+ vlc_mutex_unlock (&pipe_lock);
return internals->pipes[0];
}
-/**
- * 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.
int fd = -1;
vlc_thread_cancel( p_this );
- vlc_object_lock( p_this );
+ vlc_mutex_lock( &pipe_lock );
if( !p_this->b_die )
{
fd = priv->pipes[1];
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 );
+ vlc_mutex_unlock( &pipe_lock );
if (fd != -1)
{
if( b_should_destroy )
{
- /* We have no children */
- assert (internals->i_children == 0);
parent = p_this->p_parent;
#ifndef NDEBUG
if (parent)
/* Detach from parent to protect against FIND_CHILDREN */
vlc_object_detach_unlocked (p_this);
+
+ /* We have no children */
+ assert (internals->i_children == 0);
}
libvlc_unlock (p_this->p_libvlc);
projects / vlc / blobdiff