* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2004-2008 the VideoLAN team
- * $Id$
+ * Copyright (C) 2006-2010 Rémi Denis-Courmont
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/**
* \file
* This file contains the functions to handle the vlc_object_t type
+ *
+ * Unless otherwise stated, functions in this file are not cancellation point.
+ * All functions in this file are safe w.r.t. deferred cancellation.
*/
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#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 <unistd.h>
#else
# include <io.h>
-# include <fcntl.h>
-# include <errno.h> /* ENOSYS */
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# undef read
+# define read( a, b, c ) recv (a, b, c, 0)
+# undef write
+# define write( a, b, c ) send (a, b, c, 0)
+# undef close
+# define close( a ) closesocket (a)
#endif
+
+#include <search.h>
+#include <limits.h>
#include <assert.h>
-/*****************************************************************************
- * Constants
- *****************************************************************************/
+#if defined (HAVE_SYS_EVENTFD_H)
+# include <sys/eventfd.h>
+# ifndef EFD_CLOEXEC
+# define EFD_CLOEXEC 0
+# warning EFD_CLOEXEC missing. Consider updating libc.
+# endif
+#endif
-const vlc_destructor_t kVLCDestructor = NULL;
/*****************************************************************************
* Local prototypes
static int DumpCommand( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static vlc_object_t * FindObject ( vlc_object_t *, int, int );
-static vlc_object_t * FindObjectName( vlc_object_t *, const char *, int );
-static void DetachObject ( vlc_object_t * );
-static void PrintObject ( vlc_object_t *, const char * );
-static void DumpStructure ( vlc_object_t *, int, char * );
-static int FindIndex ( vlc_object_t *, vlc_object_t **, int );
-static void SetAttachment ( vlc_object_t *, bool );
+static vlc_object_t * FindParent ( vlc_object_t *, int );
+static vlc_object_t * FindChild ( vlc_object_internals_t *, int );
+static vlc_object_t * FindParentName( vlc_object_t *, const char * );
+static vlc_object_t * FindChildName ( vlc_object_internals_t *, const char * );
+static void PrintObject( vlc_object_internals_t *, const char * );
+static void DumpStructure( vlc_object_internals_t *, unsigned, char * );
static vlc_list_t * NewList ( int );
-static void ListReplace ( vlc_list_t *, vlc_object_t *, int );
-/*static void ListAppend ( vlc_list_t *, vlc_object_t * );*/
-static int CountChildren ( vlc_object_t *, int );
-static void ListChildren ( vlc_list_t *, vlc_object_t *, int );
static void vlc_object_destroy( vlc_object_t *p_this );
-static void vlc_object_yield_locked( vlc_object_t *p_this );
+static void vlc_object_detach_unlocked (vlc_object_t *p_this);
/*****************************************************************************
* Local structure lock
*****************************************************************************/
-static vlc_mutex_t structure_lock;
+static void libvlc_lock (libvlc_int_t *p_libvlc)
+{
+ vlc_mutex_lock (&(libvlc_priv (p_libvlc)->structure_lock));
+}
+
+static void libvlc_unlock (libvlc_int_t *p_libvlc)
+{
+ vlc_mutex_unlock (&(libvlc_priv (p_libvlc)->structure_lock));
+}
+#undef vlc_custom_create
void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
int i_type, const char *psz_type )
{
assert (i_size >= sizeof (vlc_object_t));
p_new = (vlc_object_t *)(p_priv + 1);
- p_new->i_object_type = i_type;
+ 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->b_dead = false;
- p_priv->b_attached = false;
p_new->b_force = false;
p_new->psz_header = NULL;
p_new->i_flags = p_this->i_flags
& (OBJECT_FLAGS_NODBG|OBJECT_FLAGS_QUIET|OBJECT_FLAGS_NOINTERACT);
- p_priv->p_vars = calloc( sizeof( variable_t ), 16 );
-
- if( !p_priv->p_vars )
- {
- free( p_priv );
- return NULL;
- }
+ p_priv->var_root = NULL;
- libvlc_global_data_t *p_libvlc_global;
if( p_this == NULL )
{
- /* Only the global root object is created out of the blue */
- p_libvlc_global = (libvlc_global_data_t *)p_new;
- p_new->p_libvlc = NULL;
-
- p_libvlc_global->i_counter = 0;
- p_libvlc_global->i_objects = 0;
- p_libvlc_global->pp_objects = NULL;
- p_priv->b_attached = true;
- vlc_mutex_init( &structure_lock );
+ 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_new;
}
else
- {
- p_libvlc_global = vlc_global();
- if( i_type == VLC_OBJECT_LIBVLC )
- {
- p_new->p_libvlc = (libvlc_int_t*)p_new;
- p_priv->b_attached = true;
- }
- else
- {
- p_new->p_libvlc = p_this->p_libvlc;
- }
- }
-
- vlc_mutex_lock( &structure_lock );
- p_new->i_object_id = p_libvlc_global->i_counter++;
-
- /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
- * useless to try and recover anything if pp_objects gets smashed. */
- TAB_APPEND( p_libvlc_global->i_objects, p_libvlc_global->pp_objects,
- p_new );
- vlc_mutex_unlock( &structure_lock );
+ p_new->p_libvlc = p_this->p_libvlc;
+ vlc_spin_init( &p_priv->ref_spin );
p_priv->i_refcount = 1;
- p_priv->pf_destructor = kVLCDestructor;
+ p_priv->pf_destructor = NULL;
p_priv->b_thread = false;
p_new->p_parent = NULL;
- p_new->pp_children = NULL;
- p_new->i_children = 0;
-
- p_new->p_private = NULL;
+ p_priv->first = NULL;
+#ifndef NDEBUG
+ p_priv->old_parent = NULL;
+#endif
/* Initialize mutexes and condvars */
- vlc_mutex_init( &p_new->object_lock );
- vlc_cond_init( p_new, &p_new->object_wait );
vlc_mutex_init( &p_priv->var_lock );
- vlc_spin_init( &p_priv->spin );
+ vlc_cond_init( &p_priv->var_wait );
p_priv->pipes[0] = p_priv->pipes[1] = -1;
- if( i_type == VLC_OBJECT_LIBVLC )
- {
- var_Create( p_new, "list", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_new, "list", DumpCommand, NULL );
+ if (p_new == VLC_OBJECT(p_new->p_libvlc))
+ { /* TODO: should be in src/libvlc.c */
+ int canc = vlc_savecancel ();
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 );
var_AddCallback( p_new, "vars", DumpCommand, NULL );
+ vlc_restorecancel (canc);
}
return p_new;
}
-
+#undef vlc_object_create
/**
* Allocates and initializes a vlc object.
*
- * @param i_type known object type (all of them are negative integer values),
- * or object byte size (always positive).
+ * @param i_size object byte size
*
* @return the new object, or NULL on error.
*/
-void * __vlc_object_create( vlc_object_t *p_this, int i_type )
+void *vlc_object_create( vlc_object_t *p_this, size_t i_size )
{
- const char * psz_type;
- size_t i_size;
-
- switch( i_type )
- {
- case VLC_OBJECT_LIBVLC:
- i_size = sizeof(libvlc_int_t);
- psz_type = "libvlc";
- break;
- case VLC_OBJECT_INTF:
- i_size = sizeof(intf_thread_t);
- psz_type = "interface";
- break;
- case VLC_OBJECT_DIALOGS:
- i_size = sizeof(intf_thread_t);
- psz_type = "dialogs";
- break;
- case VLC_OBJECT_DEMUX:
- i_size = sizeof(demux_t);
- psz_type = "demux";
- break;
- case VLC_OBJECT_ACCESS:
- i_size = sizeof(access_t);
- psz_type = "access";
- 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_FILTER:
- i_size = sizeof(filter_t);
- psz_type = "filter";
- break;
- case VLC_OBJECT_VOUT:
- i_size = sizeof(vout_thread_t);
- psz_type = "video output";
- break;
- case VLC_OBJECT_AOUT:
- i_size = sizeof(aout_instance_t);
- psz_type = "audio output";
- break;
- case VLC_OBJECT_SOUT:
- i_size = sizeof(sout_instance_t);
- psz_type = "stream output";
- break;
- case VLC_OBJECT_OPENGL:
- i_size = sizeof( vout_thread_t );
- psz_type = "opengl";
- break;
- case VLC_OBJECT_ANNOUNCE:
- i_size = sizeof( announce_handler_t );
- psz_type = "announce";
- break;
- case VLC_OBJECT_INTERACTION:
- i_size = sizeof( interaction_t );
- psz_type = "interaction";
- break;
- default:
- i_size = i_type > (int)sizeof(vlc_object_t)
- ? i_type : (int)sizeof(vlc_object_t);
- i_type = VLC_OBJECT_GENERIC;
- psz_type = "generic";
- break;
- }
-
- return vlc_custom_create( p_this, i_size, i_type, psz_type );
+ return vlc_custom_create( p_this, i_size, VLC_OBJECT_GENERIC, "generic" );
}
-
+#undef vlc_object_set_destructor
/**
****************************************************************************
* Set the destructor of a vlc object
* when the object is destroyed when the its refcount reaches 0.
* (It is called by the internal function vlc_object_destroy())
*****************************************************************************/
-void __vlc_object_set_destructor( vlc_object_t *p_this,
- vlc_destructor_t pf_destructor )
+void vlc_object_set_destructor( vlc_object_t *p_this,
+ 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;
}
/**
* This function destroys an object that has been previously allocated with
* vlc_object_create. The object's refcount must be zero and it must not be
* attached to other objects in any way.
+ *
+ * This function must be called with cancellation disabled (currently).
*****************************************************************************/
static void vlc_object_destroy( vlc_object_t *p_this )
{
vlc_object_internals_t *p_priv = vlc_internals( p_this );
- /* Automatically detach the object from its parents */
- if( p_this->p_parent ) vlc_object_detach( p_this );
-
+ /* Objects are always detached beforehand */
+ assert( !p_this->p_parent );
/* Send a kill to the object's thread if applicable */
vlc_object_kill( p_this );
- /* If we are running on a thread, wait until it ends */
- if( p_priv->b_thread )
- vlc_thread_join( p_this );
-
/* Call the custom "subclass" destructor */
if( p_priv->pf_destructor )
p_priv->pf_destructor( p_this );
- /* Sanity checks */
- if( p_this->i_children )
- {
- int i;
-
- fprintf( stderr,
- "ERROR: cannot delete object (%i, %s) with %d children\n",
- p_this->i_object_id, p_this->psz_object_name,
- p_this->i_children );
-
- for( i = 0; i < p_this->i_children; i++ )
- {
- fprintf( stderr,
- "ERROR: Remaining children object "
- "(id:%i, type:%s, name:%s)\n",
- p_this->pp_children[i]->i_object_id,
- p_this->pp_children[i]->psz_object_type,
- p_this->pp_children[i]->psz_object_name );
- }
- fflush(stderr);
-
- /* Dump libvlc object to ease debugging */
- vlc_object_dump( p_this->p_libvlc );
-
- abort();
- }
+ /* Any thread must have been cleaned up at this point. */
+ assert( !p_priv->b_thread );
- /* Destroy the associated variables, starting from the end so that
- * 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 );
- }
+ /* Destroy the associated variables. */
+ var_DestroyAll( p_this );
- free( p_priv->p_vars );
+ vlc_cond_destroy( &p_priv->var_wait );
vlc_mutex_destroy( &p_priv->var_lock );
free( p_this->psz_header );
- if( p_this->p_libvlc == NULL )
- {
- libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
-
-#ifndef NDEBUG
- assert( p_global == vlc_global() );
- /* Test for leaks */
- if( p_global->i_objects > 0 )
- {
- int i;
- for( i = 0; i < p_global->i_objects; i++ )
- {
- /* We are leaking this object */
- fprintf( stderr,
- "ERROR: leaking object (id:%i, type:%s, name:%s)\n",
- p_global->pp_objects[i]->i_object_id,
- p_global->pp_objects[i]->psz_object_type,
- p_global->pp_objects[i]->psz_object_name );
-
- /* Dump libvlc object to ease debugging */
- vlc_object_dump( p_global->pp_objects[i] );
+ free( p_priv->psz_name );
- fflush(stderr);
- }
-
- /* Dump libvlc object to ease debugging */
- vlc_object_dump( p_this );
-
- /* Strongly abort, cause we want these to be fixed */
- abort();
- }
-#endif
-
- /* We are the global object ... no need to lock. */
- free( p_global->pp_objects );
- p_global->pp_objects = NULL;
-
- vlc_mutex_destroy( &structure_lock );
- }
-
- FREENULL( p_this->psz_object_name );
-
-#if defined(WIN32) || defined(UNDER_CE)
- /* if object has an associated thread, close it now */
- if( p_priv->thread_id.hThread )
- CloseHandle(p_priv->thread_id.hThread);
-#endif
-
- vlc_mutex_destroy( &p_this->object_lock );
- vlc_cond_destroy( &p_this->object_wait );
- vlc_spin_destroy( &p_priv->spin );
- if( p_priv->pipes[1] != -1 )
+ vlc_spin_destroy( &p_priv->ref_spin );
+ 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 )
close( p_priv->pipes[0] );
+ if( VLC_OBJECT(p_this->p_libvlc) == p_this )
+ vlc_mutex_destroy (&(libvlc_priv ((libvlc_int_t *)p_this)->structure_lock));
free( p_priv );
}
-/** Inter-object signaling */
-
-void __vlc_object_lock( vlc_object_t *obj )
-{
- vlc_mutex_lock( &obj->object_lock );
-}
-
-void __vlc_object_unlock( vlc_object_t *obj )
-{
- vlc_assert_locked( &obj->object_lock );
- vlc_mutex_unlock( &obj->object_lock );
-}
-
#ifdef WIN32
-# include <winsock2.h>
-# include <ws2tcpip.h>
-
/**
* select()-able pipes emulated using Winsock
*/
closesocket (c);
return -1;
}
-
-#undef read
-#define read( a, b, c ) recv (a, b, c, 0)
-#undef write
-#define write( a, b, c ) send (a, b, c, 0)
-#undef close
-#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()).
* @param obj object that would be "killed"
* @return a readable pipe descriptor, or -1 on error.
*/
-int __vlc_object_waitpipe( vlc_object_t *obj )
+int vlc_object_waitpipe( vlc_object_t *obj )
{
- int pfd[2] = { -1, -1 };
vlc_object_internals_t *internals = vlc_internals( obj );
- bool killed = false;
- vlc_spin_lock (&internals->spin);
+ 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);
- vlc_spin_unlock (&internals->spin);
- if (pipe (pfd))
- return -1;
-
- vlc_spin_lock (&internals->spin);
+ /* pipe() is not a cancellation point, but write() is and eventfd() is
+ * unspecified (not in POSIX). */
+ int canc = vlc_savecancel ();
+#if defined (HAVE_SYS_EVENTFD_H)
+ internals->pipes[0] = internals->pipes[1] = eventfd (0, EFD_CLOEXEC);
if (internals->pipes[0] == -1)
+#endif
{
- internals->pipes[0] = pfd[0];
- internals->pipes[1] = pfd[1];
- pfd[0] = pfd[1] = -1;
+ if (pipe (internals->pipes))
+ internals->pipes[0] = internals->pipes[1] = -1;
}
- killed = obj->b_die;
- }
- vlc_spin_unlock (&internals->spin);
-
- if (killed)
- {
- /* Race condition: vlc_object_kill() already invoked! */
- int fd;
-
- vlc_spin_lock (&internals->spin);
- fd = internals->pipes[1];
- internals->pipes[1] = -1;
- vlc_spin_unlock (&internals->spin);
- msg_Dbg (obj, "waitpipe: object already dying");
- if (fd != -1)
- close (fd);
+ if (internals->pipes[0] != -1 && obj->b_die)
+ { /* Race condition: vlc_object_kill() already invoked! */
+ msg_Dbg (obj, "waitpipe: object already dying");
+ write (internals->pipes[1], &(uint64_t){ 1 }, sizeof (uint64_t));
+ }
+ vlc_restorecancel (canc);
}
-
- /* Race condition: two threads call pipe() - unlikely */
- if (pfd[0] != -1)
- close (pfd[0]);
- if (pfd[1] != -1)
- close (pfd[1]);
-
+ vlc_mutex_unlock (&pipe_lock);
return internals->pipes[0];
}
-
-/**
- * Waits for the object to be signaled (using vlc_object_signal()).
- * If the object already has a signal pending, this function will return
- * immediately. It is asserted that the caller holds the object lock.
- *
- * @return true if the object is dying and should terminate.
- */
-bool __vlc_object_wait( vlc_object_t *obj )
-{
- vlc_assert_locked( &obj->object_lock );
- vlc_cond_wait( &obj->object_wait, &obj->object_lock );
- return obj->b_die;
-}
-
-
-/**
- * Waits for the object to be signaled (using vlc_object_signal()), or for
- * a timer to expire.
- * If the object already has a signal pending, this function will return
- * immediately. It is asserted that the caller holds the object lock.
- *
- * @return negative if the object is dying and should terminate,
- * positive if the the object has been signaled but is not dying,
- * 0 if timeout has been reached.
- */
-int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
-{
- int v;
-
- vlc_assert_locked( &obj->object_lock );
- v = vlc_cond_timedwait( &obj->object_wait, &obj->object_lock, deadline );
- if( v == 0 ) /* signaled */
- return obj->b_die ? -1 : 1;
- return 0;
-}
-
-
-/**
- * Checks whether an object has been "killed".
- * The object lock must be held.
- *
- * Typical code for an object thread could be:
- *
- vlc_object_lock (self);
- ...initialization...
- while (vlc_object_alive (self))
- {
- ...preprocessing...
-
- if (vlc_object_wait (self))
- continue;
-
- ...postprocessing...
- }
- ...deinitialization...
- vlc_object_unlock (self);
- *
- *
- * @return true iff the object has not been killed yet
- */
-bool __vlc_object_alive( vlc_object_t *obj )
-{
- vlc_assert_locked( &obj->object_lock );
- return !obj->b_die;
-}
-
-
-/**
- * Signals an object for which the lock is held.
- */
-void __vlc_object_signal_unlocked( vlc_object_t *obj )
-{
- vlc_assert_locked (&obj->object_lock);
- vlc_cond_signal( &obj->object_wait );
-}
-
-
+#undef vlc_object_kill
/**
- * Requests termination of an object.
- * If the object is LibVLC, also request to terminate all its children.
+ * Requests termination of an object, cancels the object thread, and make the
+ * object wait pipe (if it exists) readable. Not a cancellation point.
*/
-void __vlc_object_kill( vlc_object_t *p_this )
+void vlc_object_kill( vlc_object_t *p_this )
{
- vlc_object_internals_t *internals = vlc_internals( p_this );
- int fd;
+ vlc_object_internals_t *priv = vlc_internals( p_this );
+ int fd = -1;
- vlc_mutex_lock( &p_this->object_lock );
- p_this->b_die = true;
-
- vlc_spin_lock (&internals->spin);
- fd = internals->pipes[1];
- internals->pipes[1] = -1;
- vlc_spin_unlock (&internals->spin);
-
- if( fd != -1 )
+ vlc_thread_cancel( p_this );
+ vlc_mutex_lock( &pipe_lock );
+ if( !p_this->b_die )
{
- msg_Dbg (p_this, "waitpipe: object killed");
- close (fd);
+ fd = priv->pipes[1];
+ p_this->b_die = true;
}
- if( p_this->i_object_type == VLC_OBJECT_LIBVLC )
- for( int i = 0; i < p_this->i_children ; i++ )
- vlc_object_kill( p_this->pp_children[i] );
+ /* This also serves as a memory barrier toward vlc_object_alive(): */
+ vlc_mutex_unlock( &pipe_lock );
- vlc_object_signal_unlocked( p_this );
- vlc_mutex_unlock( &p_this->object_lock );
-}
-
-
-/**
- * find an object given its ID
- *
- * This function looks for the object whose i_object_id field is i_id. We
- * use a dichotomy so that lookups are in log2(n).
- *****************************************************************************/
-void * vlc_object_get( int i_id )
-{
- int i_max, i_middle;
- vlc_object_t **pp_objects;
- libvlc_global_data_t *p_libvlc_global = vlc_global();
- vlc_object_t *obj = NULL;
-
- vlc_mutex_lock( &structure_lock );
-
- pp_objects = p_libvlc_global->pp_objects;
-
- /* Perform our dichotomy */
- for( i_max = p_libvlc_global->i_objects - 1 ; ; )
+ if (fd != -1)
{
- i_middle = i_max / 2;
+ int canc = vlc_savecancel ();
- if( pp_objects[i_middle]->i_object_id > i_id )
- {
- i_max = i_middle;
- }
- else if( pp_objects[i_middle]->i_object_id < i_id )
- {
- if( i_middle )
- {
- pp_objects += i_middle;
- i_max -= i_middle;
- }
- else
- {
- /* This happens when there are only two remaining objects */
- if( pp_objects[i_middle+1]->i_object_id == i_id )
- {
- vlc_object_yield_locked( pp_objects[i_middle+1] );
- obj = pp_objects[i_middle+1];
- }
- break;
- }
- }
- else
- {
- vlc_object_yield_locked( pp_objects[i_middle] );
- vlc_mutex_unlock( &structure_lock );
- return pp_objects[i_middle];
- }
+ /* write _after_ setting b_die, so vlc_object_alive() returns false */
+ write (fd, &(uint64_t){ 1 }, sizeof (uint64_t));
+ msg_Dbg (p_this, "waitpipe: object killed");
+ vlc_restorecancel (canc);
}
-
- vlc_mutex_unlock( &structure_lock );
- return obj;
}
-/**
- ****************************************************************************
+#undef vlc_object_find
+/*****************************************************************************
* find a typed object and increment its refcount
*****************************************************************************
* This function recursively looks for a given object type. i_mode can be one
* of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
*****************************************************************************/
-void * __vlc_object_find( vlc_object_t *p_this, int i_type, int i_mode )
+void * vlc_object_find( vlc_object_t *p_this, int i_type, int i_mode )
{
vlc_object_t *p_found;
- vlc_mutex_lock( &structure_lock );
-
- assert( vlc_internals( p_this )->i_refcount > 0 );
-
/* If we are of the requested type ourselves, don't look further */
- if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type )
+ if( vlc_internals (p_this)->i_object_type == i_type )
{
- vlc_object_yield_locked( p_this );
- vlc_mutex_unlock( &structure_lock );
+ vlc_object_hold( p_this );
return p_this;
}
/* Otherwise, recursively look for the object */
- if( (i_mode & 0x000f) == FIND_ANYWHERE )
- {
- vlc_object_t *p_root = p_this;
-
- /* Find the root */
- while( p_root->p_parent != NULL &&
- p_root != VLC_OBJECT( p_this->p_libvlc ) )
- {
- p_root = p_root->p_parent;
- }
+ if (i_mode == FIND_ANYWHERE)
+ return vlc_object_find (VLC_OBJECT(p_this->p_libvlc), i_type, FIND_CHILD);
- p_found = FindObject( p_root, i_type, (i_mode & ~0x000f)|FIND_CHILD );
- if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_libvlc ) )
- {
- p_found = FindObject( VLC_OBJECT( p_this->p_libvlc ),
- i_type, (i_mode & ~0x000f)|FIND_CHILD );
- }
+ switch (i_type)
+ {
+ case VLC_OBJECT_VOUT:
+ case VLC_OBJECT_AOUT:
+ break;
+ case VLC_OBJECT_INPUT:
+ /* input can only be accessed like this from children,
+ * otherwise we could not promise that it is initialized */
+ if (i_mode != FIND_PARENT)
+ return NULL;
+ break;
+ default:
+ return NULL;
}
- else
+
+ libvlc_lock (p_this->p_libvlc);
+ switch (i_mode)
{
- p_found = FindObject( p_this, i_type, i_mode );
+ case FIND_PARENT:
+ p_found = FindParent (p_this, i_type);
+ break;
+ case FIND_CHILD:
+ p_found = FindChild (vlc_internals (p_this), i_type);
+ break;
+ default:
+ assert (0);
}
+ libvlc_unlock (p_this->p_libvlc);
+ return p_found;
+}
- vlc_mutex_unlock( &structure_lock );
- 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
/**
- ****************************************************************************
- * find a named object and increment its refcount
- *****************************************************************************
- * This function recursively looks for a given object name. i_mode can be one
- * of FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
- *****************************************************************************/
-void * __vlc_object_find_name( vlc_object_t *p_this, const char *psz_name,
- int i_mode )
+ * Finds a named object and increment its reference count.
+ * Beware that objects found in this manner can be "owned" by another thread,
+ * be of _any_ type, and be attached to any module (if any). With such an
+ * object reference, you can set or get object variables, emit log messages,
+ * and read write-once object parameters (psz_object_type, etc).
+ * You CANNOT cast the object to a more specific object type, and you
+ * definitely cannot invoke object type-specific callbacks with this.
+ *
+ * @param p_this object to search from
+ * @param psz_name name of the object to search for
+ * @param i_mode search direction: FIND_PARENT, FIND_CHILD or FIND_ANYWHERE.
+ *
+ * @return a matching object (must be released by the caller),
+ * or NULL on error.
+ */
+vlc_object_t *vlc_object_find_name( vlc_object_t *p_this,
+ const char *psz_name, int i_mode )
{
vlc_object_t *p_found;
- vlc_mutex_lock( &structure_lock );
-
- /* Avoid obvious freed object uses */
- assert( vlc_internals( p_this )->i_refcount > 0 );
-
+ /* 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( !objnamecmp(p_this, psz_name) )
{
- vlc_object_yield_locked( p_this );
- vlc_mutex_unlock( &structure_lock );
+ vlc_object_hold( p_this );
return p_this;
}
/* Otherwise, recursively look for the object */
- if( (i_mode & 0x000f) == FIND_ANYWHERE )
- {
- vlc_object_t *p_root = p_this;
-
- /* Find the root */
- while( p_root->p_parent != NULL &&
- p_root != VLC_OBJECT( p_this->p_libvlc ) )
- {
- p_root = p_root->p_parent;
- }
+ if (i_mode == FIND_ANYWHERE)
+ return vlc_object_find_name (VLC_OBJECT(p_this->p_libvlc), psz_name,
+ FIND_CHILD);
- p_found = FindObjectName( p_root, psz_name,
- (i_mode & ~0x000f)|FIND_CHILD );
- if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_libvlc ) )
- {
- p_found = FindObjectName( VLC_OBJECT( p_this->p_libvlc ),
- psz_name, (i_mode & ~0x000f)|FIND_CHILD );
- }
- }
- else
+ libvlc_lock (p_this->p_libvlc);
+ vlc_mutex_lock (&name_lock);
+ switch (i_mode)
{
- p_found = FindObjectName( p_this, psz_name, i_mode );
+ case FIND_PARENT:
+ p_found = FindParentName (p_this, psz_name);
+ break;
+ case FIND_CHILD:
+ p_found = FindChildName (vlc_internals (p_this), psz_name);
+ break;
+ default:
+ assert (0);
}
-
- vlc_mutex_unlock( &structure_lock );
-
+ vlc_mutex_unlock (&name_lock);
+ libvlc_unlock (p_this->p_libvlc);
return p_found;
}
+#undef vlc_object_hold
/**
- ****************************************************************************
- * increment an object refcount
- *****************************************************************************/
-
-/* When the structure_lock is locked */
-static void vlc_object_yield_locked( vlc_object_t *p_this )
+ * Increment an object reference counter.
+ */
+void * vlc_object_hold( vlc_object_t *p_this )
{
- vlc_assert_locked (&structure_lock);
+ vlc_object_internals_t *internals = vlc_internals( p_this );
+ vlc_spin_lock( &internals->ref_spin );
/* Avoid obvious freed object uses */
- assert( vlc_internals( p_this )->i_refcount > 0 );
-
+ assert( internals->i_refcount > 0 );
/* Increment the counter */
- vlc_internals( p_this )->i_refcount++;
+ internals->i_refcount++;
+ vlc_spin_unlock( &internals->ref_spin );
+ return p_this;
}
-/* Public function */
-void __vlc_object_yield( vlc_object_t *p_this )
-{
- vlc_mutex_lock( &structure_lock );
- vlc_object_yield_locked( p_this );
- vlc_mutex_unlock( &structure_lock );
-}
-
-
+#undef vlc_object_release
/*****************************************************************************
- * decrement an object refcount
+ * Decrement an object refcount
* And destroy the object if its refcount reach zero.
*****************************************************************************/
-void __vlc_object_release( vlc_object_t *p_this )
+void vlc_object_release( vlc_object_t *p_this )
{
+ vlc_object_internals_t *internals = vlc_internals( p_this );
+ vlc_object_t *parent = NULL;
bool b_should_destroy;
- vlc_mutex_lock( &structure_lock );
+ vlc_spin_lock( &internals->ref_spin );
+ assert( internals->i_refcount > 0 );
+
+ if( internals->i_refcount > 1 )
+ {
+ /* Fast path */
+ /* There are still other references to the object */
+ internals->i_refcount--;
+ vlc_spin_unlock( &internals->ref_spin );
+ return;
+ }
+ vlc_spin_unlock( &internals->ref_spin );
- assert( vlc_internals( p_this )->i_refcount > 0 );
- vlc_internals( p_this )->i_refcount--;
- b_should_destroy = (vlc_internals( p_this )->i_refcount == 0);
+ /* Slow path */
+ /* Remember that we cannot hold the spin while waiting on the mutex */
+ libvlc_lock (p_this->p_libvlc);
+ /* Take the spin again. Note that another thread may have held the
+ * object in the (very short) mean time. */
+ vlc_spin_lock( &internals->ref_spin );
+ b_should_destroy = --internals->i_refcount == 0;
+ vlc_spin_unlock( &internals->ref_spin );
if( b_should_destroy )
{
- /* Make sure this object can't be obtained via vlc_find_object now that
- * it is freed */
- libvlc_global_data_t *p_libvlc_global = vlc_global();
- int i_index;
-
- /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
- * useless to try and recover anything if pp_objects gets smashed. */
- i_index = FindIndex( p_this, p_libvlc_global->pp_objects,
- p_libvlc_global->i_objects );
- REMOVE_ELEM( p_libvlc_global->pp_objects,
- p_libvlc_global->i_objects, i_index );
- }
+ parent = p_this->p_parent;
+ if (parent)
+ /* Detach from parent to protect against FIND_CHILDREN */
+ vlc_object_detach_unlocked (p_this);
- vlc_mutex_unlock( &structure_lock );
+ /* We have no children */
+ assert (internals->first == NULL);
+ }
+ libvlc_unlock (p_this->p_libvlc);
if( b_should_destroy )
+ {
+ int canc;
+
+ canc = vlc_savecancel ();
vlc_object_destroy( p_this );
+ vlc_restorecancel (canc);
+ if (parent)
+ vlc_object_release (parent);
+ }
}
+#undef vlc_object_attach
/**
****************************************************************************
* attach object to a parent object
* This function sets p_this as a child of p_parent, and p_parent as a parent
* of p_this. This link can be undone using vlc_object_detach.
*****************************************************************************/
-void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
+void vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
{
if( !p_this ) return;
- vlc_mutex_lock( &structure_lock );
+ vlc_object_internals_t *pap = vlc_internals (p_parent);
+ vlc_object_internals_t *priv = vlc_internals (p_this);
+ vlc_object_t *p_old_parent;
- /* Avoid obvious freed object uses */
- assert( vlc_internals( p_this )->i_refcount > 0 );
+ priv->prev = NULL;
+ vlc_object_hold (p_parent);
+ libvlc_lock (p_this->p_libvlc);
+#ifndef NDEBUG
+ /* Reparenting an object carries a risk of invalid access to the parent,
+ * from another thread. This can happen when inheriting a variable, or
+ * through any direct access to vlc_object_t.p_parent. Also, reparenting
+ * brings a functional bug, whereby the reparented object uses incorrect
+ * old values for inherited variables (as the new parent may have different
+ * variable values, especially if it is an input).
+ * Note that the old parent may be already destroyed.
+ * So its pointer must not be dereferenced.
+ */
+ if (priv->old_parent)
+ msg_Info (p_this, "Reparenting an object is dangerous (%p -> %p)!",
+ priv->old_parent, p_parent);
+#endif
+
+ p_old_parent = p_this->p_parent;
+ if (p_old_parent)
+ vlc_object_detach_unlocked (p_this);
/* Attach the parent to its child */
p_this->p_parent = p_parent;
/* Attach the child to its parent */
- INSERT_ELEM( p_parent->pp_children, p_parent->i_children,
- p_parent->i_children, p_this );
+ priv->next = pap->first;
+ if (priv->next != NULL)
+ priv->next->prev = priv;
+ pap->first = priv;
+ libvlc_unlock (p_this->p_libvlc);
+
+ if (p_old_parent)
+ vlc_object_release (p_old_parent);
+}
- /* Climb up the tree to see whether we are connected with the root */
- if( vlc_internals( p_parent )->b_attached )
- {
- SetAttachment( p_this, true );
- }
- vlc_mutex_unlock( &structure_lock );
+static void vlc_object_detach_unlocked (vlc_object_t *p_this)
+{
+ assert (p_this->p_parent != NULL);
+
+ vlc_object_internals_t *pap = vlc_internals (p_this->p_parent);
+ vlc_object_internals_t *priv = vlc_internals (p_this);
+
+ /* Unlink */
+ if (priv->prev != NULL)
+ priv->prev->next = priv->next;
+ else
+ pap->first = priv->next;
+ if (priv->next != NULL)
+ priv->next->prev = priv->prev;
+
+ /* Remove p_this's parent */
+#ifndef NDEBUG
+ priv->old_parent = p_this->p_parent;
+#endif
+ p_this->p_parent = NULL;
}
+#undef vlc_object_detach
/**
****************************************************************************
* detach object from its parent
*****************************************************************************
* This function removes all links between an object and its parent.
*****************************************************************************/
-void __vlc_object_detach( vlc_object_t *p_this )
+void vlc_object_detach( vlc_object_t *p_this )
{
+ vlc_object_t *p_parent;
if( !p_this ) return;
- vlc_mutex_lock( &structure_lock );
-
- if( !p_this->p_parent )
- {
- msg_Err( p_this, "object is not attached" );
- vlc_mutex_unlock( &structure_lock );
- return;
- }
-
- /* Climb up the tree to see whether we are connected with the root */
- if( vlc_internals( p_this->p_parent )->b_attached )
- {
- SetAttachment( p_this, false );
- }
+ libvlc_lock (p_this->p_libvlc);
+ p_parent = p_this->p_parent;
+ if (p_parent)
+ vlc_object_detach_unlocked( p_this );
+ libvlc_unlock (p_this->p_libvlc);
- DetachObject( p_this );
- vlc_mutex_unlock( &structure_lock );
- p_this = NULL;
+ if (p_parent)
+ vlc_object_release (p_parent);
}
+#undef vlc_list_children
/**
- ****************************************************************************
- * find a list typed objects and increment their refcount
- *****************************************************************************
- * 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 )
+ * Gets the list of children of an objects, and increment their reference
+ * count.
+ * @return a list (possibly empty) or NULL in case of error.
+ */
+vlc_list_t *vlc_list_children( vlc_object_t *obj )
{
- vlc_list_t *p_list;
- vlc_object_t **pp_current, **pp_end;
- int i_count = 0, i_index = 0;
- libvlc_global_data_t *p_libvlc_global = vlc_global();
-
- vlc_mutex_lock( &structure_lock );
-
- /* Look for the objects */
- switch( i_mode & 0x000f )
+ vlc_list_t *l;
+ vlc_object_internals_t *priv;
+ unsigned count = 0;
+
+ libvlc_lock (obj->p_libvlc);
+ for (priv = vlc_internals (obj)->first; priv; priv = priv->next)
+ count++;
+ l = NewList (count);
+ if (likely(l != NULL))
{
- case FIND_ANYWHERE:
- pp_current = p_libvlc_global->pp_objects;
- pp_end = pp_current + p_libvlc_global->i_objects;
+ unsigned i = 0;
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( vlc_internals(*pp_current)->b_attached
- && (*pp_current)->i_object_type == i_type )
- {
- i_count++;
- }
- }
-
- p_list = NewList( i_count );
- pp_current = p_libvlc_global->pp_objects;
+ for (priv = vlc_internals (obj)->first; priv; priv = priv->next)
+ l->p_values[i++].p_object = vlc_object_hold (vlc_externals (priv));
+ }
+ libvlc_unlock (obj->p_libvlc);
+ return l;
+}
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( vlc_internals(*pp_current)->b_attached
- && (*pp_current)->i_object_type == i_type )
- {
- ListReplace( p_list, *pp_current, i_index );
- if( i_index < i_count ) i_index++;
- }
- }
- break;
+static void DumpVariable (const void *data, const VISIT which, const int depth)
+{
+ if (which != postorder && which != leaf)
+ return;
+ (void) depth;
- case FIND_CHILD:
- i_count = CountChildren( p_this, i_type );
- p_list = NewList( i_count );
+ const variable_t *p_var = *(const variable_t **)data;
+ const char *psz_type = "unknown";
- /* Check allocation was successful */
- if( p_list->i_count != i_count )
- {
- msg_Err( p_this, "list allocation failed!" );
- p_list->i_count = 0;
+ switch( p_var->i_type & VLC_VAR_TYPE )
+ {
+#define MYCASE( type, nice ) \
+ case VLC_VAR_ ## type: \
+ psz_type = nice; \
break;
- }
-
- p_list->i_count = 0;
- ListChildren( p_list, p_this, i_type );
- break;
-
- default:
- msg_Err( p_this, "unimplemented!" );
- p_list = NewList( 0 );
- 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( COORDS, "coords" );
+ MYCASE( ADDRESS, "address" );
+ MYCASE( MUTEX, "mutex" );
+ MYCASE( LIST, "list" );
+#undef MYCASE
}
-
- vlc_mutex_unlock( &structure_lock );
-
- return p_list;
+ printf( " *-o \"%s\" (%s", p_var->psz_name, psz_type );
+ if( p_var->psz_text )
+ printf( ", %s", p_var->psz_text );
+ fputc( ')', stdout );
+ if( p_var->i_type & VLC_VAR_HASCHOICE )
+ fputs( ", has choices", stdout );
+ if( p_var->i_type & VLC_VAR_ISCOMMAND )
+ fputs( ", command", stdout );
+ 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_COORDS:
+ printf( ": %"PRId32"x%"PRId32,
+ p_var->val.coords.x, p_var->val.coords.y );
+ break;
+ case VLC_VAR_ADDRESS:
+ printf( ": %p", p_var->val.p_address );
+ break;
+ case VLC_VAR_LIST:
+ fputs( ": TODO", stdout );
+ break;
+ }
+ fputc( '\n', stdout );
}
/*****************************************************************************
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- libvlc_global_data_t *p_libvlc_global = vlc_global();
-
(void)oldval; (void)p_data;
- if( *psz_cmd == 'l' )
- {
- vlc_mutex_lock( &structure_lock );
-
- vlc_object_t **pp_current, **pp_end;
-
- pp_current = p_libvlc_global->pp_objects;
- pp_end = pp_current + p_libvlc_global->i_objects;
-
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( vlc_internals(*pp_current)->b_attached )
- {
- PrintObject( *pp_current, "" );
- }
- else
- {
- printf( " o %.8i %s (not attached)\n",
- (*pp_current)->i_object_id,
- (*pp_current)->psz_object_type );
- }
- }
+ vlc_object_t *p_object = NULL;
- vlc_mutex_unlock( &structure_lock );
- }
- else
+ if( *newval.psz_string )
{
- vlc_object_t *p_object = NULL;
-
- if( *newval.psz_string )
- {
- char *end;
- int i_id = strtol( newval.psz_string, &end, 0 );
- if( end != newval.psz_string )
- p_object = vlc_object_get( i_id );
- else
- {
- /* try using the object's name to find it */
- vlc_object_t *p_libvlc = vlc_object_get( 1 );
- if( p_libvlc )
- {
- /* Look in p_libvlc's children tree */
- p_object = vlc_object_find_name( p_libvlc,
- newval.psz_string,
- FIND_CHILD );
- vlc_object_release( p_libvlc );
- }
- if( !p_object )
- {
- /* If it's not in libvlc, look in libvlc_global (== p_this) */
- p_object = vlc_object_find_name( p_this,
- newval.psz_string,
- FIND_CHILD );
- }
- }
-
- if( !p_object )
- {
- return VLC_ENOOBJ;
- }
- }
-
- vlc_mutex_lock( &structure_lock );
-
- if( *psz_cmd == 't' )
+ /* 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 )
{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
-
- if( !p_object )
- p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
-
- psz_foo[0] = '|';
- DumpStructure( p_object, 0, psz_foo );
+ return VLC_ENOOBJ;
}
- else if( *psz_cmd == 'v' )
- {
- int i;
+ }
- if( !p_object )
- p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
+ libvlc_lock (p_this->p_libvlc);
+ if( *psz_cmd == 't' )
+ {
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- PrintObject( p_object, "" );
+ if( !p_object )
+ p_object = VLC_OBJECT(p_this->p_libvlc);
- if( !vlc_internals( p_object )->i_vars )
- printf( " `-o No variables\n" );
- for( i = 0; i < vlc_internals( p_object )->i_vars; i++ )
- {
- 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" );
-#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_ISCOMMAND )
- printf( ", command" );
- if( p_var->i_entries )
- printf( ", %d callbacks", p_var->i_entries );
- switch( p_var->i_type & 0x00f0 )
- {
- 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" );
- }
- }
-
- vlc_mutex_unlock( &structure_lock );
+ psz_foo[0] = '|';
+ DumpStructure( vlc_internals(p_object), 0, psz_foo );
+ }
+ else if( *psz_cmd == 'v' )
+ {
+ if( !p_object )
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- if( *newval.psz_string )
- {
- vlc_object_release( p_object );
- }
+ PrintObject( vlc_internals(p_object), "" );
+ vlc_mutex_lock( &vlc_internals( p_object )->var_lock );
+ if( vlc_internals( p_object )->var_root == NULL )
+ puts( " `-o No variables" );
+ else
+ twalk( vlc_internals( p_object )->var_root, DumpVariable );
+ 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)
- *****************************************************************************/
-void __vlc_object_dump( vlc_object_t *p_this )
-{
- vlc_mutex_lock( &structure_lock );
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- psz_foo[0] = '|';
- DumpStructure( p_this, 0, psz_foo );
- vlc_mutex_unlock( &structure_lock );
-}
-
/* Following functions are local */
-/*****************************************************************************
- * FindIndex: find the index of an object in an array of objects
- *****************************************************************************
- * This function assumes that p_this can be found in pp_objects. It will not
- * crash if p_this cannot be found, but will return a wrong value. It is your
- * duty to check the return value if you are not certain that the object could
- * be found for sure.
- *****************************************************************************/
-static int FindIndex( vlc_object_t *p_this,
- vlc_object_t **pp_objects, int i_count )
+static vlc_object_t *FindParent (vlc_object_t *p_this, int i_type)
{
- int i_middle = i_count / 2;
-
- if( i_count == 0 )
- {
- return 0;
- }
-
- if( pp_objects[i_middle] == p_this )
- {
- return i_middle;
- }
-
- if( i_count == 1 )
- {
- return 0;
- }
-
- /* We take advantage of the sorted array */
- if( pp_objects[i_middle]->i_object_id < p_this->i_object_id )
- {
- return i_middle + FindIndex( p_this, pp_objects + i_middle,
- i_count - i_middle );
- }
- else
+ for (vlc_object_t *parent = p_this->p_parent;
+ parent != NULL;
+ parent = parent->p_parent)
{
- return FindIndex( p_this, pp_objects, i_middle );
+ if (vlc_internals (parent)->i_object_type == i_type)
+ return vlc_object_hold (parent);
}
+ return NULL;
}
-static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )
+static vlc_object_t *FindParentName (vlc_object_t *p_this, const char *name)
{
- int i;
- vlc_object_t *p_tmp;
-
- switch( i_mode & 0x000f )
+ for (vlc_object_t *parent = p_this->p_parent;
+ parent != NULL;
+ parent = parent->p_parent)
{
- case FIND_PARENT:
- p_tmp = p_this->p_parent;
- if( p_tmp )
- {
- if( p_tmp->i_object_type == i_type
- && vlc_internals( p_tmp )->i_refcount > 0 )
- {
- vlc_object_yield_locked( p_tmp );
- return p_tmp;
- }
- else
- {
- return FindObject( p_tmp, i_type, i_mode );
- }
- }
- break;
-
- case FIND_CHILD:
- for( i = p_this->i_children; i--; )
- {
- p_tmp = p_this->pp_children[i];
- if( p_tmp->i_object_type == i_type
- && vlc_internals( p_tmp )->i_refcount > 0 )
- {
- vlc_object_yield_locked( p_tmp );
- return p_tmp;
- }
- else if( p_tmp->i_children )
- {
- p_tmp = FindObject( p_tmp, i_type, i_mode );
- if( p_tmp )
- {
- return p_tmp;
- }
- }
- }
- break;
-
- case FIND_ANYWHERE:
- /* Handled in vlc_object_find */
- break;
+ const char *objname = vlc_internals (parent)->psz_name;
+ if (objname && !strcmp (objname, name))
+ return vlc_object_hold (parent);
}
-
return NULL;
}
-static vlc_object_t * FindObjectName( vlc_object_t *p_this,
- const char *psz_name,
- int i_mode )
+static vlc_object_t *FindChild (vlc_object_internals_t *priv, int i_type)
{
- int i;
- vlc_object_t *p_tmp;
-
- switch( i_mode & 0x000f )
+ for (priv = priv->first; priv != NULL; priv = priv->next)
{
- case FIND_PARENT:
- p_tmp = p_this->p_parent;
- if( p_tmp )
- {
- if( p_tmp->psz_object_name
- && !strcmp( p_tmp->psz_object_name, psz_name )
- && vlc_internals( p_tmp )->i_refcount > 0 )
- {
- vlc_object_yield_locked( p_tmp );
- return p_tmp;
- }
- else
- {
- return FindObjectName( p_tmp, psz_name, i_mode );
- }
- }
- break;
+ if (priv->i_object_type == i_type)
+ return vlc_object_hold (vlc_externals (priv));
- case FIND_CHILD:
- for( i = p_this->i_children; i--; )
- {
- p_tmp = p_this->pp_children[i];
- if( p_tmp->psz_object_name
- && !strcmp( p_tmp->psz_object_name, psz_name )
- && vlc_internals( p_tmp )->i_refcount > 0 )
- {
- vlc_object_yield_locked( p_tmp );
- return p_tmp;
- }
- else if( p_tmp->i_children )
- {
- p_tmp = FindObjectName( p_tmp, psz_name, i_mode );
- if( p_tmp )
- {
- return p_tmp;
- }
- }
- }
- break;
-
- case FIND_ANYWHERE:
- /* Handled in vlc_object_find */
- break;
+ vlc_object_t *found = FindChild (priv, i_type);
+ if (found != NULL)
+ return found;
}
-
return NULL;
}
-static void DetachObject( vlc_object_t *p_this )
+static vlc_object_t *FindChildName (vlc_object_internals_t *priv,
+ const char *name)
{
- vlc_object_t *p_parent = p_this->p_parent;
- int i_index, i;
-
- /* Remove p_this's parent */
- p_this->p_parent = NULL;
-
- /* Remove all of p_parent's children which are p_this */
- for( i_index = p_parent->i_children ; i_index-- ; )
+ for (priv = priv->first; priv != NULL; priv = priv->next)
{
- if( p_parent->pp_children[i_index] == p_this )
- {
- p_parent->i_children--;
- for( i = i_index ; i < p_parent->i_children ; i++ )
- {
- p_parent->pp_children[i] = p_parent->pp_children[i+1];
- }
- }
- }
+ if (priv->psz_name && !strcmp (priv->psz_name, name))
+ return vlc_object_hold (vlc_externals (priv));
- if( p_parent->i_children )
- {
- p_parent->pp_children = (vlc_object_t **)realloc( p_parent->pp_children,
- p_parent->i_children * sizeof(vlc_object_t *) );
- }
- else
- {
- free( p_parent->pp_children );
- p_parent->pp_children = NULL;
+ vlc_object_t *found = FindChildName (priv, name);
+ if (found != NULL)
+ return found;
}
+ return NULL;
}
-/*****************************************************************************
- * SetAttachment: recursively set the b_attached flag of a subtree.
- *****************************************************************************
- * This function is used by the attach and detach functions to propagate
- * the b_attached flag in a subtree.
- *****************************************************************************/
-static void SetAttachment( vlc_object_t *p_this, bool b_attached )
-{
- int i_index;
-
- for( i_index = p_this->i_children ; i_index-- ; )
- {
- SetAttachment( p_this->pp_children[i_index], b_attached );
- }
-
- vlc_internals( p_this )->b_attached = b_attached;
-}
-
-static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )
+static void PrintObject( vlc_object_internals_t *priv,
+ const char *psz_prefix )
{
- char psz_children[20], psz_refcount[20], psz_thread[30], psz_name[50],
- psz_parent[20];
+ char psz_refcount[20], psz_thread[30], psz_name[50], psz_parent[20];
+ int canc = vlc_savecancel ();
memset( &psz_name, 0, sizeof(psz_name) );
- if( p_this->psz_object_name )
+
+ vlc_mutex_lock (&name_lock);
+ if (priv->psz_name != NULL)
{
- snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name );
+ snprintf( psz_name, 49, " \"%s\"", priv->psz_name );
if( psz_name[48] )
psz_name[48] = '\"';
}
-
- psz_children[0] = '\0';
- switch( p_this->i_children )
- {
- case 0:
- break;
- case 1:
- strcpy( psz_children, ", 1 child" );
- break;
- default:
- snprintf( psz_children, 19, ", %i children", p_this->i_children );
- break;
- }
+ vlc_mutex_unlock (&name_lock);
psz_refcount[0] = '\0';
- if( vlc_internals( p_this )->i_refcount > 0 )
- snprintf( psz_refcount, 19, ", refcount %u",
- vlc_internals( p_this )->i_refcount );
+ if( priv->i_refcount > 0 )
+ snprintf( psz_refcount, 19, ", %u refs", priv->i_refcount );
psz_thread[0] = '\0';
- if( vlc_internals( p_this )->b_thread )
- snprintf( psz_thread, 29, " (thread %u)",
-#if defined(WIN32) || defined(UNDER_CE)
- (unsigned)vlc_internals( p_this )->thread_id.id );
-#else
- (unsigned)vlc_internals( p_this )->thread_id );
-#endif
+ if( priv->b_thread )
+ snprintf( psz_thread, 29, " (thread %lu)",
+ (unsigned long)priv->thread_id );
psz_parent[0] = '\0';
- if( p_this->p_parent )
- snprintf( psz_parent, 19, ", parent %i", p_this->p_parent->i_object_id );
-
- printf( " %so %.8i %s%s%s%s%s%s\n", psz_prefix,
- p_this->i_object_id, p_this->psz_object_type,
- psz_name, psz_thread, psz_refcount, psz_children,
- psz_parent );
+ /* FIXME: need structure lock!!! */
+ if( vlc_externals(priv)->p_parent )
+ snprintf( psz_parent, 19, ", parent %p",
+ vlc_externals(priv)->p_parent );
+
+ printf( " %so %p %s%s%s%s%s\n", psz_prefix,
+ vlc_externals(priv), vlc_externals(priv)->psz_object_type,
+ psz_name, psz_thread, psz_refcount, psz_parent );
+ vlc_restorecancel (canc);
}
-static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo )
+static void DumpStructure (vlc_object_internals_t *priv, unsigned i_level,
+ char *psz_foo)
{
- int i;
char i_back = psz_foo[i_level];
psz_foo[i_level] = '\0';
- PrintObject( p_this, psz_foo );
+ PrintObject (priv, psz_foo);
psz_foo[i_level] = i_back;
if( i_level / 2 >= MAX_DUMPSTRUCTURE_DEPTH )
{
- msg_Warn( p_this, "structure tree is too deep" );
+ msg_Warn( vlc_externals(priv), "structure tree is too deep" );
return;
}
- for( i = 0 ; i < p_this->i_children ; i++ )
+ for (priv = priv->first; priv != NULL; priv = priv->next)
{
if( i_level )
{
}
}
- if( i == p_this->i_children - 1 )
- {
- psz_foo[i_level] = '`';
- }
- else
- {
- psz_foo[i_level] = '|';
- }
-
+ psz_foo[i_level] = priv->next ? '|' : '`';
psz_foo[i_level+1] = '-';
psz_foo[i_level+2] = '\0';
- DumpStructure( p_this->pp_children[i], i_level + 2, psz_foo );
+ DumpStructure (priv, i_level + 2, psz_foo);
}
}
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;
}
-
-static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object,
- int i_index )
-{
- if( p_list == NULL || i_index >= p_list->i_count )
- {
- return;
- }
-
- vlc_object_yield_locked( p_object );
-
- p_list->p_values[i_index].p_object = p_object;
-
- return;
-}
-
-/*static void ListAppend( vlc_list_t *p_list, vlc_object_t *p_object )
-{
- if( p_list == NULL )
- {
- return;
- }
-
- p_list->p_values = realloc( p_list->p_values, (p_list->i_count + 1)
- * sizeof( vlc_value_t ) );
- if( p_list->p_values == NULL )
- {
- p_list->i_count = 0;
- return;
- }
-
- vlc_object_yield_locked( p_object );
-
- p_list->p_values[p_list->i_count].p_object = p_object;
- p_list->i_count++;
-
- return;
-}*/
-
-static int CountChildren( vlc_object_t *p_this, int i_type )
-{
- vlc_object_t *p_tmp;
- int i, i_count = 0;
-
- for( i = 0; i < p_this->i_children; i++ )
- {
- p_tmp = p_this->pp_children[i];
-
- if( p_tmp->i_object_type == i_type )
- {
- i_count++;
- }
-
- if( p_tmp->i_children )
- {
- i_count += CountChildren( p_tmp, i_type );
- }
- }
-
- return i_count;
-}
-
-static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type )
-{
- vlc_object_t *p_tmp;
- int i;
-
- for( i = 0; i < p_this->i_children; i++ )
- {
- p_tmp = p_this->pp_children[i];
-
- if( p_tmp->i_object_type == i_type )
- {
- ListReplace( p_list, p_tmp, p_list->i_count++ );
- }
-
- if( p_tmp->i_children )
- {
- ListChildren( p_list, p_tmp, i_type );
- }
- }
-}
projects / vlc / blobdiff