* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.26 2002/10/17 13:15:31 sam Exp $
+ * $Id: objects.c,v 1.37 2003/06/26 12:19:59 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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
#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 "httpd.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int DumpCommand( vlc_object_t *, char *, 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 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 * );
+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
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;
default:
i_size = i_type > 0
- ? i_type > sizeof(vlc_object_t)
- ? i_type : sizeof(vlc_object_t)
- : sizeof(vlc_object_t);
+ ? 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;
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- p_new->p_libvlc->i_objects++;
- p_new->p_libvlc->pp_objects =
- realloc( p_new->p_libvlc->pp_objects,
- p_new->p_libvlc->i_objects * sizeof(vlc_object_t *) );
- p_new->p_libvlc->pp_objects[ p_new->p_libvlc->i_objects - 1 ] = p_new;
+ 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 );
}
{
vlc_mutex_init( p_new, &structure_lock );
- var_Create( p_new, "list", VLC_VAR_COMMAND );
- var_Set( p_new, "list", (vlc_value_t)(void*)DumpCommand );
- var_Create( p_new, "tree", VLC_VAR_COMMAND );
- var_Set( p_new, "tree", (vlc_value_t)(void*)DumpCommand );
+ 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;
/* 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 );
}
* 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 );
- memmove( p_this->p_libvlc->pp_objects + i_index,
- p_this->p_libvlc->pp_objects + i_index + 1,
- (p_this->p_libvlc->i_objects - i_index - 1)
- * sizeof( vlc_object_t *) );
-
- p_this->p_libvlc->pp_objects =
- realloc( p_this->p_libvlc->pp_objects,
- (p_this->p_libvlc->i_objects - 1) * sizeof(vlc_object_t *) );
+ REMOVE_ELEM( p_this->p_libvlc->pp_objects,
+ p_this->p_libvlc->i_objects, i_index );
vlc_mutex_unlock( &structure_lock );
}
- p_this->p_libvlc->i_objects--;
-
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
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];
}
p_this->p_parent = p_parent;
/* Attach the child to its 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;
+ 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 )
*****************************************************************************/
vlc_list_t * __vlc_list_find( vlc_object_t *p_this, int i_type, int i_mode )
{
- vlc_list_t *p_list = NewList();
+ 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 */
- if( (i_mode & 0x000f) == FIND_ANYWHERE )
+ switch( i_mode & 0x000f )
{
- vlc_object_t **pp_current, **pp_end;
-
+ case FIND_ANYWHERE:
pp_current = p_this->p_libvlc->pp_objects;
pp_end = pp_current + p_this->p_libvlc->i_objects;
if( (*pp_current)->b_attached
&& (*pp_current)->i_object_type == i_type )
{
- p_list = ListAppend( p_list, *pp_current );
+ i_count++;
}
}
- }
- else
- {
+
+ 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;
+
+ case FIND_CHILD:
+ i_count = CountChildren( p_this, i_type );
+ p_list = NewList( i_count );
+
+ /* Check allocation was successful */
+ if( p_list->i_count != i_count )
+ {
+ 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;
+
+ default:
msg_Err( p_this, "unimplemented!" );
+ p_list = NewList( 0 );
+ break;
}
vlc_mutex_unlock( &structure_lock );
* vlc objects, and additional information such as their refcount, thread ID,
* etc. (command "tree"), or the same data as a simple list (command "list").
*****************************************************************************/
-static int DumpCommand( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
+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' )
{
char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
vlc_object_t *p_object;
- if( *psz_arg )
+ if( *newval.psz_string )
{
- p_object = vlc_object_get( p_this, atoi(psz_arg) );
+ p_object = vlc_object_get( p_this, atoi(newval.psz_string) );
if( !p_object )
{
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' )
{
*****************************************************************************/
void vlc_list_release( vlc_list_t *p_list )
{
- if( p_list->i_count )
- {
- vlc_object_t ** pp_current = p_list->pp_objects;
+ int i_index;
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ {
vlc_mutex_lock( &structure_lock );
- while( pp_current[0] )
- {
- pp_current[0]->i_refcount--;
- pp_current++;
- }
+ p_list->p_values[i_index].p_object->i_refcount--;
vlc_mutex_unlock( &structure_lock );
}
+ free( p_list->p_values );
free( p_list );
}
}
}
-static vlc_list_t * NewList( void )
+static vlc_list_t * NewList( int i_count )
{
- vlc_list_t *p_list = malloc( sizeof( vlc_list_t )
- + 3 * sizeof( vlc_object_t * ) );
-
+ vlc_list_t * p_list = (vlc_list_t *)malloc( sizeof( vlc_list_t ) );
if( p_list == NULL )
{
return NULL;
}
- p_list->i_count = 0;
- p_list->pp_objects = &p_list->_p_first;
+ p_list->i_count = i_count;
+
+ if( i_count == 0 )
+ {
+ p_list->p_values = NULL;
+ return p_list;
+ }
- /* We allocated space for NULL and for three extra objects */
- p_list->_i_extra = 3;
- p_list->_p_first = NULL;
+ 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 vlc_list_t * ListAppend( vlc_list_t *p_list, vlc_object_t *p_object )
+static void ListReplace( vlc_list_t *p_list, vlc_object_t *p_object,
+ int i_index )
{
- if( p_list == NULL )
+ if( p_list == NULL || i_index >= p_list->i_count )
{
- return NULL;
+ return;
}
- if( p_list->_i_extra == 0 )
+ 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 )
{
- /* 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;
- }
+ return;
+ }
- /* We have X+1 extra slots */
- p_list->_i_extra = p_list->i_count + 1;
- p_list->pp_objects = &p_list->_p_first;
+ 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->pp_objects[p_list->i_count] = p_object;
+ p_list->p_values[p_list->i_count].p_object = p_object;
p_list->i_count++;
- p_list->pp_objects[p_list->i_count] = NULL;
- p_list->_i_extra--;
- return p_list;
+ return;
}
+static int CountChildren( vlc_object_t *p_this, int i_type )
+{
+ vlc_object_t *p_tmp;
+ int i, i_count = 0;
+
+ for( i = 0; i < p_this->i_children; i++ )
+ {
+ p_tmp = p_this->pp_children[i];
+
+ if( p_tmp->i_object_type == i_type )
+ {
+ i_count++;
+ }
+
+ if( p_tmp->i_children )
+ {
+ i_count += CountChildren( p_tmp, i_type );
+ }
+ }
+
+ return i_count;
+}
+
+static void ListChildren( vlc_list_t *p_list, vlc_object_t *p_this, int i_type )
+{
+ vlc_object_t *p_tmp;
+ int i;
+
+ for( i = 0; i < p_this->i_children; i++ )
+ {
+ p_tmp = p_this->pp_children[i];
+
+ if( p_tmp->i_object_type == i_type )
+ {
+ ListReplace( p_list, p_tmp, p_list->i_count++ );
+ }
+
+ if( p_tmp->i_children )
+ {
+ ListChildren( p_list, p_tmp, i_type );
+ }
+ }
+}
projects / vlc / blobdiff