X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fobjects.c;h=0f42de7ae945589be4907316cc0e1d998ffb5b67;hb=3bda52aeb85164b299385f07fbe589bc3226b23d;hp=276293fed32f5aa69f8cfbdf20844ba5d1a9a8ff;hpb=123b3214ec0802b2c8d1ce6c693dd3b79e1ada31;p=vlc diff --git a/src/misc/objects.c b/src/misc/objects.c index 276293fed3..0f42de7ae9 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -1,8 +1,8 @@ /***************************************************************************** * objects.c: vlc_object_t handling ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: objects.c,v 1.14 2002/08/07 21:36:56 massiot Exp $ + * Copyright (C) 2004 VideoLAN + * $Id$ * * Authors: Samuel Hocevar * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -21,6 +21,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +/** + * \file + * This file contains the functions to handle the vlc_object_t type + */ + + /***************************************************************************** * Preamble *****************************************************************************/ @@ -34,21 +40,42 @@ #include "input_ext-intf.h" #include "input_ext-dec.h" -#include "video.h" +#include "vlc_video.h" #include "video_output.h" #include "audio_output.h" #include "aout_internal.h" +#include "stream_output.h" #include "vlc_playlist.h" -#include "interface.h" +#include "vlc_interface.h" +#include "vlc_codec.h" +#include "vlc_httpd.h" +#include "vlc_vlm.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 const *, + vlc_value_t, vlc_value_t, void * ); + +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 ( 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 ); + +/***************************************************************************** + * Local structure lock + *****************************************************************************/ +static vlc_mutex_t structure_lock; /***************************************************************************** * vlc_object_create: initialize a vlc object @@ -57,6 +84,14 @@ static void vlc_dumpstructure_inner( vlc_object_t *, int, char * ); * 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 + * + * 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. + */ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) { vlc_object_t * p_new; @@ -66,9 +101,13 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) 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"; @@ -77,6 +116,10 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) i_size = sizeof(intf_thread_t); psz_type = "interface"; break; + case VLC_OBJECT_DIALOGS: + i_size = sizeof(intf_thread_t); + psz_type = "dialogs provider"; + break; case VLC_OBJECT_PLAYLIST: i_size = sizeof(playlist_t); psz_type = "playlist"; @@ -86,9 +129,17 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) psz_type = "input"; break; case VLC_OBJECT_DECODER: - i_size = sizeof(decoder_fifo_t); + 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_VOUT: i_size = sizeof(vout_thread_t); psz_type = "video output"; @@ -97,67 +148,131 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) 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 daemon"; + break; + case VLC_OBJECT_VLM: + i_size = sizeof( vlm_t ); + psz_type = "vlm dameon"; + break; + case VLC_OBJECT_ANNOUNCE: + i_size = sizeof( announce_handler_t ); + psz_type = "announce handler"; + break; default: - i_size = i_type > sizeof(vlc_object_t) - ? i_type : sizeof(vlc_object_t); + i_size = i_type > 0 + ? i_type > (int)sizeof(vlc_object_t) + ? i_type : (int)sizeof(vlc_object_t) + : (int)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 ); + + if( !p_new ) + { + return NULL; + } - memset( p_new, 0, i_size ); + 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, &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_mutex_init( p_new, &structure_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 ); + } return p_new; } -/***************************************************************************** - * vlc_object_destroy: destroy a vlc object - ***************************************************************************** +/** + **************************************************************************** + * Destroy a vlc object + * * 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. @@ -168,15 +283,15 @@ void __vlc_object_destroy( vlc_object_t *p_this ) if( p_this->i_children ) { - msg_Err( p_this, "cannot delete object with children" ); - vlc_dumpstructure( p_this ); + msg_Err( p_this, "cannot delete object (%i, %s) with children" , + p_this->i_object_id, p_this->psz_object_name ); 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 (%i, %s) with a parent", + p_this->i_object_id, p_this->psz_object_name ); return; } @@ -204,7 +319,40 @@ void __vlc_object_destroy( vlc_object_t *p_this ) 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 ); @@ -212,8 +360,71 @@ void __vlc_object_destroy( vlc_object_t *p_this ) free( p_this ); } -/***************************************************************************** - * vlc_object_find: find a typed object and increment its refcount +/** + * 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 ); + 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 ) + { + /* 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; +} + +/** + **************************************************************************** + * 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. @@ -222,216 +433,386 @@ void * __vlc_object_find( vlc_object_t *p_this, int i_type, int i_mode ) { 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( VLC_OBJECT(p_this->p_vlc), - i_type, - (i_mode & ~0x000f) | FIND_CHILD ); + vlc_object_t *p_root = p_this; + + /* Find the root */ + while( p_root->p_parent != NULL && + p_root != VLC_OBJECT( p_this->p_vlc ) ) + { + 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 = 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 ) +/** + **************************************************************************** + * increment an object refcount + *****************************************************************************/ +void __vlc_object_yield( vlc_object_t *p_this ) { - int i; - vlc_object_t *p_tmp; + vlc_mutex_lock( &structure_lock ); + p_this->i_refcount++; + vlc_mutex_unlock( &structure_lock ); +} + +/** + **************************************************************************** + * decrement an object refcount + *****************************************************************************/ +void __vlc_object_release( vlc_object_t *p_this ) +{ + vlc_mutex_lock( &structure_lock ); + p_this->i_refcount--; + vlc_mutex_unlock( &structure_lock ); +} + +/** + **************************************************************************** + * 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 ) +{ + vlc_mutex_lock( &structure_lock ); + + /* 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 ); + + /* 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 ); +} + +/** + **************************************************************************** + * 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( &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 ); + vlc_mutex_unlock( &structure_lock ); +} + +/** + **************************************************************************** + * 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 ) +{ + vlc_list_t *p_list; + vlc_object_t **pp_current, **pp_end; + int i_count = 0, i_index = 0; + + vlc_mutex_lock( &structure_lock ); + + /* Look for the objects */ switch( i_mode & 0x000f ) { - case FIND_PARENT: - for( i = p_this->i_parents; i--; ) + 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++ ) { - p_tmp = p_this->pp_parents[i]; - if( p_tmp->i_object_type == i_type ) + if( (*pp_current)->b_attached + && (*pp_current)->i_object_type == i_type ) { - p_tmp->i_refcount++; - return p_tmp; + i_count++; } - else if( p_tmp->i_parents ) + } + + 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 ) { - p_tmp = vlc_object_find_inner( p_tmp, i_type, i_mode ); - if( p_tmp ) - { - return p_tmp; - } + ListReplace( p_list, *pp_current, i_index ); + if( i_index < i_count ) i_index++; } } - break; + break; case FIND_CHILD: - for( i = p_this->i_children; i--; ) + i_count = CountChildren( p_this, i_type ); + p_list = NewList( i_count ); + + /* Check allocation was successful */ + if( p_list->i_count != i_count ) { - 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; - } - } + 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 ); break; - case FIND_ANYWHERE: - /* Handled in vlc_object_find */ + default: + msg_Err( p_this, "unimplemented!" ); + p_list = NewList( 0 ); break; } - return NULL; -} + vlc_mutex_unlock( &structure_lock ); -/***************************************************************************** - * 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 ); - p_this->i_refcount++; - vlc_mutex_unlock( &p_this->p_vlc->structure_lock ); -} - -/***************************************************************************** - * vlc_object_release: decrement an object refcount - *****************************************************************************/ -void __vlc_object_release( vlc_object_t *p_this ) -{ - vlc_mutex_lock( &p_this->p_vlc->structure_lock ); - p_this->i_refcount--; - vlc_mutex_unlock( &p_this->p_vlc->structure_lock ); + return p_list; } /***************************************************************************** - * vlc_object_attach: attach object to a parent object + * DumpCommand: print the current vlc structure ***************************************************************************** - * 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. + * 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_attach( vlc_object_t *p_this, vlc_object_t *p_parent ) +static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - vlc_mutex_lock( &p_this->p_vlc->structure_lock ); + if( *psz_cmd == 't' ) + { + char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1]; + vlc_object_t *p_object; - 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; + if( *newval.psz_string ) + { + p_object = vlc_object_get( p_this, atoi(newval.psz_string) ); - 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; + if( !p_object ) + { + return VLC_ENOOBJ; + } + } + else + { + p_object = p_this->p_vlc ? VLC_OBJECT(p_this->p_vlc) : p_this; + } - vlc_mutex_unlock( &p_this->p_vlc->structure_lock ); -} + vlc_mutex_lock( &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_mutex_lock( &p_this->p_vlc->structure_lock ); + psz_foo[0] = '|'; + DumpStructure( p_object, 0, psz_foo ); + + vlc_mutex_unlock( &structure_lock ); + + if( *newval.psz_string ) + { + vlc_object_release( p_this ); + } + } + else if( *psz_cmd == 'l' ) + { + 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; - 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; + for( ; pp_current < pp_end ; pp_current++ ) + { + if( (*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 ); + } + } - 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; + vlc_mutex_unlock( &structure_lock ); + } - vlc_mutex_unlock( &p_this->p_vlc->structure_lock ); + return VLC_SUCCESS; } -#endif /***************************************************************************** - * vlc_object_detach_all: detach object from its parents + * vlc_list_release: free a list previously allocated by vlc_list_find ***************************************************************************** - * 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 decreases the refcount of all objects in the list and + * frees the list. *****************************************************************************/ -void __vlc_object_detach_all( vlc_object_t *p_this ) +void vlc_list_release( vlc_list_t *p_list ) { - vlc_mutex_lock( &p_this->p_vlc->structure_lock ); + int i_index; - /* FIXME: BORK ! BORK ! BORK !!! THIS STUFF IS BORKED !! FIXME */ - while( p_this->i_parents ) + for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - /* 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] ); + vlc_mutex_lock( &structure_lock ); + + p_list->p_values[i_index].p_object->i_refcount--; + + vlc_mutex_unlock( &structure_lock ); } - vlc_mutex_unlock( &p_this->p_vlc->structure_lock ); + free( p_list->p_values ); + free( p_list ); } +/* Following functions are local */ + /***************************************************************************** - * vlc_object_detach: remove a parent/child link + * FindIndex: find the index of an object in an array of objects ***************************************************************************** - * This function removes all links between an object and a given parent. + * 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. *****************************************************************************/ -void __vlc_object_detach( vlc_object_t *p_this, vlc_object_t *p_parent ) +static int FindIndex( vlc_object_t *p_this, + vlc_object_t **pp_objects, int i_count ) { - 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 ); + 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 ); + } } -static void vlc_object_detach_inner( vlc_object_t *p_this, - vlc_object_t *p_parent ) +static vlc_object_t * FindObject( vlc_object_t *p_this, int i_type, int i_mode ) { - int i_index, i; + int i; + vlc_object_t *p_tmp; - /* Remove all of p_this's parents which are p_parent */ - for( i_index = p_this->i_parents ; i_index-- ; ) + switch( i_mode & 0x000f ) { - if( p_this->pp_parents[i_index] == p_parent ) + case FIND_PARENT: + p_tmp = p_this->p_parent; + if( p_tmp ) { - p_this->i_parents--; - for( i = i_index ; i < p_this->i_parents ; i++ ) + if( p_tmp->i_object_type == i_type ) { - p_this->pp_parents[i] = p_this->pp_parents[i+1]; + p_tmp->i_refcount++; + return p_tmp; + } + else + { + return FindObject( p_tmp, i_type, i_mode ); } } - } + break; - if( p_this->i_parents ) - { - p_this->pp_parents = (vlc_object_t **)realloc( p_this->pp_parents, - p_this->i_parents * sizeof(vlc_object_t *) ); - } - else - { - free( p_this->pp_parents ); - p_this->pp_parents = NULL; + 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-- ; ) { @@ -458,27 +839,25 @@ static void vlc_object_detach_inner( vlc_object_t *p_this, } /***************************************************************************** - * 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; + + for( i_index = p_this->i_children ; i_index-- ; ) + { + SetAttachment( p_this->pp_children[i_index], b_attached ); + } - 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 ); + 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'; @@ -518,9 +897,19 @@ static void vlc_dumpstructure_inner( vlc_object_t *p_this, 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 ) @@ -553,7 +942,114 @@ static void vlc_dumpstructure_inner( vlc_object_t *p_this, 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( int i_count ) +{ + vlc_list_t * p_list = (vlc_list_t *)malloc( sizeof( vlc_list_t ) ); + if( p_list == NULL ) + { + return NULL; + } + + p_list->i_count = i_count; + + if( i_count == 0 ) + { + p_list->p_values = NULL; + return p_list; + } + + p_list->p_values = malloc( i_count * sizeof( vlc_value_t ) ); + if( p_list->p_values == NULL ) + { + p_list->i_count = 0; + return p_list; + } + + 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; + } + + p_object->i_refcount++; + + 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; + } + + p_object->i_refcount++; + + 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 ); + } + } +}