* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: objects.c,v 1.23 2002/10/04 18:07:22 sam Exp $
+ * $Id: objects.c,v 1.28 2002/11/09 16:34:53 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+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 * );
psz_type = "audio output";
break;
default:
- i_size = i_type > sizeof(vlc_object_t)
- ? i_type : sizeof(vlc_object_t);
+ 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->psz_object_name = NULL;
- p_new->i_refcount = 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 == VLC_OBJECT_ROOT )
{
/* If i_type is root, then p_new is actually p_libvlc */
/* 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 );
}
+ p_new->i_refcount = 0;
p_new->p_parent = NULL;
p_new->pp_children = NULL;
p_new->i_children = 0;
/* 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 );
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->p_parent )
{
msg_Err( p_this, "cannot delete object with a parent" );
- vlc_dumpstructure( p_this );
return;
}
msleep( 100000 );
}
+ /* 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 );
}
* 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 );
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
*****************************************************************************
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_liststructure: print the current vlc objects
+ * DumpCommand: print the current vlc structure
*****************************************************************************
- * This function prints alist of vlc objects, and additional information such
- * as their refcount, thread ID, etc.
+ * 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_liststructure( vlc_object_t *p_this )
+static int DumpCommand( vlc_object_t *p_this, char *psz_cmd, char *psz_arg )
{
- 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++ )
+ if( *psz_cmd == 't' )
{
- if( (*pp_current)->b_attached )
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
+ vlc_object_t *p_object;
+
+ if( *psz_arg )
{
- PrintObject( *pp_current, "" );
+ p_object = vlc_object_get( p_this, atoi(psz_arg) );
+
+ if( !p_object )
+ {
+ return VLC_ENOOBJ;
+ }
}
else
{
- printf( " o %.6x %s (not attached)\n",
- (*pp_current)->i_object_id,
- (*pp_current)->psz_object_type );
+ 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' )
+ {
+ vlc_object_t **pp_current, **pp_end;
- vlc_mutex_unlock( &structure_lock );
-}
+ vlc_mutex_lock( &structure_lock );
-/*****************************************************************************
- * vlc_dumpstructure: print the current vlc structure
- *****************************************************************************
- * This function prints an ASCII tree showing the connections between vlc
- * objects, and additional information such as their refcount, thread ID, etc.
- *****************************************************************************/
-void __vlc_dumpstructure( vlc_object_t *p_this )
-{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
+ pp_current = p_this->p_libvlc->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc->i_objects;
- vlc_mutex_lock( &structure_lock );
- psz_foo[0] = '|';
- DumpStructure( p_this, 0, psz_foo );
- vlc_mutex_unlock( &structure_lock );
+ 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 );
+ }
+ }
+
+ vlc_mutex_unlock( &structure_lock );
+ }
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
psz_thread[19] = '\0';
}
- printf( " %so %.6x %s%s%s%s%s\n", psz_prefix,
+ 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 );
}
projects / vlc / blobdiff