* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.9 2002/06/07 16:06:09 sam Exp $
+ * $Id: objects.c,v 1.28 2002/11/09 16:34:53 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include "video.h"
#include "video_output.h"
-#include "vdec_ext-plugins.h"
-
#include "audio_output.h"
+#include "aout_internal.h"
-#include "playlist.h"
+#include "vlc_playlist.h"
#include "interface.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static vlc_object_t * vlc_object_find_inner( vlc_object_t *, int, int );
-static void vlc_object_detach_inner( vlc_object_t *, vlc_object_t * );
-static void vlc_dumpstructure_inner( vlc_object_t *, int, char * );
+static int DumpCommand( vlc_object_t *, char *, char * );
+
+static vlc_object_t * FindObject ( vlc_object_t *, int, 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 *, vlc_bool_t );
+
+static vlc_list_t * NewList ( void );
+static vlc_list_t * ListAppend ( vlc_list_t *, vlc_object_t * );
+
+/*****************************************************************************
+ * Local structure lock
+ *****************************************************************************/
+static vlc_mutex_t structure_lock;
/*****************************************************************************
* vlc_object_create: initialize a vlc object
switch( i_type )
{
case VLC_OBJECT_ROOT:
- i_size = sizeof(vlc_t);
+ 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";
psz_type = "video output";
break;
case VLC_OBJECT_AOUT:
- i_size = sizeof(aout_thread_t);
+ i_size = sizeof(aout_instance_t);
psz_type = "audio output";
break;
default:
- i_size = i_type > sizeof(vlc_object_t)
- ? i_type : sizeof(vlc_object_t);
- i_type = VLC_OBJECT_PRIVATE;
- psz_type = "private";
+ i_size = i_type > 0
+ ? i_type > sizeof(vlc_object_t)
+ ? i_type : sizeof(vlc_object_t)
+ : sizeof(vlc_object_t);
+ i_type = VLC_OBJECT_GENERIC;
+ psz_type = "generic";
break;
}
- p_new = malloc( i_size );
-
- if( !p_new )
+ if( i_type == VLC_OBJECT_ROOT )
{
- return NULL;
+ p_new = p_this;
}
+ else
+ {
+ p_new = malloc( i_size );
- memset( p_new, 0, i_size );
+ if( !p_new )
+ {
+ return NULL;
+ }
+
+ memset( p_new, 0, i_size );
+ }
p_new->i_object_type = i_type;
p_new->psz_object_type = psz_type;
p_new->psz_object_name = NULL;
- p_new->i_refcount = 0;
- p_new->b_die = 0;
- p_new->b_error = 0;
+ 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->i_vars = 0;
+ p_new->p_vars = (variable_t *)malloc( 16 * sizeof( variable_t ) );
+
+ if( !p_new->p_vars )
+ {
+ free( p_new );
+ return NULL;
+ }
- /* If i_type is root, then p_new is our own p_vlc */
if( i_type == VLC_OBJECT_ROOT )
{
- p_new->p_vlc = (vlc_t*)p_new;
- p_new->p_vlc->i_counter = 0;
+ /* 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;
+
+ p_new->p_libvlc->i_counter = 0;
p_new->i_object_id = 0;
+
+ 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;
}
else
{
- p_new->p_vlc = p_this->p_vlc;
+ 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 );
+
+ p_new->p_libvlc->i_counter++;
+ p_new->i_object_id = p_new->p_libvlc->i_counter;
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
- p_new->p_vlc->i_counter++;
- p_new->i_object_id = p_new->p_vlc->i_counter;
- vlc_mutex_unlock( &p_this->p_vlc->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. */
+ INSERT_ELEM( p_new->p_libvlc->pp_objects,
+ p_new->p_libvlc->i_objects,
+ p_new->p_libvlc->i_objects,
+ p_new );
+
+ vlc_mutex_unlock( &structure_lock );
}
- p_new->pp_parents = NULL;
- p_new->i_parents = 0;
+ 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;
+
+ /* Initialize mutexes and condvars */
vlc_mutex_init( p_new, &p_new->object_lock );
- vlc_cond_init( &p_new->object_wait );
+ vlc_cond_init( p_new, &p_new->object_wait );
+ vlc_mutex_init( p_new, &p_new->var_lock );
- //msg_Dbg( p_new, "created object" );
+ if( i_type == VLC_OBJECT_ROOT )
+ {
+ vlc_value_t val;
+ val.p_address = DumpCommand;
+
+ vlc_mutex_init( p_new, &structure_lock );
+
+ var_Create( p_new, "list", VLC_VAR_COMMAND );
+ var_Set( p_new, "list", val );
+ var_Create( p_new, "tree", VLC_VAR_COMMAND );
+ var_Set( p_new, "tree", val );
+ }
return p_new;
}
if( p_this->i_children )
{
msg_Err( p_this, "cannot delete object with children" );
- vlc_dumpstructure( p_this );
return;
}
- if( p_this->i_parents )
+ if( p_this->p_parent )
{
- msg_Err( p_this, "cannot delete object with parents" );
- vlc_dumpstructure( p_this );
+ msg_Err( p_this, "cannot delete object with a parent" );
return;
}
msleep( 100000 );
}
- //msg_Dbg( p_this, "destroyed object" );
+ /* Destroy the associated variables, starting from the end so that
+ * no memmove calls have to be done. */
+ while( p_this->i_vars )
+ {
+ var_Destroy( p_this, p_this->p_vars[p_this->i_vars - 1].psz_name );
+ }
+
+ free( p_this->p_vars );
+ vlc_mutex_destroy( &p_this->var_lock );
+
+ 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;
+
+ 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 );
+
+ vlc_mutex_unlock( &structure_lock );
+ }
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
free( p_this );
}
+/*****************************************************************************
+ * vlc_object_get: 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 )
+{
+ int i_max, i_middle;
+ vlc_object_t **pp_objects;
+
+ vlc_mutex_lock( &structure_lock );
+
+ pp_objects = p_this->p_libvlc->pp_objects;
+
+ /* Perform our dichotomy */
+ for( i_max = p_this->p_libvlc->i_objects - 1 ; ; )
+ {
+ i_middle = i_max / 2;
+
+ 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 );
+ return pp_objects[i_middle+1];
+ }
+ break;
+ }
+ }
+ else
+ {
+ vlc_mutex_unlock( &structure_lock );
+ return pp_objects[i_middle];
+ }
+
+ if( i_max == 0 )
+ {
+ /* this means that i_max == i_middle, and since we have already
+ * tested pp_objects[i_middle]), p_found is properly set. */
+ break;
+ }
+ }
+
+ vlc_mutex_unlock( &structure_lock );
+ return NULL;
+}
+
/*****************************************************************************
* vlc_object_find: find a typed object and increment its refcount
*****************************************************************************
{
vlc_object_t *p_found;
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
+ 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( &p_this->p_vlc->structure_lock );
+ vlc_mutex_unlock( &structure_lock );
return p_this;
}
/* Otherwise, recursively look for the object */
if( (i_mode & 0x000f) == FIND_ANYWHERE )
{
- p_found = vlc_object_find_inner( CAST_TO_VLC_OBJECT(p_this->p_vlc),
- i_type,
- (i_mode & ~0x000f) | FIND_CHILD );
+ p_found = FindObject( VLC_OBJECT(p_this->p_vlc), i_type,
+ (i_mode & ~0x000f) | FIND_CHILD );
}
else
{
- p_found = vlc_object_find_inner( p_this, i_type, i_mode );
+ p_found = FindObject( p_this, i_type, i_mode );
}
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_unlock( &structure_lock );
return p_found;
}
-static vlc_object_t * vlc_object_find_inner( vlc_object_t *p_this,
- int i_type, int i_mode )
-{
- int i;
- vlc_object_t *p_tmp;
-
- switch( i_mode & 0x000f )
- {
- case FIND_PARENT:
- for( i = p_this->i_parents; i--; )
- {
- p_tmp = p_this->pp_parents[i];
- if( p_tmp->i_object_type == i_type )
- {
- p_tmp->i_refcount++;
- return p_tmp;
- }
- else if( p_tmp->i_parents )
- {
- p_tmp = vlc_object_find_inner( p_tmp, i_type, i_mode );
- if( p_tmp )
- {
- return p_tmp;
- }
- }
- }
- 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 )
- {
- p_tmp->i_refcount++;
- return p_tmp;
- }
- else if( p_tmp->i_children )
- {
- p_tmp = vlc_object_find_inner( p_tmp, i_type, i_mode );
- if( p_tmp )
- {
- return p_tmp;
- }
- }
- }
- break;
-
- case FIND_ANYWHERE:
- /* Handled in vlc_object_find */
- break;
- }
-
- return NULL;
-}
-
/*****************************************************************************
* vlc_object_yield: increment an object refcount
*****************************************************************************/
void __vlc_object_yield( vlc_object_t *p_this )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_lock( &structure_lock );
p_this->i_refcount++;
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_unlock( &structure_lock );
}
/*****************************************************************************
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_lock( &structure_lock );
p_this->i_refcount--;
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_unlock( &structure_lock );
}
/*****************************************************************************
*****************************************************************************/
void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_lock( &structure_lock );
- p_this->i_parents++;
- p_this->pp_parents = (vlc_object_t **)realloc( p_this->pp_parents,
- p_this->i_parents * sizeof(vlc_object_t *) );
- p_this->pp_parents[p_this->i_parents - 1] = p_parent;
+ /* Attach the parent to its child */
+ p_this->p_parent = p_parent;
- p_parent->i_children++;
- p_parent->pp_children = (vlc_object_t **)realloc( p_parent->pp_children,
- p_parent->i_children * sizeof(vlc_object_t *) );
- p_parent->pp_children[p_parent->i_children - 1] = p_this;
+ /* Attach the child to its parent */
+ INSERT_ELEM( p_parent->pp_children, p_parent->i_children,
+ p_parent->i_children, p_this );
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ /* Climb up the tree to see whether we are connected with the root */
+ if( p_parent->b_attached )
+ {
+ SetAttachment( p_this, VLC_TRUE );
+ }
+
+ vlc_mutex_unlock( &structure_lock );
}
-#if 0 /* UNUSED */
-/* vlc_object_setchild: attach a child object */
-void __vlc_object_setchild( vlc_object_t *p_this, vlc_object_t *p_child )
+/*****************************************************************************
+ * 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 )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
-
- p_this->i_children++;
- p_this->pp_children = (vlc_object_t **)realloc( p_this->pp_children,
- p_this->i_children * sizeof(vlc_object_t *) );
- p_this->pp_children[p_this->i_children - 1] = p_child;
+ vlc_mutex_lock( &structure_lock );
+ if( !p_this->p_parent )
+ {
+ msg_Err( p_this, "object is not attached" );
+ vlc_mutex_unlock( &structure_lock );
+ return;
+ }
- p_child->i_parents++;
- p_child->pp_parents = (vlc_object_t **)realloc( p_child->pp_parents,
- p_child->i_parents * sizeof(vlc_object_t *) );
- p_child->pp_parents[p_child->i_parents - 1] = p_this;
+ /* 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 );
+ }
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ DetachObject( p_this );
+ vlc_mutex_unlock( &structure_lock );
}
-#endif
/*****************************************************************************
- * vlc_object_detach_all: detach object from its parents
+ * vlc_list_find: find a list typed objects and increment their refcount
*****************************************************************************
- * This function unlinks an object from all its parents. It is up to the
- * object to get rid of its children, so this function doesn't do anything
- * with them.
+ * 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_detach_all( vlc_object_t *p_this )
+vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
+ vlc_list_t *p_list = NewList();
+
+ vlc_mutex_lock( &structure_lock );
+
+ /* Look for the objects */
+ if( (i_mode & 0x000f) == FIND_ANYWHERE )
+ {
+ vlc_object_t **pp_current, **pp_end;
+
+ pp_current = p_this->p_libvlc->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc->i_objects;
- /* FIXME: BORK ! BORK ! BORK !!! THIS STUFF IS BORKED !! FIXME */
- while( p_this->i_parents )
+ for( ; pp_current < pp_end ; pp_current++ )
+ {
+ if( (*pp_current)->b_attached
+ && (*pp_current)->i_object_type == i_type )
+ {
+ p_list = ListAppend( p_list, *pp_current );
+ }
+ }
+ }
+ else
{
- /* Not very effective because we know the index, but we'd have to
- * parse p_parent->pp_children anyway. Plus, we remove duplicates
- * by not using the object's index */
- vlc_object_detach_inner( p_this, p_this->pp_parents[0] );
+ msg_Err( p_this, "unimplemented!" );
}
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ vlc_mutex_unlock( &structure_lock );
+
+ return p_list;
}
/*****************************************************************************
- * vlc_object_detach: remove a parent/child link
+ * DumpCommand: print the current vlc structure
*****************************************************************************
- * This function removes all links between an object and a given parent.
+ * This function prints either an ASCII tree showing the connections between
+ * vlc objects, and additional information such as their refcount, thread ID,
+ * etc. (command "tree"), or the same data as a simple list (command "list").
*****************************************************************************/
-void __vlc_object_detach( vlc_object_t *p_this, vlc_object_t *p_parent )
+static int DumpCommand( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
{
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
- vlc_object_detach_inner( p_this, p_parent );
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
-}
+ if( *psz_cmd == 't' )
+ {
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
+ vlc_object_t *p_object;
-static void vlc_object_detach_inner( vlc_object_t *p_this,
- vlc_object_t *p_parent )
-{
- int i_index, i;
+ if( *psz_arg )
+ {
+ p_object = vlc_object_get( p_this, atoi(psz_arg) );
- /* Remove all of p_this's parents which are p_parent */
- for( i_index = p_this->i_parents ; i_index-- ; )
+ 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 );
+
+ vlc_mutex_unlock( &structure_lock );
+ }
+ else if( *psz_cmd == 'l' )
{
- if( p_this->pp_parents[i_index] == p_parent )
+ vlc_object_t **pp_current, **pp_end;
+
+ vlc_mutex_lock( &structure_lock );
+
+ 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++ )
{
- p_this->i_parents--;
- for( i = i_index ; i < p_this->i_parents ; i++ )
+ if( (*pp_current)->b_attached )
+ {
+ PrintObject( *pp_current, "" );
+ }
+ else
{
- p_this->pp_parents[i] = p_this->pp_parents[i+1];
+ printf( " o %.8i %s (not attached)\n",
+ (*pp_current)->i_object_id,
+ (*pp_current)->psz_object_type );
}
}
+
+ vlc_mutex_unlock( &structure_lock );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * vlc_list_release: free a list previously allocated by vlc_list_find
+ *****************************************************************************
+ * This function decreases the refcount of all objects in the list and
+ * frees the list.
+ *****************************************************************************/
+void vlc_list_release( vlc_list_t *p_list )
+{
+ if( p_list->i_count )
+ {
+ vlc_object_t ** pp_current = p_list->pp_objects;
+
+ vlc_mutex_lock( &structure_lock );
+
+ while( pp_current[0] )
+ {
+ pp_current[0]->i_refcount--;
+ pp_current++;
+ }
+
+ vlc_mutex_unlock( &structure_lock );
}
- if( p_this->i_parents )
+ 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.
+ *****************************************************************************/
+static int FindIndex( vlc_object_t *p_this,
+ vlc_object_t **pp_objects, int i_count )
+{
+ int i_middle = i_count / 2;
+
+ if( i_count == 0 )
{
- p_this->pp_parents = (vlc_object_t **)realloc( p_this->pp_parents,
- p_this->i_parents * sizeof(vlc_object_t *) );
+ 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
{
- free( p_this->pp_parents );
- p_this->pp_parents = NULL;
+ return FindIndex( p_this, pp_objects, i_middle );
+ }
+}
+
+static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode )
+{
+ int i;
+ vlc_object_t *p_tmp;
+
+ switch( i_mode & 0x000f )
+ {
+ case FIND_PARENT:
+ p_tmp = p_this->p_parent;
+ if( p_tmp )
+ {
+ if( p_tmp->i_object_type == i_type )
+ {
+ p_tmp->i_refcount++;
+ 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 )
+ {
+ p_tmp->i_refcount++;
+ 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;
}
+ return NULL;
+}
+
+static void DetachObject( vlc_object_t *p_this )
+{
+ 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-- ; )
{
}
/*****************************************************************************
- * vlc_dumpstructure: print the current vlc structure
+ * SetAttachment: recursively set the b_attached flag of a subtree.
*****************************************************************************
- * This function prints an ASCII tree showing the connections between vlc
- * objects, and additional information such as their refcount, thread ID,
- * address, etc.
+ * This function is used by the attach and detach functions to propagate
+ * the b_attached flag in a subtree.
*****************************************************************************/
-void __vlc_dumpstructure( vlc_object_t *p_this )
+static void SetAttachment( vlc_object_t *p_this, vlc_bool_t b_attached )
{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
+ int i_index;
- vlc_mutex_lock( &p_this->p_vlc->structure_lock );
- psz_foo[0] = '|';
- vlc_dumpstructure_inner( p_this, 0, psz_foo );
- vlc_mutex_unlock( &p_this->p_vlc->structure_lock );
+ for( i_index = p_this->i_children ; i_index-- ; )
+ {
+ SetAttachment( p_this->pp_children[i_index], b_attached );
+ }
+
+ p_this->b_attached = b_attached;
}
-static void vlc_dumpstructure_inner( vlc_object_t *p_this,
- int i_level, char *psz_foo )
+static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )
{
- int i;
- char i_back = psz_foo[i_level];
char psz_children[20], psz_refcount[20], psz_thread[20], psz_name[50];
psz_name[0] = '\0';
strcpy( psz_children, ", 1 child" );
break;
default:
- snprintf( psz_children, 20, ", %i children", p_this->i_children );
+ snprintf( psz_children, 20,
+ ", %i children", p_this->i_children );
psz_children[19] = '\0';
break;
}
psz_thread[19] = '\0';
}
+ printf( " %so %.8i %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 );
+}
+
+static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo )
+{
+ int i;
+ char i_back = psz_foo[i_level];
psz_foo[i_level] = '\0';
- msg_Info( p_this, "%so %s %p%s%s%s%s", psz_foo, p_this->psz_object_type,
- p_this, psz_name, psz_thread, psz_refcount, psz_children );
+
+ PrintObject( p_this, psz_foo );
+
psz_foo[i_level] = i_back;
if( i_level / 2 >= MAX_DUMPSTRUCTURE_DEPTH )
psz_foo[i_level+1] = '-';
psz_foo[i_level+2] = '\0';
- vlc_dumpstructure_inner( p_this->pp_children[i], i_level + 2, psz_foo );
+ DumpStructure( p_this->pp_children[i], i_level + 2, psz_foo );
+ }
+}
+
+static vlc_list_t * NewList( void )
+{
+ vlc_list_t *p_list = malloc( sizeof( vlc_list_t )
+ + 3 * sizeof( vlc_object_t * ) );
+
+ if( p_list == NULL )
+ {
+ return NULL;
}
+
+ p_list->i_count = 0;
+ p_list->pp_objects = &p_list->_p_first;
+
+ /* We allocated space for NULL and for three extra objects */
+ p_list->_i_extra = 3;
+ p_list->_p_first = NULL;
+
+ return p_list;
+}
+
+static vlc_list_t * ListAppend( vlc_list_t *p_list, vlc_object_t *p_object )
+{
+ if( p_list == NULL )
+ {
+ return NULL;
+ }
+
+ if( p_list->_i_extra == 0 )
+ {
+ /* If we had X objects it means the array has a size of X+1, we
+ * make it size 2X+2, so we alloc 2X+1 because there is already
+ * one allocated in the real structure */
+ p_list = realloc( p_list, sizeof( vlc_list_t )
+ + (p_list->i_count * 2 + 1)
+ * sizeof( vlc_object_t * ) );
+ if( p_list == NULL )
+ {
+ return NULL;
+ }
+
+ /* We have X+1 extra slots */
+ p_list->_i_extra = p_list->i_count + 1;
+ p_list->pp_objects = &p_list->_p_first;
+ }
+
+ p_object->i_refcount++;
+
+ p_list->pp_objects[p_list->i_count] = p_object;
+ p_list->i_count++;
+ p_list->pp_objects[p_list->i_count] = NULL;
+ p_list->_i_extra--;
+
+ return p_list;
}