/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
- * $Id$
+ * Copyright (C) 2004-2008 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h> /* realloc() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_spu.h"
+#include <vlc_common.h>
+
+#include "../libvlc.h"
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include "audio_output/aout_internal.h"
-#include "audio_output.h"
-#include "aout_internal.h"
-#include "stream_output.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_playlist.h"
#include "vlc_interface.h"
#include "vlc_codec.h"
#include "vlc_filter.h"
-#include "vlc_httpd.h"
-#include "vlc_vlm.h"
-#include "vlc_vod.h"
-#include "vlc_tls.h"
-#include "vlc_xml.h"
-#include "vlc_osd.h"
+#include "variables.h"
+#ifndef WIN32
+# include <unistd.h>
+#else
+# include <io.h>
+# include <fcntl.h>
+# include <errno.h> /* ENOSYS */
+#endif
+#include <assert.h>
/*****************************************************************************
* Local prototypes
vlc_value_t, vlc_value_t, void * );
static vlc_object_t * FindObject ( vlc_object_t *, int, int );
-static void DetachObject ( vlc_object_t * );
+static vlc_object_t * FindObjectName( vlc_object_t *, const char *, int );
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 *, vlc_bool_t );
static vlc_list_t * NewList ( int );
static void ListReplace ( vlc_list_t *, vlc_object_t *, int );
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_detach_unlocked (vlc_object_t *p_this);
+
+#ifdef LIBVLC_REFCHECK
+static vlc_threadvar_t held_objects;
+typedef struct held_list_t
+{
+ struct held_list_t *next;
+ vlc_object_t *obj;
+} held_list_t;
+static void held_objects_destroy (void *);
+#endif
+
/*****************************************************************************
* Local structure lock
*****************************************************************************/
-static vlc_mutex_t structure_lock;
+static vlc_mutex_t structure_lock;
+
+void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
+ int i_type, const char *psz_type )
+{
+ vlc_object_t *p_new;
+ vlc_object_internals_t *p_priv;
+
+ /* NOTE:
+ * VLC objects are laid out as follow:
+ * - first the LibVLC-private per-object data,
+ * - then VLC_COMMON members from vlc_object_t,
+ * - finally, the type-specific data (if any).
+ *
+ * This function initializes the LibVLC and common data,
+ * and zeroes the rest.
+ */
+ p_priv = calloc( 1, sizeof( *p_priv ) + i_size );
+ if( p_priv == NULL )
+ return NULL;
+
+ assert (i_size >= sizeof (vlc_object_t));
+ p_new = (vlc_object_t *)(p_priv + 1);
+
+ p_new->i_object_type = i_type;
+ p_new->psz_object_type = psz_type;
+ p_new->psz_object_name = NULL;
+
+ p_new->b_die = false;
+ p_new->b_error = false;
+ p_new->b_dead = false;
+ p_new->b_force = false;
+
+ p_new->psz_header = NULL;
+
+ if (p_this)
+ 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;
+ }
+
+ 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_priv->next = p_priv->prev = p_new;
+ vlc_mutex_init( &structure_lock );
+#ifdef LIBVLC_REFCHECK
+ /* TODO: use the destruction callback to track ref leaks */
+ vlc_threadvar_create( &held_objects, held_objects_destroy );
+#endif
+ }
+ else
+ {
+ p_libvlc_global = vlc_global();
+ if( i_type == VLC_OBJECT_LIBVLC )
+ p_new->p_libvlc = (libvlc_int_t*)p_new;
+ else
+ p_new->p_libvlc = p_this->p_libvlc;
+ }
+
+ vlc_spin_init( &p_priv->ref_spin );
+ p_priv->i_refcount = 1;
+ p_priv->pf_destructor = NULL;
+ p_priv->b_thread = false;
+ p_new->p_parent = NULL;
+ 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_new, &p_priv->wait );
+ vlc_mutex_init( &p_priv->var_lock );
+ vlc_spin_init( &p_priv->spin );
+ p_priv->pipes[0] = p_priv->pipes[1] = -1;
+
+ p_priv->next = VLC_OBJECT (p_libvlc_global);
+#if !defined (LIBVLC_REFCHECK)
+ /* ... */
+#elif defined (LIBVLC_USE_PTHREAD)
+ p_priv->creator_id = pthread_self ();
+#elif defined (WIN32)
+ p_priv->creator_id = GetCurrentThreadId ();
+#endif
+ vlc_mutex_lock( &structure_lock );
+ p_priv->prev = vlc_internals (p_libvlc_global)->prev;
+ vlc_internals (p_libvlc_global)->prev = p_new;
+ vlc_internals (p_priv->prev)->next = p_new;
+ p_new->i_object_id = p_libvlc_global->i_counter++;
+ vlc_mutex_unlock( &structure_lock );
+
+ if( i_type == VLC_OBJECT_LIBVLC )
+ {
+ 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 );
+ var_AddCallback( p_new, "vars", DumpCommand, NULL );
+ }
+
+ return p_new;
+}
-/*****************************************************************************
- * vlc_object_create: initialize a vlc object
- *****************************************************************************
- * This function allocates memory for a vlc object and initializes it. If
- * i_type is not a known value such as VLC_OBJECT_ROOT, VLC_OBJECT_VOUT and
- * so on, vlc_object_create will use its value for the object size.
- *****************************************************************************/
/**
- * Initialize a vlc object
+ * 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).
*
- * This function allocates memory for a vlc object and initializes it. If
- * i_type is not a known value such as VLC_OBJECT_ROOT, VLC_OBJECT_VOUT and
- * so on, vlc_object_create will use its value for the object size.
+ * @return the new object, or NULL on error.
*/
void * __vlc_object_create( vlc_object_t *p_this, int i_type )
{
- vlc_object_t * p_new;
const char * psz_type;
size_t i_size;
switch( i_type )
{
- case VLC_OBJECT_ROOT:
- i_size = sizeof(libvlc_t);
- psz_type = "root";
- break;
- case VLC_OBJECT_VLC:
- i_size = sizeof(vlc_t);
- psz_type = "vlc";
- break;
- case VLC_OBJECT_MODULE:
- i_size = sizeof(module_t);
- psz_type = "module";
- 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_PLAYLIST:
- i_size = sizeof(playlist_t);
- psz_type = "playlist";
- break;
- case VLC_OBJECT_SD:
- i_size = sizeof(services_discovery_t);
- psz_type = "services discovery";
- break;
- case VLC_OBJECT_INPUT:
- i_size = sizeof(input_thread_t);
- psz_type = "input";
- break;
- case VLC_OBJECT_DEMUX:
- i_size = sizeof(demux_t);
- psz_type = "demux";
- break;
- case VLC_OBJECT_STREAM:
- i_size = sizeof(stream_t);
- psz_type = "stream";
- 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";
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_SPU:
- i_size = sizeof(spu_t);
- psz_type = "subpicture";
- 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_HTTPD:
- i_size = sizeof( httpd_t );
- psz_type = "http server";
- break;
- case VLC_OBJECT_HTTPD_HOST:
- i_size = sizeof( httpd_host_t );
- psz_type = "http server";
- break;
- case VLC_OBJECT_VLM:
- i_size = sizeof( vlm_t );
- psz_type = "vlm dameon";
- break;
- case VLC_OBJECT_VOD:
- i_size = sizeof( vod_t );
- psz_type = "vod server";
- break;
- case VLC_OBJECT_TLS:
- i_size = sizeof( tls_t );
- psz_type = "tls";
- break;
- case VLC_OBJECT_XML:
- i_size = sizeof( xml_t );
- psz_type = "xml";
- break;
case VLC_OBJECT_OPENGL:
i_size = sizeof( vout_thread_t );
psz_type = "opengl";
i_size = sizeof( announce_handler_t );
psz_type = "announce";
break;
- case VLC_OBJECT_OSDMENU:
- i_size = sizeof( osd_menu_t );
- psz_type = "osd menu";
- break;
- case VLC_OBJECT_STATS:
- i_size = sizeof( stats_handler_t );
- psz_type = "statistics";
- break;
default:
- i_size = i_type > (int)sizeof(vlc_object_t)
- ? i_type : (int)sizeof(vlc_object_t);
+ assert( i_type > 0 ); /* unknown type?! */
+ i_size = i_type;
i_type = VLC_OBJECT_GENERIC;
psz_type = "generic";
break;
}
- if( i_type == VLC_OBJECT_ROOT )
- {
- p_new = p_this;
- }
- else
- {
- p_new = malloc( i_size );
- if( !p_new ) return NULL;
- memset( p_new, 0, i_size );
- }
+ return vlc_custom_create( p_this, i_size, i_type, psz_type );
+}
- p_new->i_object_type = i_type;
- p_new->psz_object_type = psz_type;
- p_new->psz_object_name = NULL;
+/**
+ ****************************************************************************
+ * Set the destructor of a vlc object
+ *
+ * This function sets the destructor of the vlc object. It will be called
+ * 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 )
+{
+ vlc_object_internals_t *p_priv = vlc_internals(p_this );
+ p_priv->pf_destructor = pf_destructor;
+}
- p_new->b_die = VLC_FALSE;
- p_new->b_error = VLC_FALSE;
- p_new->b_dead = VLC_FALSE;
- p_new->b_attached = VLC_FALSE;
- p_new->b_force = VLC_FALSE;
+/**
+ ****************************************************************************
+ * Destroy a vlc object (Internal)
+ *
+ * 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.
+ *****************************************************************************/
+static void vlc_object_destroy( vlc_object_t *p_this )
+{
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
- p_new->psz_header = NULL;
+ /* Objects are always detached beforehand */
+ assert( !p_this->p_parent );
- p_new->i_flags = 0;
- if( p_this->i_flags & OBJECT_FLAGS_NODBG )
- p_new->i_flags |= OBJECT_FLAGS_NODBG;
- if( p_this->i_flags & OBJECT_FLAGS_QUIET )
- p_new->i_flags |= OBJECT_FLAGS_QUIET;
- if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
- p_new->i_flags |= OBJECT_FLAGS_NOINTERACT;
+ /* Send a kill to the object's thread if applicable */
+ vlc_object_kill( p_this );
- p_new->i_vars = 0;
- p_new->p_vars = (variable_t *)malloc( 16 * sizeof( variable_t ) );
+ /* If we are running on a thread, wait until it ends */
+ if( p_priv->b_thread )
+ vlc_thread_join( p_this );
- if( !p_new->p_vars )
+ /* Call the custom "subclass" destructor */
+ if( p_priv->pf_destructor )
+ p_priv->pf_destructor( p_this );
+
+ /* Destroy the associated variables, starting from the end so that
+ * no memmove calls have to be done. */
+ while( p_priv->i_vars )
{
- if( i_type != VLC_OBJECT_ROOT )
- free( p_new );
- return NULL;
+ var_Destroy( p_this, p_priv->p_vars[p_priv->i_vars - 1].psz_name );
}
- if( i_type == VLC_OBJECT_ROOT )
+ free( p_priv->p_vars );
+ vlc_mutex_destroy( &p_priv->var_lock );
+
+ free( p_this->psz_header );
+
+ if( p_this->p_libvlc == NULL )
{
- /* If i_type is root, then p_new is actually p_libvlc */
- p_new->p_libvlc = (libvlc_t*)p_new;
- p_new->p_vlc = NULL;
+ libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
- p_new->p_libvlc->i_counter = 0;
- p_new->i_object_id = 0;
+#ifndef NDEBUG
+ assert( p_global == vlc_global() );
+ /* Test for leaks */
+ if (p_priv->next != p_this)
+ {
+ vlc_object_t *leaked = p_priv->next, *first = leaked;
+ do
+ {
+ /* We are leaking this object */
+ fprintf( stderr,
+ "ERROR: leaking object (id:%i, type:%s, name:%s)\n",
+ leaked->i_object_id, leaked->psz_object_type,
+ leaked->psz_object_name );
+ /* Dump libvlc object to ease debugging */
+ vlc_object_dump( leaked );
+ fflush(stderr);
+ leaked = vlc_internals (leaked)->next;
+ }
+ while (leaked != first);
- p_new->p_libvlc->i_objects = 1;
- p_new->p_libvlc->pp_objects = malloc( sizeof(vlc_object_t *) );
- p_new->p_libvlc->pp_objects[0] = p_new;
- p_new->b_attached = VLC_TRUE;
+ /* Dump global 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. */
+ vlc_mutex_destroy( &structure_lock );
+#ifdef LIBVLC_REFCHECK
+ held_objects_destroy( vlc_threadvar_get( &held_objects ) );
+ vlc_threadvar_delete( &held_objects );
+#endif
}
- else
- {
- p_new->p_libvlc = p_this->p_libvlc;
- p_new->p_vlc = ( i_type == VLC_OBJECT_VLC ) ? (vlc_t*)p_new
- : p_this->p_vlc;
- vlc_mutex_lock( &structure_lock );
+ FREENULL( p_this->psz_object_name );
- p_new->p_libvlc->i_counter++;
- p_new->i_object_id = p_new->p_libvlc->i_counter;
+#if defined(WIN32) || defined(UNDER_CE)
+ /* if object has an associated thread, close it now */
+ if( p_priv->thread_id )
+ CloseHandle(p_priv->thread_id);
+#endif
- /* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
- * useless to try and recover anything if pp_objects gets smashed. */
- INSERT_ELEM( p_new->p_libvlc->pp_objects,
- p_new->p_libvlc->i_objects,
- p_new->p_libvlc->i_objects,
- p_new );
+ vlc_spin_destroy( &p_priv->ref_spin );
+ vlc_mutex_destroy( &p_priv->lock );
+ vlc_cond_destroy( &p_priv->wait );
+ vlc_spin_destroy( &p_priv->spin );
+ if( p_priv->pipes[1] != -1 )
+ close( p_priv->pipes[1] );
+ if( p_priv->pipes[0] != -1 )
+ close( p_priv->pipes[0] );
- vlc_mutex_unlock( &structure_lock );
- }
+ free( p_priv );
+}
- p_new->i_refcount = 0;
- p_new->p_parent = NULL;
- p_new->pp_children = NULL;
- p_new->i_children = 0;
- p_new->p_private = NULL;
+/** Inter-object signaling */
- /* Initialize mutexes and condvars */
- vlc_mutex_init( p_new, &p_new->object_lock );
- vlc_cond_init( p_new, &p_new->object_wait );
- vlc_mutex_init( p_new, &p_new->var_lock );
+void __vlc_object_lock( vlc_object_t *obj )
+{
+ vlc_mutex_lock( &(vlc_internals(obj)->lock) );
+}
- if( i_type == VLC_OBJECT_ROOT )
- {
- vlc_mutex_init( p_new, &structure_lock );
+void __vlc_object_unlock( vlc_object_t *obj )
+{
+ vlc_assert_locked( &(vlc_internals(obj)->lock) );
+ vlc_mutex_unlock( &(vlc_internals(obj)->lock) );
+}
- 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 );
- }
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
- return p_new;
+/**
+ * select()-able pipes emulated using Winsock
+ */
+static int pipe (int fd[2])
+{
+ SOCKADDR_IN addr;
+ int addrlen = sizeof (addr);
+
+ SOCKET l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP), a,
+ c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if ((l == INVALID_SOCKET) || (c == INVALID_SOCKET))
+ goto error;
+
+ memset (&addr, 0, sizeof (addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+ if (bind (l, (PSOCKADDR)&addr, sizeof (addr))
+ || getsockname (l, (PSOCKADDR)&addr, &addrlen)
+ || listen (l, 1)
+ || connect (c, (PSOCKADDR)&addr, addrlen))
+ goto error;
+
+ a = accept (l, NULL, NULL);
+ if (a == INVALID_SOCKET)
+ goto error;
+
+ closesocket (l);
+ //shutdown (a, 0);
+ //shutdown (c, 1);
+ fd[0] = c;
+ fd[1] = a;
+ return 0;
+
+error:
+ if (l != INVALID_SOCKET)
+ closesocket (l);
+ if (c != INVALID_SOCKET)
+ 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 */
+
/**
- ****************************************************************************
- * Destroy a vlc object
+ * Returns the readable end of a pipe that becomes readable once termination
+ * of the object is requested (vlc_object_kill()).
+ * This can be used to wake-up out of a select() or poll() event loop, such
+ * typically when doing network I/O.
*
- * 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.
- *****************************************************************************/
-void __vlc_object_destroy( vlc_object_t *p_this )
+ * Note that the pipe will remain the same for the lifetime of the object.
+ * DO NOT read the pipe nor close it yourself. Ever.
+ *
+ * @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 i_delay = 0;
-
- if( p_this->i_children )
- {
- msg_Err( p_this, "cannot delete object (%i, %s) with children" ,
- p_this->i_object_id, p_this->psz_object_name );
- return;
- }
+ int pfd[2] = { -1, -1 };
+ vlc_object_internals_t *internals = vlc_internals( obj );
+ bool killed = false;
- if( p_this->p_parent )
+ vlc_spin_lock (&internals->spin);
+ if (internals->pipes[0] == -1)
{
- msg_Err( p_this, "cannot delete object (%i, %s) with a parent",
- p_this->i_object_id, p_this->psz_object_name );
- return;
- }
+ /* This can only ever happen if someone killed us without locking: */
+ assert (internals->pipes[1] == -1);
+ vlc_spin_unlock (&internals->spin);
- while( p_this->i_refcount )
- {
- i_delay++;
+ if (pipe (pfd))
+ return -1;
- /* Don't warn immediately ... 100ms seems OK */
- if( i_delay == 2 )
- {
- msg_Warn( p_this,
- "refcount is %i, delaying before deletion (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
- p_this->i_object_type );
- }
- else if( i_delay == 10 )
+ vlc_spin_lock (&internals->spin);
+ if (internals->pipes[0] == -1)
{
- msg_Err( p_this,
- "refcount is %i, delaying again (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
- p_this->i_object_type );
+ internals->pipes[0] = pfd[0];
+ internals->pipes[1] = pfd[1];
+ pfd[0] = pfd[1] = -1;
}
- else if( i_delay == 20 )
- {
- msg_Err( p_this,
- "we waited too long, cancelling destruction (id=%d,type=%d)",
- p_this->i_object_id, p_this->i_object_type );
- return;
- }
-
- msleep( 100000 );
+ killed = obj->b_die;
}
+ vlc_spin_unlock (&internals->spin);
- /* Destroy the associated variables, starting from the end so that
- * no memmove calls have to be done. */
- while( p_this->i_vars )
+ if (killed)
{
- var_Destroy( p_this, p_this->p_vars[p_this->i_vars - 1].psz_name );
+ /* 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);
}
- free( p_this->p_vars );
- vlc_mutex_destroy( &p_this->var_lock );
+ /* Race condition: two threads call pipe() - unlikely */
+ if (pfd[0] != -1)
+ close (pfd[0]);
+ if (pfd[1] != -1)
+ close (pfd[1]);
- if( p_this->psz_header ) free( p_this->psz_header );
+ return internals->pipes[0];
+}
- if( p_this->i_object_type == VLC_OBJECT_ROOT )
- {
- /* We are the root object ... no need to lock. */
- free( p_this->p_libvlc->pp_objects );
- p_this->p_libvlc->pp_objects = NULL;
- p_this->p_libvlc->i_objects--;
- vlc_mutex_destroy( &structure_lock );
- }
- else
- {
- int i_index;
+/**
+ * Waits for the object to be signaled (using vlc_object_signal()).
+ * It is assumed that the caller has locked the object. This function will
+ * unlock the object, and lock it again before returning.
+ * If the object was signaled before the caller locked the object, it is
+ * undefined whether the signal will be lost or will wake the process.
+ *
+ * @return true if the object is dying and should terminate.
+ */
+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 );
+}
- vlc_mutex_lock( &structure_lock );
- /* 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_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects );
- REMOVE_ELEM( p_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects, i_index );
+/**
+ * Waits for the object to be signaled (using vlc_object_signal()), or for
+ * a timer to expire. It is asserted that the caller holds the object lock.
+ *
+ * @return 0 if the object was signaled before the timer expiration, or
+ * ETIMEDOUT if the timer expired without any signal.
+ */
+int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
+{
+ vlc_object_internals_t *priv = vlc_internals( obj );
+ vlc_assert_locked( &priv->lock);
+ return vlc_cond_timedwait( &priv->wait, &priv->lock, deadline );
+}
- vlc_mutex_unlock( &structure_lock );
- }
- vlc_mutex_destroy( &p_this->object_lock );
- vlc_cond_destroy( &p_this->object_wait );
+/**
+ * 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...
+
+ vlc_object_wait (self);
+
+ ...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( &(vlc_internals(obj)->lock) );
+ return !obj->b_die;
+}
+
- /* root is not dynamically allocated by vlc_object_create */
- if( p_this->i_object_type != VLC_OBJECT_ROOT )
- free( p_this );
+/**
+ * Signals an object for which the lock is held.
+ * At least one thread currently sleeping in vlc_object_wait() or
+ * vlc_object_timedwait() will wake up, assuming that there is at least one
+ * such thread in the first place. Otherwise, it is undefined whether the
+ * signal will be lost or will wake up one or more thread later.
+ */
+void __vlc_object_signal_unlocked( vlc_object_t *obj )
+{
+ vlc_assert_locked (&(vlc_internals(obj)->lock));
+ vlc_cond_signal( &(vlc_internals(obj)->wait) );
}
+
/**
- * 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( vlc_object_t *p_this, int i_id )
+ * Requests termination of an object.
+ * If the object is LibVLC, also request to terminate all its children.
+ */
+void __vlc_object_kill( vlc_object_t *p_this )
{
- int i_max, i_middle;
- vlc_object_t **pp_objects;
+ vlc_object_internals_t *priv = vlc_internals( p_this );
+ int fd;
- vlc_mutex_lock( &structure_lock );
+ vlc_object_lock( p_this );
+ p_this->b_die = true;
- pp_objects = p_this->p_libvlc->pp_objects;
+ vlc_spin_lock (&priv->spin);
+ fd = priv->pipes[1];
+ priv->pipes[1] = -1;
+ vlc_spin_unlock (&priv->spin);
- /* Perform our dichotomy */
- for( i_max = p_this->p_libvlc->i_objects - 1 ; ; )
+ if( fd != -1 )
{
- i_middle = i_max / 2;
+ msg_Dbg (p_this, "waitpipe: object killed");
+ close (fd);
+ }
+
+ vlc_object_signal_unlocked( p_this );
+ vlc_object_unlock( p_this );
+}
- 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_mutex_unlock( &structure_lock );
- pp_objects[i_middle+1]->i_refcount++;
- return pp_objects[i_middle+1];
- }
- break;
- }
- }
- else
- {
- vlc_mutex_unlock( &structure_lock );
- pp_objects[i_middle]->i_refcount++;
- return pp_objects[i_middle];
- }
- if( i_max == 0 )
+/**
+ * Find an object given its ID.
+ *
+ * This function looks for the object whose i_object_id field is i_id.
+ * This function is slow, and often used to hide bugs. Do not use it.
+ * If you need to retain reference to an object, yield the object pointer with
+ * vlc_object_yield(), use the pointer as your reference, and call
+ * vlc_object_release() when you're done.
+ */
+void * vlc_object_get( int i_id )
+{
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
+ vlc_object_t *obj = NULL;
+#ifndef NDEBUG
+ vlc_object_t *caller = vlc_threadobj ();
+
+ if (caller)
+ msg_Dbg (caller, "uses deprecated vlc_object_get(%d)", i_id);
+ else
+ fprintf (stderr, "main thread uses deprecated vlc_object_get(%d)\n",
+ i_id);
+#endif
+ vlc_mutex_lock( &structure_lock );
+
+ for( obj = vlc_internals (p_libvlc_global)->next;
+ obj != VLC_OBJECT (p_libvlc_global);
+ obj = vlc_internals (obj)->next )
+ {
+ if( obj->i_object_id == i_id )
{
- /* this means that i_max == i_middle, and since we have already
- * tested pp_objects[i_middle]), p_found is properly set. */
- break;
+ vlc_object_yield( obj );
+ goto out;
}
}
-
+ obj = NULL;
+#ifndef NDEBUG
+ if (caller)
+ msg_Warn (caller, "wants non-existing object %d", i_id);
+ else
+ fprintf (stderr, "main thread wants non-existing object %d\n", i_id);
+#endif
+out:
vlc_mutex_unlock( &structure_lock );
- return NULL;
+ return obj;
}
/**
{
vlc_object_t *p_found;
- vlc_mutex_lock( &structure_lock );
-
/* If we are of the requested type ourselves, don't look further */
if( !(i_mode & FIND_STRICT) && p_this->i_object_type == i_type )
{
- p_this->i_refcount++;
- vlc_mutex_unlock( &structure_lock );
+ vlc_object_yield( p_this );
+ return p_this;
+ }
+
+ /* Otherwise, recursively look for the object */
+ if ((i_mode & 0x000f) == FIND_ANYWHERE)
+ {
+#ifndef NDEBUG
+ if (i_type == VLC_OBJECT_PLAYLIST)
+ msg_Err (p_this, "using vlc_object_find(VLC_OBJECT_PLAYLIST) "
+ "instead of pl_Yield()");
+#endif
+ return vlc_object_find (p_this->p_libvlc, i_type,
+ (i_mode & ~0x000f)|FIND_CHILD);
+ }
+
+ vlc_mutex_lock( &structure_lock );
+ p_found = FindObject( p_this, i_type, i_mode );
+ vlc_mutex_unlock( &structure_lock );
+ return p_found;
+}
+
+/**
+ ****************************************************************************
+ * 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 )
+{
+ vlc_object_t *p_found;
+
+ /* 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 ) )
+ {
+ vlc_object_yield( p_this );
return p_this;
}
+ vlc_mutex_lock( &structure_lock );
+
/* Otherwise, recursively look for the object */
if( (i_mode & 0x000f) == FIND_ANYWHERE )
{
/* Find the root */
while( p_root->p_parent != NULL &&
- p_root != VLC_OBJECT( p_this->p_vlc ) )
+ p_root != VLC_OBJECT( p_this->p_libvlc ) )
{
p_root = p_root->p_parent;
}
- p_found = FindObject( p_root, i_type, (i_mode & ~0x000f)|FIND_CHILD );
- if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_vlc ) )
+ 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 = FindObject( VLC_OBJECT( p_this->p_vlc ),
- i_type, (i_mode & ~0x000f)|FIND_CHILD );
+ p_found = FindObjectName( VLC_OBJECT( p_this->p_libvlc ),
+ psz_name, (i_mode & ~0x000f)|FIND_CHILD );
}
}
else
{
- p_found = FindObject( p_this, i_type, i_mode );
+ p_found = FindObjectName( p_this, psz_name, i_mode );
}
vlc_mutex_unlock( &structure_lock );
}
/**
- ****************************************************************************
- * increment an object refcount
- *****************************************************************************/
+ * Increment an object reference counter.
+ */
void __vlc_object_yield( vlc_object_t *p_this )
{
- vlc_mutex_lock( &structure_lock );
- p_this->i_refcount++;
- vlc_mutex_unlock( &structure_lock );
+ vlc_object_internals_t *internals = vlc_internals( p_this );
+
+ vlc_spin_lock( &internals->ref_spin );
+ /* Avoid obvious freed object uses */
+ assert( internals->i_refcount > 0 );
+ /* Increment the counter */
+ internals->i_refcount++;
+ vlc_spin_unlock( &internals->ref_spin );
+#ifdef LIBVLC_REFCHECK
+ /* Update the list of referenced objects */
+ /* Using TLS, so no need to lock */
+ /* The following line may leak memory if a thread leaks objects. */
+ held_list_t *newhead = malloc (sizeof (*newhead));
+ held_list_t *oldhead = vlc_threadvar_get (&held_objects);
+ newhead->next = oldhead;
+ newhead->obj = p_this;
+ vlc_threadvar_set (&held_objects, newhead);
+#endif
}
-/**
- ****************************************************************************
+/*****************************************************************************
* decrement an object refcount
+ * And destroy the object if its refcount reach zero.
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
+ vlc_object_internals_t *internals = vlc_internals( p_this );
+ bool b_should_destroy;
+
+#ifdef LIBVLC_REFCHECK
+ /* Update the list of referenced objects */
+ /* Using TLS, so no need to lock */
+ for (held_list_t *hlcur = vlc_threadvar_get (&held_objects),
+ *hlprev = NULL;
+ hlcur != NULL;
+ hlprev = hlcur, hlcur = hlcur->next)
+ {
+ if (hlcur->obj == p_this)
+ {
+ if (hlprev == NULL)
+ vlc_threadvar_set (&held_objects, hlcur->next);
+ else
+ hlprev->next = hlcur->next;
+ free (hlcur);
+ break;
+ }
+ }
+ /* TODO: what if releasing without references? */
+#endif
+
+ 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 );
+
+ /* Slow path */
+ /* Remember that we cannot hold the spin while waiting on the mutex */
vlc_mutex_lock( &structure_lock );
- p_this->i_refcount--;
+ /* Take the spin again. Note that another thread may have yielded 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 )
+ {
+ /* 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;
+
+ /* Detach from parent to protect against FIND_CHILDREN */
+ vlc_object_detach_unlocked (p_this);
+ /* Detach from children to protect against FIND_PARENT */
+ for (int i = 0; i < internals->i_children; i++)
+ internals->pp_children[i]->p_parent = NULL;
+ }
+
vlc_mutex_unlock( &structure_lock );
+
+ if( b_should_destroy )
+ {
+ free( internals->pp_children );
+ internals->pp_children = NULL;
+ internals->i_children = 0;
+ vlc_object_destroy( p_this );
+ }
}
/**
*****************************************************************************/
void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
{
+ if( !p_this ) return;
+
vlc_mutex_lock( &structure_lock );
/* Attach the parent to its child */
+ assert (!p_this->p_parent);
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 );
+ vlc_object_internals_t *priv = vlc_internals( p_parent );
+ INSERT_ELEM( priv->pp_children, priv->i_children, priv->i_children,
+ p_this );
+
+ vlc_mutex_unlock( &structure_lock );
+}
+
+
+static void vlc_object_detach_unlocked (vlc_object_t *p_this)
+{
+ vlc_assert_locked (&structure_lock);
+
+ if (p_this->p_parent == NULL)
+ return;
+
+ vlc_object_internals_t *priv = vlc_internals( p_this->p_parent );
- /* Climb up the tree to see whether we are connected with the root */
- if( p_parent->b_attached )
+ 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 = priv->i_children ; i_index-- ; )
{
- SetAttachment( p_this, VLC_TRUE );
+ if( priv->pp_children[i_index] == p_this )
+ {
+ priv->i_children--;
+ for( i = i_index ; i < priv->i_children ; i++ )
+ priv->pp_children[i] = priv->pp_children[i+1];
+ }
}
- vlc_mutex_unlock( &structure_lock );
+ if( priv->i_children )
+ {
+ priv->pp_children = (vlc_object_t **)realloc( priv->pp_children,
+ priv->i_children * sizeof(vlc_object_t *) );
+ }
+ else
+ {
+ /* Special case - don't realloc() to zero to avoid leaking */
+ free( priv->pp_children );
+ priv->pp_children = NULL;
+ }
}
+
/**
****************************************************************************
* detach object from its parent
*****************************************************************************/
void __vlc_object_detach( vlc_object_t *p_this )
{
+ 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( p_this->p_parent->b_attached )
- {
- SetAttachment( p_this, VLC_FALSE );
- }
-
- DetachObject( p_this );
+ else
+ vlc_object_detach_unlocked( p_this );
vlc_mutex_unlock( &structure_lock );
}
+
/**
****************************************************************************
* find a list typed objects and increment their refcount
vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
{
vlc_list_t *p_list;
- vlc_object_t **pp_current, **pp_end;
- int i_count = 0, i_index = 0;
-
- vlc_mutex_lock( &structure_lock );
+ int i_count = 0;
/* Look for the objects */
switch( i_mode & 0x000f )
{
case FIND_ANYWHERE:
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
-
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( (*pp_current)->b_attached
- && (*pp_current)->i_object_type == i_type )
- {
- i_count++;
- }
- }
-
- p_list = NewList( i_count );
- pp_current = p_this->p_libvlc->pp_objects;
-
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( (*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;
+ /* Modules should probably not be object, and the module should perhaps
+ * not be shared across LibVLC instances. In the mean time, this ugly
+ * hack is brought to you by Courmisch. */
+ if (i_type == VLC_OBJECT_MODULE)
+ return vlc_list_find ((vlc_object_t *)vlc_global ()->p_module_bank,
+ i_type, FIND_CHILD);
+ return vlc_list_find (p_this->p_libvlc, i_type, FIND_CHILD);
case FIND_CHILD:
+ vlc_mutex_lock( &structure_lock );
i_count = CountChildren( p_this, i_type );
p_list = NewList( i_count );
/* Check allocation was successful */
if( p_list->i_count != i_count )
{
+ vlc_mutex_unlock( &structure_lock );
msg_Err( p_this, "list allocation failed!" );
p_list->i_count = 0;
break;
p_list->i_count = 0;
ListChildren( p_list, p_this, i_type );
+ vlc_mutex_unlock( &structure_lock );
break;
default:
break;
}
- vlc_mutex_unlock( &structure_lock );
-
return p_list;
}
+/**
+ * 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 *l;
+ vlc_object_internals_t *priv = vlc_internals( obj );
+
+ vlc_mutex_lock( &structure_lock );
+ l = NewList( priv->i_children );
+ for (int i = 0; i < l->i_count; i++)
+ {
+ vlc_object_yield( priv->pp_children[i] );
+ l->p_values[i].p_object = priv->pp_children[i];
+ }
+ vlc_mutex_unlock( &structure_lock );
+ return l;
+}
+
/*****************************************************************************
* DumpCommand: print the current vlc structure
*****************************************************************************
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- if( *psz_cmd == 't' )
+ (void)oldval; (void)p_data;
+ if( *psz_cmd == 'l' )
+ {
+ vlc_object_t *root = VLC_OBJECT (vlc_global ()), *cur = root;
+
+ vlc_mutex_lock( &structure_lock );
+ do
+ {
+ PrintObject (cur, "");
+ cur = vlc_internals (cur)->next;
+ }
+ while (cur != root);
+ vlc_mutex_unlock( &structure_lock );
+ }
+ else
{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- vlc_object_t *p_object;
+ vlc_object_t *p_object = NULL;
if( *newval.psz_string )
{
- p_object = vlc_object_get( p_this, atoi(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 */
+ p_object = vlc_object_find_name( p_this, newval.psz_string,
+ FIND_ANYWHERE );
if( !p_object )
{
return VLC_ENOOBJ;
}
}
- else
- {
- p_object = p_this->p_vlc ? VLC_OBJECT(p_this->p_vlc) : p_this;
- }
vlc_mutex_lock( &structure_lock );
- psz_foo[0] = '|';
- DumpStructure( p_object, 0, psz_foo );
+ if( *psz_cmd == 't' )
+ {
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- vlc_mutex_unlock( &structure_lock );
+ 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_this );
+ psz_foo[0] = '|';
+ DumpStructure( p_object, 0, psz_foo );
}
- }
- else if( *psz_cmd == 'l' )
- {
- vlc_object_t **pp_current, **pp_end;
+ else if( *psz_cmd == 'v' )
+ {
+ int i;
- vlc_mutex_lock( &structure_lock );
+ if( !p_object )
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
+ PrintObject( p_object, "" );
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( (*pp_current)->b_attached )
+ if( !vlc_internals( p_object )->i_vars )
+ printf( " `-o No variables\n" );
+ for( i = 0; i < vlc_internals( p_object )->i_vars; i++ )
{
- PrintObject( *pp_current, "" );
- }
- else
- {
- printf( " o %.8i %s (not attached)\n",
- (*pp_current)->i_object_id,
- (*pp_current)->psz_object_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" );
+#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 );
+
+ if( *newval.psz_string )
+ {
+ vlc_object_release( p_object );
+ }
}
return VLC_SUCCESS;
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- vlc_mutex_lock( &structure_lock );
-
- p_list->p_values[i_index].p_object->i_refcount--;
-
- vlc_mutex_unlock( &structure_lock );
+ vlc_object_release( p_list->p_values[i_index].p_object );
}
free( p_list->p_values );
free( p_list );
}
-/* 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.
+ * dump an object. (Debug function)
*****************************************************************************/
-static int FindIndex( vlc_object_t *p_this,
- vlc_object_t **pp_objects, int i_count )
+void __vlc_object_dump( vlc_object_t *p_this )
{
- 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
- {
- return FindIndex( p_this, pp_objects, i_middle );
- }
+ 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 */
+
static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )
{
int i;
{
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ vlc_object_yield( p_tmp );
return p_tmp;
}
else
break;
case FIND_CHILD:
- for( i = p_this->i_children; i--; )
+ for( i = vlc_internals( p_this )->i_children; i--; )
{
- p_tmp = p_this->pp_children[i];
+ p_tmp = vlc_internals( p_this )->pp_children[i];
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ vlc_object_yield( p_tmp );
return p_tmp;
}
- else if( p_tmp->i_children )
+ else if( vlc_internals( p_tmp )->i_children )
{
p_tmp = FindObject( p_tmp, i_type, i_mode );
if( p_tmp )
return NULL;
}
-static void DetachObject( vlc_object_t *p_this )
+static vlc_object_t * FindObjectName( vlc_object_t *p_this,
+ const char *psz_name,
+ int i_mode )
{
- vlc_object_t *p_parent = p_this->p_parent;
- int i_index, i;
-
- /* Remove p_this's parent */
- p_this->p_parent = NULL;
+ int i;
+ vlc_object_t *p_tmp;
- /* Remove all of p_parent's children which are p_this */
- for( i_index = p_parent->i_children ; i_index-- ; )
+ switch( i_mode & 0x000f )
{
- if( p_parent->pp_children[i_index] == p_this )
+ case FIND_PARENT:
+ p_tmp = p_this->p_parent;
+ if( p_tmp )
{
- p_parent->i_children--;
- for( i = i_index ; i < p_parent->i_children ; i++ )
+ if( p_tmp->psz_object_name
+ && !strcmp( p_tmp->psz_object_name, psz_name ) )
+ {
+ vlc_object_yield( p_tmp );
+ return p_tmp;
+ }
+ else
{
- p_parent->pp_children[i] = p_parent->pp_children[i+1];
+ return FindObjectName( p_tmp, psz_name, i_mode );
}
}
- }
-
- 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;
- }
-}
+ break;
-/*****************************************************************************
- * 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, vlc_bool_t b_attached )
-{
- int i_index;
+ case FIND_CHILD:
+ 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 ) )
+ {
+ vlc_object_yield( p_tmp );
+ return p_tmp;
+ }
+ else if( vlc_internals( p_tmp )->i_children )
+ {
+ p_tmp = FindObjectName( p_tmp, psz_name, i_mode );
+ if( p_tmp )
+ {
+ return p_tmp;
+ }
+ }
+ }
+ break;
- for( i_index = p_this->i_children ; i_index-- ; )
- {
- SetAttachment( p_this->pp_children[i_index], b_attached );
+ case FIND_ANYWHERE:
+ /* Handled in vlc_object_find */
+ break;
}
- p_this->b_attached = b_attached;
+ return NULL;
}
+
static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )
{
- char psz_children[20], psz_refcount[20], psz_thread[20], psz_name[50];
+ char psz_children[20], psz_refcount[20], psz_thread[30], psz_name[50],
+ psz_parent[20];
- psz_name[0] = '\0';
+ memset( &psz_name, 0, sizeof(psz_name) );
if( p_this->psz_object_name )
{
- snprintf( psz_name, 50, " \"%s\"", p_this->psz_object_name );
- psz_name[48] = '\"';
- psz_name[49] = '\0';
+ snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name );
+ if( psz_name[48] )
+ psz_name[48] = '\"';
}
psz_children[0] = '\0';
- switch( p_this->i_children )
+ switch( vlc_internals( p_this )->i_children )
{
case 0:
break;
strcpy( psz_children, ", 1 child" );
break;
default:
- snprintf( psz_children, 20,
- ", %i children", p_this->i_children );
- psz_children[19] = '\0';
+ snprintf( psz_children, 19, ", %i children",
+ vlc_internals( p_this )->i_children );
break;
}
psz_refcount[0] = '\0';
- if( p_this->i_refcount )
- {
- snprintf( psz_refcount, 20, ", refcount %i", p_this->i_refcount );
- psz_refcount[19] = '\0';
- }
+ if( vlc_internals( p_this )->i_refcount > 0 )
+ snprintf( psz_refcount, 19, ", refcount %u",
+ vlc_internals( p_this )->i_refcount );
psz_thread[0] = '\0';
- if( p_this->b_thread )
- {
- snprintf( psz_thread, 20, " (thread %d)", (int)p_this->thread_id );
- psz_thread[19] = '\0';
- }
+ if( vlc_internals( p_this )->b_thread )
+ snprintf( psz_thread, 29, " (thread %lu)",
+ (unsigned long)vlc_internals( p_this )->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\n", psz_prefix,
+ 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_name, psz_thread, psz_refcount, psz_children,
+ psz_parent );
}
static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo )
return;
}
- for( i = 0 ; i < p_this->i_children ; i++ )
+ for( i = 0 ; i < vlc_internals( p_this )->i_children ; i++ )
{
if( i_level )
{
}
}
- if( i == p_this->i_children - 1 )
+ if( i == vlc_internals( p_this )->i_children - 1 )
{
psz_foo[i_level] = '`';
}
psz_foo[i_level+1] = '-';
psz_foo[i_level+2] = '\0';
- DumpStructure( p_this->pp_children[i], i_level + 2, psz_foo );
+ DumpStructure( vlc_internals( p_this )->pp_children[i], i_level + 2,
+ psz_foo );
}
}
return;
}
- p_object->i_refcount++;
+ vlc_object_yield( p_object );
p_list->p_values[i_index].p_object = p_object;
return;
}
- p_object->i_refcount++;
+ vlc_object_yield( p_object );
p_list->p_values[p_list->i_count].p_object = p_object;
p_list->i_count++;
vlc_object_t *p_tmp;
int i, i_count = 0;
- for( i = 0; i < p_this->i_children; i++ )
+ for( i = 0; i < vlc_internals( p_this )->i_children; i++ )
{
- p_tmp = p_this->pp_children[i];
+ p_tmp = vlc_internals( 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 );
- }
+ i_count += CountChildren( p_tmp, i_type );
}
return i_count;
vlc_object_t *p_tmp;
int i;
- for( i = 0; i < p_this->i_children; i++ )
+ for( i = 0; i < vlc_internals( p_this )->i_children; i++ )
{
- p_tmp = p_this->pp_children[i];
+ p_tmp = vlc_internals( 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 );
- }
+ ListChildren( p_list, p_tmp, i_type );
}
}
+
+#ifdef LIBVLC_REFCHECK
+# if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE)
+# include <execinfo.h>
+# endif
+
+void vlc_refcheck (vlc_object_t *obj)
+{
+ static unsigned errors = 0;
+ if (errors > 100)
+ return;
+
+ /* Anyone can use the root object (though it should not exist) */
+ if (obj == VLC_OBJECT (vlc_global ()))
+ return;
+
+ /* Anyone can use its libvlc instance object */
+ if (obj == VLC_OBJECT (obj->p_libvlc))
+ return;
+
+ /* The thread that created the object holds the initial reference */
+ vlc_object_internals_t *priv = vlc_internals (obj);
+#if defined (LIBVLC_USE_PTHREAD)
+ if (pthread_equal (priv->creator_id, pthread_self ()))
+#elif defined WIN32
+ if (priv->creator_id == GetCurrentThreadId ())
+#else
+ if (0)
+#endif
+ return;
+
+ /* A thread can use its own object without references! */
+ vlc_object_t *caller = vlc_threadobj ();
+ if (caller == obj)
+ return;
+#if 0
+ /* The calling thread is younger than the object.
+ * Access could be valid through cross-thread synchronization;
+ * we would need better accounting. */
+ if (caller && (caller->i_object_id > obj->i_object_id))
+ return;
+#endif
+ int refs;
+ vlc_spin_lock (&priv->ref_spin);
+ refs = priv->i_refcount;
+ vlc_spin_unlock (&priv->ref_spin);
+
+ for (held_list_t *hlcur = vlc_threadvar_get (&held_objects);
+ hlcur != NULL; hlcur = hlcur->next)
+ if (hlcur->obj == obj)
+ return;
+
+ fprintf (stderr, "The %s %s thread object is accessing...\n"
+ "the %s %s object without references.\n",
+ caller && caller->psz_object_name
+ ? caller->psz_object_name : "unnamed",
+ caller ? caller->psz_object_type : "main",
+ obj->psz_object_name ? obj->psz_object_name : "unnamed",
+ obj->psz_object_type);
+ fflush (stderr);
+
+#ifdef HAVE_BACKTRACE
+ void *stack[20];
+ int stackdepth = backtrace (stack, sizeof (stack) / sizeof (stack[0]));
+ backtrace_symbols_fd (stack, stackdepth, 2);
+#endif
+
+ if (++errors == 100)
+ fprintf (stderr, "Too many reference errors!\n");
+}
+
+static void held_objects_destroy (void *data)
+{
+ VLC_UNUSED( data );
+ held_list_t *hl = vlc_threadvar_get (&held_objects);
+ vlc_object_t *caller = vlc_threadobj ();
+
+ while (hl != NULL)
+ {
+ held_list_t *buf = hl->next;
+ vlc_object_t *obj = hl->obj;
+
+ fprintf (stderr, "The %s %s thread object leaked a reference to...\n"
+ "the %s %s object.\n",
+ caller && caller->psz_object_name
+ ? caller->psz_object_name : "unnamed",
+ caller ? caller->psz_object_type : "main",
+ obj->psz_object_name ? obj->psz_object_name : "unnamed",
+ obj->psz_object_type);
+ free (hl);
+ hl = buf;
+ }
+}
+#endif
projects / vlc / blobdiff