/*****************************************************************************
* objects.c: vlc_object_t handling
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
#include "vlc_httpd.h"
#include "vlc_vlm.h"
+#include "input/vlm_internal.h"
#include "vlc_vod.h"
#include "vlc_tls.h"
#include "vlc_xml.h"
vlc_value_t, vlc_value_t, void * );
static vlc_object_t * FindObject ( vlc_object_t *, int, int );
+static vlc_object_t * FindObjectName( vlc_object_t *, const char *, int );
static void DetachObject ( vlc_object_t * );
static void PrintObject ( vlc_object_t *, const char * );
static void DumpStructure ( vlc_object_t *, int, char * );
* Local structure lock
*****************************************************************************/
static vlc_mutex_t structure_lock;
+static vlc_object_internals_t global_internals;
vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
int i_type, const char *psz_type )
{
- vlc_object_t * p_new = NULL;
+ vlc_object_t *p_new;
+ vlc_object_internals_t *p_priv;
if( i_type == VLC_OBJECT_GLOBAL )
{
p_new = p_this;
+ p_priv = &global_internals;
+ memset( p_priv, 0, sizeof( *p_priv ) );
}
else
{
- p_new = malloc( i_size );
- if( !p_new ) return NULL;
- memset( p_new, 0, i_size );
+ p_priv = calloc( 1, sizeof( *p_priv ) + i_size );
+ if( p_priv == NULL )
+ return NULL;
+
+ p_new = (vlc_object_t *)(p_priv + 1);
}
+ p_new->p_internals = p_priv;
p_new->i_object_type = i_type;
p_new->psz_object_type = psz_type;
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_priv->b_attached = VLC_FALSE;
p_new->b_force = VLC_FALSE;
p_new->psz_header = NULL;
- 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 )
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
p_new->i_flags |= OBJECT_FLAGS_NOINTERACT;
- p_new->i_vars = 0;
- p_new->p_vars = (variable_t *)malloc( 16 * sizeof( variable_t ) );
+ p_priv->p_vars = calloc( sizeof( variable_t ), 16 );
- if( !p_new->p_vars )
+ if( !p_priv->p_vars )
{
if( i_type != VLC_OBJECT_GLOBAL )
- free( p_new );
+ free( p_priv );
return NULL;
}
if( i_type == VLC_OBJECT_GLOBAL )
{
/* If i_type is global, then p_new is actually p_libvlc_global */
- p_new->p_libvlc_global = (libvlc_global_data_t*)p_new;
+ libvlc_global_data_t *p_libvlc_global = (libvlc_global_data_t *)p_new;
p_new->p_libvlc = NULL;
- p_new->p_libvlc_global->i_counter = 0;
+ p_libvlc_global->i_counter = 0;
p_new->i_object_id = 0;
- p_new->p_libvlc_global->i_objects = 1;
- p_new->p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
- p_new->p_libvlc_global->pp_objects[0] = p_new;
- p_new->b_attached = VLC_TRUE;
+ p_libvlc_global->i_objects = 1;
+ p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
+ p_libvlc_global->pp_objects[0] = p_new;
+ p_priv->b_attached = VLC_TRUE;
}
else
{
- p_new->p_libvlc_global = p_this->p_libvlc_global;
- p_new->p_libvlc = ( i_type == VLC_OBJECT_LIBVLC ) ? (libvlc_int_t*)p_new
- : p_this->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
+ if( i_type == VLC_OBJECT_LIBVLC )
+ {
+ p_new->p_libvlc = (libvlc_int_t*)p_new;
+ p_priv->b_attached = VLC_TRUE;
+ }
+ else
+ {
+ p_new->p_libvlc = p_this->p_libvlc;
+ }
vlc_mutex_lock( &structure_lock );
- p_new->p_libvlc_global->i_counter++;
- p_new->i_object_id = p_new->p_libvlc_global->i_counter;
+ p_libvlc_global->i_counter++;
+ p_new->i_object_id = p_libvlc_global->i_counter;
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- TAB_APPEND( p_new->p_libvlc_global->i_objects,
- p_new->p_libvlc_global->pp_objects,
+ TAB_APPEND( p_libvlc_global->i_objects, p_libvlc_global->pp_objects,
p_new );
vlc_mutex_unlock( &structure_lock );
/* 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 );
+ vlc_mutex_init( p_new, &p_priv->var_lock );
if( i_type == VLC_OBJECT_GLOBAL )
{
i_size = sizeof(libvlc_int_t);
psz_type = "libvlc";
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";
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";
*****************************************************************************/
void __vlc_object_destroy( vlc_object_t *p_this )
{
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
int i_delay = 0;
if( p_this->i_children )
/* Destroy the associated variables, starting from the end so that
* no memmove calls have to be done. */
- while( p_this->i_vars )
+ while( p_priv->i_vars )
{
- var_Destroy( p_this, p_this->p_vars[p_this->i_vars - 1].psz_name );
+ var_Destroy( p_this, p_priv->p_vars[p_priv->i_vars - 1].psz_name );
}
- free( p_this->p_vars );
- vlc_mutex_destroy( &p_this->var_lock );
+ free( p_priv->p_vars );
+ vlc_mutex_destroy( &p_priv->var_lock );
if( p_this->psz_header ) free( p_this->psz_header );
if( p_this->i_object_type == VLC_OBJECT_GLOBAL )
{
+ libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
/* We are the global object ... no need to lock. */
- free( p_this->p_libvlc_global->pp_objects );
- p_this->p_libvlc_global->pp_objects = NULL;
- p_this->p_libvlc_global->i_objects--;
+ free( p_global->pp_objects );
+ p_global->pp_objects = NULL;
+ p_global->i_objects--;
vlc_mutex_destroy( &structure_lock );
}
else
{
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
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_global->pp_objects,
- p_this->p_libvlc_global->i_objects );
- REMOVE_ELEM( p_this->p_libvlc_global->pp_objects,
- p_this->p_libvlc_global->i_objects, i_index );
+ i_index = FindIndex( p_this, p_libvlc_global->pp_objects,
+ p_libvlc_global->i_objects );
+ REMOVE_ELEM( p_libvlc_global->pp_objects,
+ p_libvlc_global->i_objects, i_index );
vlc_mutex_unlock( &structure_lock );
}
+#if defined(WIN32) || defined(UNDER_CE)
+ /* if object has an associated thread, close it now */
+ if( p_priv->thread_id.hThread )
+ CloseHandle(p_priv->thread_id.hThread);
+#endif
+
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
/* global is not dynamically allocated by vlc_object_create */
if( p_this->i_object_type != VLC_OBJECT_GLOBAL )
- {
- free( p_this );
- p_this = NULL;
- }
+ free( p_priv );
+}
+
+
+void __vlc_object_kill( vlc_object_t *p_this )
+{
+ vlc_mutex_lock( &p_this->object_lock );
+ p_this->b_die = VLC_TRUE;
+ vlc_mutex_unlock( &p_this->object_lock );
}
+
+vlc_bool_t __vlc_object_dying_unlocked( vlc_object_t *p_this )
+{
+ vlc_assert_locked( &p_this->object_lock );
+ return p_this->b_die;
+}
+
+
+vlc_bool_t __vlc_object_dying( vlc_object_t *p_this )
+{
+ vlc_bool_t b;
+ vlc_mutex_lock( &p_this->object_lock );
+ b = __vlc_object_dying_unlocked( p_this );
+ vlc_mutex_unlock( &p_this->object_lock );
+ return b;
+}
+
+
/**
* find an object given its ID
*
{
int i_max, i_middle;
vlc_object_t **pp_objects;
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
vlc_mutex_lock( &structure_lock );
- pp_objects = p_this->p_libvlc_global->pp_objects;
+ pp_objects = p_libvlc_global->pp_objects;
/* Perform our dichotomy */
- for( i_max = p_this->p_libvlc_global->i_objects - 1 ; ; )
+ for( i_max = p_libvlc_global->i_objects - 1 ; ; )
{
i_middle = i_max / 2;
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;
+
+ vlc_mutex_lock( &structure_lock );
+
+ /* 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 ) )
+ {
+ p_this->i_refcount++;
+ vlc_mutex_unlock( &structure_lock );
+ return p_this;
+ }
+
+ /* Otherwise, recursively look for the object */
+ if( (i_mode & 0x000f) == FIND_ANYWHERE )
+ {
+ vlc_object_t *p_root = p_this;
+
+ /* Find the root */
+ while( p_root->p_parent != NULL &&
+ p_root != VLC_OBJECT( p_this->p_libvlc ) )
+ {
+ p_root = p_root->p_parent;
+ }
+
+ 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 = FindObjectName( VLC_OBJECT( p_this->p_libvlc ),
+ psz_name, (i_mode & ~0x000f)|FIND_CHILD );
+ }
+ }
+ else
+ {
+ p_found = FindObjectName( p_this, psz_name, i_mode );
+ }
+
+ vlc_mutex_unlock( &structure_lock );
+
+ return p_found;
+}
+
/**
****************************************************************************
* increment an object refcount
p_parent->i_children, p_this );
/* Climb up the tree to see whether we are connected with the root */
- if( p_parent->b_attached )
+ if( p_parent->p_internals->b_attached )
{
SetAttachment( p_this, VLC_TRUE );
}
}
/* Climb up the tree to see whether we are connected with the root */
- if( p_this->p_parent->b_attached )
+ if( p_this->p_parent->p_internals->b_attached )
{
SetAttachment( p_this, VLC_FALSE );
}
vlc_list_t *p_list;
vlc_object_t **pp_current, **pp_end;
int i_count = 0, i_index = 0;
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
vlc_mutex_lock( &structure_lock );
switch( i_mode & 0x000f )
{
case FIND_ANYWHERE:
- pp_current = p_this->p_libvlc_global->pp_objects;
- pp_end = pp_current + p_this->p_libvlc_global->i_objects;
+ pp_current = p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
- if( (*pp_current)->b_attached
+ if( (*pp_current)->p_internals->b_attached
&& (*pp_current)->i_object_type == i_type )
{
i_count++;
}
p_list = NewList( i_count );
- pp_current = p_this->p_libvlc_global->pp_objects;
+ pp_current = p_libvlc_global->pp_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
- if( (*pp_current)->b_attached
+ if( (*pp_current)->p_internals->b_attached
&& (*pp_current)->i_object_type == i_type )
{
ListReplace( p_list, *pp_current, i_index );
static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ libvlc_global_data_t *p_libvlc_global = vlc_global();
+
+ (void)oldval; (void)p_data;
if( *psz_cmd == 'l' )
{
vlc_mutex_lock( &structure_lock );
vlc_object_t **pp_current, **pp_end;
- pp_current = p_this->p_libvlc_global->pp_objects;
- pp_end = pp_current + p_this->p_libvlc_global->i_objects;
+ pp_current = p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
- if( (*pp_current)->b_attached )
+ if( (*pp_current)->p_internals->b_attached )
{
PrintObject( *pp_current, "" );
}
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( p_this, i_id );
+ else
+ {
+ /* try using the object's name to find it */
+ vlc_object_t *p_libvlc = vlc_object_get( p_this, 1 );
+ if( p_libvlc )
+ {
+ /* Look in p_libvlc's children tree */
+ p_object = vlc_object_find_name( p_libvlc,
+ newval.psz_string,
+ FIND_CHILD );
+ vlc_object_release( p_libvlc );
+ }
+ if( !p_object )
+ {
+ /* If it's not in libvlc, look in libvlc_global (== p_this) */
+ p_object = vlc_object_find_name( p_this,
+ newval.psz_string,
+ FIND_CHILD );
+ }
+ }
if( !p_object )
{
PrintObject( p_object, "" );
- if( !p_object->i_vars )
+ if( !p_object->p_internals->i_vars )
printf( " `-o No variables\n" );
- for( i = 0; i < p_object->i_vars; i++ )
+ for( i = 0; i < p_object->p_internals->i_vars; i++ )
{
- variable_t *p_var = p_object->p_vars + i;
+ variable_t *p_var = p_object->p_internals->p_vars + i;
const char *psz_type = "unknown";
switch( p_var->i_type & VLC_VAR_TYPE )
#undef MYCASE
}
printf( " %c-o \"%s\" (%s",
- i + 1 == p_object->i_vars ? '`' : '|',
+ i + 1 == p_object->p_internals->i_vars ? '`' : '|',
p_var->psz_name, psz_type );
if( p_var->psz_text )
printf( ", %s", p_var->psz_text );
printf( ": %f", p_var->val.f_float );
break;
case VLC_VAR_TIME:
- printf( ": " I64Fi, p_var->val.i_time );
+ printf( ": " I64Fi, (int64_t)p_var->val.i_time );
break;
case VLC_VAR_ADDRESS:
printf( ": %p", p_var->val.p_address );
return NULL;
}
+static vlc_object_t * FindObjectName( vlc_object_t *p_this,
+ const char *psz_name,
+ 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->psz_object_name
+ && !strcmp( p_tmp->psz_object_name, psz_name ) )
+ {
+ p_tmp->i_refcount++;
+ return p_tmp;
+ }
+ else
+ {
+ return FindObjectName( p_tmp, psz_name, i_mode );
+ }
+ }
+ break;
+
+ case FIND_CHILD:
+ for( i = p_this->i_children; i--; )
+ {
+ p_tmp = p_this->pp_children[i];
+ if( p_tmp->psz_object_name
+ && !strcmp( p_tmp->psz_object_name, psz_name ) )
+ {
+ p_tmp->i_refcount++;
+ return p_tmp;
+ }
+ else if( p_tmp->i_children )
+ {
+ p_tmp = FindObjectName( p_tmp, psz_name, 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;
SetAttachment( p_this->pp_children[i_index], b_attached );
}
- p_this->b_attached = b_attached;
+ p_this->p_internals->b_attached = b_attached;
}
static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )
snprintf( psz_refcount, 19, ", refcount %i", p_this->i_refcount );
psz_thread[0] = '\0';
- if( p_this->b_thread )
- snprintf( psz_thread, 29, " (thread %d)", (int)p_this->thread_id );
+ if( p_this->p_internals->b_thread )
+ snprintf( psz_thread, 29, " (thread %u)",
+#if defined(WIN32) || defined(UNDER_CE)
+ (unsigned)p_this->p_internals->thread_id.id );
+#else
+ (unsigned)p_this->p_internals->thread_id );
+#endif
psz_parent[0] = '\0';
if( p_this->p_parent )