#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 <limits.h>
+#include <assert.h>
+
+#if defined (HAVE_SYS_EVENTFD_H)
# include <sys/eventfd.h>
#endif
-#include <assert.h>
+
/*****************************************************************************
* Local prototypes
static void vlc_object_destroy( vlc_object_t *p_this );
static void vlc_object_detach_unlocked (vlc_object_t *p_this);
-#ifndef NDEBUG
-static void vlc_object_dump( vlc_object_t *p_this );
-#endif
/*****************************************************************************
* Local structure lock
*****************************************************************************/
-static void close_nocancel (int fd)
-{
- int canc = vlc_savecancel ();
- close (fd);
- vlc_restorecancel (canc);
-}
-
static void libvlc_lock (libvlc_int_t *p_libvlc)
{
vlc_mutex_lock (&(libvlc_priv (p_libvlc)->structure_lock));
p_priv->i_object_type = i_type;
p_new->psz_object_type = psz_type;
- p_new->psz_object_name = NULL;
+ p_priv->psz_name = NULL;
p_new->b_die = false;
p_new->b_error = false;
p_new->i_flags = p_this->i_flags
& (OBJECT_FLAGS_NODBG|OBJECT_FLAGS_QUIET|OBJECT_FLAGS_NOINTERACT);
- p_priv->p_vars = calloc( 16, sizeof( variable_t ) );
-
- if( !p_priv->p_vars )
- {
- free( p_priv );
- return NULL;
- }
+ p_priv->pp_vars = NULL;
if( p_this == NULL )
{
libvlc_int_t *self = (libvlc_int_t*)p_new;
p_new->p_libvlc = self;
vlc_mutex_init (&(libvlc_priv (self)->structure_lock));
- p_this = p_priv->next = p_priv->prev = p_new;
+ p_this = p_new;
}
else
p_new->p_libvlc = p_this->p_libvlc;
p_priv->pp_children = NULL;
p_priv->i_children = 0;
- 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;
- p_priv->next = p_this;
- libvlc_lock (p_new->p_libvlc);
- p_priv->prev = vlc_internals (p_this)->prev;
- vlc_internals (p_this)->prev = p_new;
- vlc_internals (p_priv->prev)->next = p_new;
- libvlc_unlock (p_new->p_libvlc);
-
if (p_new == VLC_OBJECT(p_new->p_libvlc))
{ /* TODO: should be in src/libvlc.c */
int canc = vlc_savecancel ();
- var_Create( p_new, "list", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_new, "list", DumpCommand, NULL );
var_Create( p_new, "tree", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
var_AddCallback( p_new, "tree", DumpCommand, NULL );
var_Create( p_new, "vars", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
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_ENCODER:
- i_size = sizeof(encoder_t);
- psz_type = "encoder";
- 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 );
+}
+
+static vlc_mutex_t name_lock = VLC_STATIC_MUTEX;
+
+#undef vlc_object_set_name
+int vlc_object_set_name(vlc_object_t *obj, const char *name)
+{
+ vlc_object_internals_t *priv = vlc_internals(obj);
+ char *newname = name ? strdup (name) : NULL;
+ char *oldname;
+
+ vlc_mutex_lock (&name_lock);
+ oldname = priv->psz_name;
+ priv->psz_name = newname;
+ vlc_mutex_unlock (&name_lock);
+
+ free (oldname);
+ return (priv->psz_name || !name) ? VLC_SUCCESS : VLC_ENOMEM;
+}
+
+#undef vlc_object_get_name
+char *vlc_object_get_name(const vlc_object_t *obj)
+{
+ vlc_object_internals_t *priv = vlc_internals(obj);
+ char *name;
+
+ vlc_mutex_lock (&name_lock);
+ name = priv->psz_name ? strdup (priv->psz_name) : NULL;
+ vlc_mutex_unlock (&name_lock);
+
+ return name;
}
/**
* no memmove calls have to be done. */
while( p_priv->i_vars )
{
- var_Destroy( p_this, p_priv->p_vars[p_priv->i_vars - 1].psz_name );
+ var_Destroy( p_this, p_priv->pp_vars[p_priv->i_vars - 1]->psz_name );
}
- free( p_priv->p_vars );
vlc_cond_destroy( &p_priv->var_wait );
vlc_mutex_destroy( &p_priv->var_lock );
free( p_this->psz_header );
- FREENULL( p_this->psz_object_name );
+ free( p_priv->psz_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: */
assert (internals->pipes[1] == -1);
-#ifdef HAVE_EVENTFD
+#if defined (HAVE_SYS_EVENTFD_H)
internals->pipes[0] = internals->pipes[1] = eventfd (0, 0);
if (internals->pipes[0] == -1)
#endif
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)
{
return p_found;
}
+
+static int objnamecmp(const vlc_object_t *obj, const char *name)
+{
+ char *objname = vlc_object_get_name(obj);
+ if (objname == NULL)
+ return INT_MIN;
+
+ int ret = strcmp (objname, name);
+ free (objname);
+ return ret;
+}
+
#undef vlc_object_find_name
/**
* Finds a named object and increment its reference count.
{
vlc_object_t *p_found;
+ /* Reading psz_object_name from a separate inhibits thread-safety.
+ * Use a libvlc address variable instead for that sort of things! */
+ msg_Warn( p_this, "%s(%s) is not safe!", __func__, psz_name );
/* If have the requested name ourselves, don't look further */
- if( !(i_mode & FIND_STRICT)
- && p_this->psz_object_name
- && !strcmp( p_this->psz_object_name, psz_name ) )
+ if( !(i_mode & FIND_STRICT) && !objnamecmp(p_this, psz_name) )
{
vlc_object_hold( p_this );
return p_this;
if( b_should_destroy )
{
- /* We have no children */
- assert (internals->i_children == 0);
parent = p_this->p_parent;
-
-#ifndef NDEBUG
- if( VLC_OBJECT(p_this->p_libvlc) == p_this )
- {
- /* Test for leaks */
- vlc_object_t *leaked = internals->next;
- while( leaked != p_this )
- {
- /* We are leaking this object */
- fprintf( stderr,
- "ERROR: leaking object (%p, type:%s, name:%s)\n",
- leaked, leaked->psz_object_type,
- leaked->psz_object_name );
- /* Dump object to ease debugging */
- vlc_object_dump( leaked );
- fflush(stderr);
- leaked = vlc_internals (leaked)->next;
- }
-
- if( internals->next != p_this )
- /* Dump libvlc object to ease debugging */
- vlc_object_dump( p_this );
- }
-#endif
- /* Remove the object from object list
- * so that it cannot be encountered by vlc_object_get() */
- vlc_internals (internals->next)->prev = internals->prev;
- vlc_internals (internals->prev)->next = internals->next;
-
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);
* This function recursively looks for a given object type. i_mode can be one
* of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
*****************************************************************************/
-vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
+vlc_list_t * vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
{
vlc_list_t *p_list;
int i_count = 0;
switch( i_mode & 0x000f )
{
case FIND_ANYWHERE:
- return vlc_list_find (p_this->p_libvlc, i_type, FIND_CHILD);
+ return vlc_list_find (VLC_OBJECT(p_this->p_libvlc), i_type, FIND_CHILD);
case FIND_CHILD:
libvlc_lock (p_this->p_libvlc);
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- libvlc_int_t *p_libvlc = p_this->p_libvlc;
-
(void)oldval; (void)p_data;
- if( *psz_cmd == 'l' )
- {
- vlc_object_t *cur = VLC_OBJECT (p_libvlc);
+ vlc_object_t *p_object = NULL;
- libvlc_lock (p_this->p_libvlc);
- do
+ if( *newval.psz_string )
+ {
+ /* try using the object's name to find it */
+ p_object = vlc_object_find_name( p_this, newval.psz_string,
+ FIND_ANYWHERE );
+ if( !p_object )
{
- PrintObject (cur, "");
- cur = vlc_internals (cur)->next;
+ return VLC_ENOOBJ;
}
- while (cur != VLC_OBJECT(p_libvlc));
- libvlc_unlock (p_this->p_libvlc);
}
- else
+
+ libvlc_lock (p_this->p_libvlc);
+ if( *psz_cmd == 't' )
{
- vlc_object_t *p_object = NULL;
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- if( *newval.psz_string )
- {
- /* try using the object's name to find it */
- p_object = vlc_object_find_name( p_this, newval.psz_string,
- FIND_ANYWHERE );
- if( !p_object )
- {
- return VLC_ENOOBJ;
- }
- }
+ if( !p_object )
+ p_object = VLC_OBJECT(p_this->p_libvlc);
- libvlc_lock (p_this->p_libvlc);
- if( *psz_cmd == 't' )
- {
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
-
- if( !p_object )
- p_object = VLC_OBJECT(p_this->p_libvlc);
+ psz_foo[0] = '|';
+ DumpStructure( p_object, 0, psz_foo );
+ }
+ else if( *psz_cmd == 'v' )
+ {
+ int i;
- psz_foo[0] = '|';
- DumpStructure( p_object, 0, psz_foo );
- }
- else if( *psz_cmd == 'v' )
- {
- int i;
+ if( !p_object )
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- if( !p_object )
- p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
+ PrintObject( p_object, "" );
- PrintObject( p_object, "" );
+ vlc_mutex_lock( &vlc_internals( p_object )->var_lock );
+ if( !vlc_internals( p_object )->i_vars )
+ printf( " `-o No variables\n" );
+ for( i = 0; i < vlc_internals( p_object )->i_vars; i++ )
+ {
+ const variable_t *p_var = vlc_internals( p_object )->pp_vars[i];
+ const char *psz_type = "unknown";
- if( !vlc_internals( p_object )->i_vars )
- printf( " `-o No variables\n" );
- for( i = 0; i < vlc_internals( p_object )->i_vars; i++ )
+ switch( p_var->i_type & VLC_VAR_TYPE )
{
- variable_t *p_var = vlc_internals( p_object )->p_vars + i;
-
- const char *psz_type = "unknown";
- switch( p_var->i_type & VLC_VAR_TYPE )
- {
#define MYCASE( type, nice ) \
- case VLC_VAR_ ## type: \
- psz_type = nice; \
- break;
- MYCASE( VOID, "void" );
- MYCASE( BOOL, "bool" );
- MYCASE( INTEGER, "integer" );
- MYCASE( HOTKEY, "hotkey" );
- MYCASE( STRING, "string" );
- MYCASE( MODULE, "module" );
- MYCASE( FILE, "file" );
- MYCASE( DIRECTORY, "directory" );
- MYCASE( VARIABLE, "variable" );
- MYCASE( FLOAT, "float" );
- MYCASE( TIME, "time" );
- MYCASE( ADDRESS, "address" );
- MYCASE( MUTEX, "mutex" );
- MYCASE( LIST, "list" );
+ case VLC_VAR_ ## type: \
+ psz_type = nice; \
+ break;
+ MYCASE( VOID, "void" );
+ MYCASE( BOOL, "bool" );
+ MYCASE( INTEGER, "integer" );
+ MYCASE( HOTKEY, "hotkey" );
+ MYCASE( STRING, "string" );
+ MYCASE( MODULE, "module" );
+ MYCASE( FILE, "file" );
+ MYCASE( DIRECTORY, "directory" );
+ MYCASE( VARIABLE, "variable" );
+ MYCASE( FLOAT, "float" );
+ MYCASE( TIME, "time" );
+ MYCASE( ADDRESS, "address" );
+ MYCASE( MUTEX, "mutex" );
+ MYCASE( LIST, "list" );
#undef MYCASE
- }
- printf( " %c-o \"%s\" (%s",
- i + 1 == vlc_internals( p_object )->i_vars ? '`' : '|',
- p_var->psz_name, psz_type );
- if( p_var->psz_text )
- printf( ", %s", p_var->psz_text );
- printf( ")" );
- if( p_var->i_type & VLC_VAR_HASCHOICE )
- printf( ", has choices" );
- if( p_var->i_type & VLC_VAR_ISCOMMAND )
- printf( ", command" );
- if( p_var->i_entries )
- printf( ", %d callbacks", p_var->i_entries );
- switch( p_var->i_type & VLC_VAR_CLASS )
- {
- case VLC_VAR_VOID:
- case VLC_VAR_MUTEX:
- break;
- case VLC_VAR_BOOL:
- printf( ": %s", p_var->val.b_bool ? "true" : "false" );
- break;
- case VLC_VAR_INTEGER:
- printf( ": %d", p_var->val.i_int );
- break;
- case VLC_VAR_STRING:
- printf( ": \"%s\"", p_var->val.psz_string );
- break;
- case VLC_VAR_FLOAT:
- printf( ": %f", p_var->val.f_float );
- break;
- case VLC_VAR_TIME:
- printf( ": %"PRIi64, (int64_t)p_var->val.i_time );
- break;
- case VLC_VAR_ADDRESS:
- printf( ": %p", p_var->val.p_address );
- break;
- case VLC_VAR_LIST:
- printf( ": TODO" );
- break;
- }
- printf( "\n" );
}
+ printf( " %c-o \"%s\" (%s",
+ i + 1 == vlc_internals( p_object )->i_vars ? '`' : '|',
+ p_var->psz_name, psz_type );
+ if( p_var->psz_text )
+ printf( ", %s", p_var->psz_text );
+ printf( ")" );
+ if( p_var->i_type & VLC_VAR_HASCHOICE )
+ printf( ", has choices" );
+ if( p_var->i_type & VLC_VAR_ISCOMMAND )
+ printf( ", command" );
+ if( p_var->i_entries )
+ printf( ", %d callbacks", p_var->i_entries );
+ switch( p_var->i_type & VLC_VAR_CLASS )
+ {
+ case VLC_VAR_VOID:
+ case VLC_VAR_MUTEX:
+ break;
+ case VLC_VAR_BOOL:
+ printf( ": %s", p_var->val.b_bool ? "true" : "false" );
+ break;
+ case VLC_VAR_INTEGER:
+ printf( ": %d", p_var->val.i_int );
+ break;
+ case VLC_VAR_STRING:
+ printf( ": \"%s\"", p_var->val.psz_string );
+ break;
+ case VLC_VAR_FLOAT:
+ printf( ": %f", p_var->val.f_float );
+ break;
+ case VLC_VAR_TIME:
+ printf( ": %"PRIi64, (int64_t)p_var->val.i_time );
+ break;
+ case VLC_VAR_ADDRESS:
+ printf( ": %p", p_var->val.p_address );
+ break;
+ case VLC_VAR_LIST:
+ printf( ": TODO" );
+ break;
+ }
+ printf( "\n" );
}
- libvlc_unlock (p_this->p_libvlc);
-
- if( *newval.psz_string )
- {
- vlc_object_release( p_object );
- }
+ vlc_mutex_unlock( &vlc_internals( p_object )->var_lock );
}
+ libvlc_unlock (p_this->p_libvlc);
+ if( *newval.psz_string )
+ {
+ vlc_object_release( p_object );
+ }
return VLC_SUCCESS;
}
free( p_list );
}
-/*****************************************************************************
- * dump an object. (Debug function)
- *****************************************************************************/
-#ifndef NDEBUG
-static void vlc_object_dump( vlc_object_t *p_this )
-{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- psz_foo[0] = '|';
-
- DumpStructure( p_this, 0, psz_foo );
-}
-#endif
-
/* Following functions are local */
static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )
p_tmp = p_this->p_parent;
if( p_tmp )
{
- if( p_tmp->psz_object_name
- && !strcmp( p_tmp->psz_object_name, psz_name ) )
+ if( !objnamecmp(p_tmp, psz_name) )
{
vlc_object_hold( p_tmp );
return p_tmp;
for( i = vlc_internals( p_this )->i_children; i--; )
{
p_tmp = vlc_internals( p_this )->pp_children[i];
- if( p_tmp->psz_object_name
- && !strcmp( p_tmp->psz_object_name, psz_name ) )
+ if( !objnamecmp(p_tmp, psz_name ) )
{
vlc_object_hold( p_tmp );
return p_tmp;
int canc = vlc_savecancel ();
memset( &psz_name, 0, sizeof(psz_name) );
- if( p_this->psz_object_name )
+ char *name = vlc_object_get_name(p_this);
+ if( name )
{
- snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name );
+ snprintf( psz_name, 49, " \"%s\"", name );
+ free( name );
if( psz_name[48] )
psz_name[48] = '\"';
}
static vlc_list_t * NewList( int i_count )
{
- vlc_list_t * p_list = (vlc_list_t *)malloc( sizeof( vlc_list_t ) );
+ vlc_list_t * p_list = malloc( sizeof( vlc_list_t ) );
if( p_list == NULL )
- {
return NULL;
- }
p_list->i_count = i_count;
return;
}
- p_list->p_values = realloc( p_list->p_values, (p_list->i_count + 1)
- * sizeof( vlc_value_t ) );
+ p_list->p_values = realloc_or_free( p_list->p_values,
+ (p_list->i_count + 1) * sizeof( vlc_value_t ) );
if( p_list->p_values == NULL )
{
p_list->i_count = 0;
projects / vlc / blobdiff