# include <stdlib.h> /* realloc() */
#endif
+#include "../libvlc.h"
#include <vlc_vout.h>
#include <vlc_aout.h>
#include "audio_output/aout_internal.h"
#include "vlc_filter.h"
#include "vlc_httpd.h"
-#include "../network/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 * );
*****************************************************************************/
static vlc_mutex_t structure_lock;
-static vlc_object_t *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
+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;
+ vlc_object_t * p_new = NULL;
if( i_type == VLC_OBJECT_GLOBAL )
{
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 );
+ var_Create( p_new, "vars", VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ var_AddCallback( p_new, "vars", DumpCommand, NULL );
}
return p_new;
i_size = sizeof(sout_instance_t);
psz_type = "stream output";
break;
- case VLC_OBJECT_HTTPD:
- i_size = sizeof( httpd_t );
- psz_type = "http server";
- break;
- case VLC_OBJECT_HTTPD_HOST:
- i_size = sizeof( httpd_host_t );
- psz_type = "http server";
- break;
case VLC_OBJECT_VLM:
i_size = sizeof( vlm_t );
psz_type = "vlm dameon";
/* global is not dynamically allocated by vlc_object_create */
if( p_this->i_object_type != VLC_OBJECT_GLOBAL )
+ {
free( p_this );
+ p_this = NULL;
+ }
}
+
+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 );
+}
+
+
/**
* find an object given its ID
*
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
*****************************************************************************/
void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
{
+ if( !p_this ) return;
+
vlc_mutex_lock( &structure_lock );
/* Attach the parent to its child */
*****************************************************************************/
void __vlc_object_detach( vlc_object_t *p_this )
{
+ if( !p_this ) return;
+
vlc_mutex_lock( &structure_lock );
if( !p_this->p_parent )
{
DetachObject( p_this );
vlc_mutex_unlock( &structure_lock );
+ p_this = NULL;
}
/**
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' )
+ 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;
+
+ 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 );
+ }
+ else
{
- char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- vlc_object_t *p_object;
+ vlc_object_t *p_object = NULL;
if( *newval.psz_string )
{
return VLC_ENOOBJ;
}
}
- else
- {
- p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- }
vlc_mutex_lock( &structure_lock );
- psz_foo[0] = '|';
- DumpStructure( p_object, 0, psz_foo );
+ if( *psz_cmd == 't' )
+ {
+ char psz_foo[2 * MAX_DUMPSTRUCTURE_DEPTH + 1];
- vlc_mutex_unlock( &structure_lock );
+ if( !p_object )
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- if( *newval.psz_string )
- {
- vlc_object_release( p_this );
+ psz_foo[0] = '|';
+ DumpStructure( p_object, 0, psz_foo );
}
- }
- else if( *psz_cmd == 'l' )
- {
- vlc_object_t **pp_current, **pp_end;
+ else if( *psz_cmd == 'v' )
+ {
+ int i;
- vlc_mutex_lock( &structure_lock );
+ if( !p_object )
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
- pp_current = p_this->p_libvlc_global->pp_objects;
- pp_end = pp_current + p_this->p_libvlc_global->i_objects;
+ PrintObject( p_object, "" );
- for( ; pp_current < pp_end ; pp_current++ )
- {
- if( (*pp_current)->b_attached )
+ if( !p_object->i_vars )
+ printf( " `-o No variables\n" );
+ for( i = 0; i < p_object->i_vars; i++ )
{
- PrintObject( *pp_current, "" );
- }
- else
- {
- printf( " o %.8i %s (not attached)\n",
- (*pp_current)->i_object_id,
- (*pp_current)->psz_object_type );
+ variable_t *p_var = p_object->p_vars + i;
+
+ const char *psz_type = "unknown";
+ switch( p_var->i_type & VLC_VAR_TYPE )
+ {
+#define MYCASE( type, nice ) \
+ case VLC_VAR_ ## type: \
+ psz_type = nice; \
+ break;
+ MYCASE( VOID, "void" );
+ MYCASE( BOOL, "bool" );
+ MYCASE( INTEGER, "integer" );
+ MYCASE( HOTKEY, "hotkey" );
+ MYCASE( STRING, "string" );
+ MYCASE( MODULE, "module" );
+ MYCASE( FILE, "file" );
+ MYCASE( DIRECTORY, "directory" );
+ MYCASE( VARIABLE, "variable" );
+ MYCASE( FLOAT, "float" );
+ MYCASE( TIME, "time" );
+ MYCASE( ADDRESS, "address" );
+ MYCASE( MUTEX, "mutex" );
+ MYCASE( LIST, "list" );
+#undef MYCASE
+ }
+ printf( " %c-o \"%s\" (%s",
+ i + 1 == p_object->i_vars ? '`' : '|',
+ p_var->psz_name, psz_type );
+ if( p_var->psz_text )
+ printf( ", %s", p_var->psz_text );
+ printf( ")" );
+ if( p_var->i_type & VLC_VAR_ISCOMMAND )
+ printf( ", command" );
+ if( p_var->i_entries )
+ printf( ", %d callbacks", p_var->i_entries );
+ switch( p_var->i_type & 0x00f0 )
+ {
+ case VLC_VAR_VOID:
+ case VLC_VAR_MUTEX:
+ break;
+ case VLC_VAR_BOOL:
+ printf( ": %s", p_var->val.b_bool ? "true" : "false" );
+ break;
+ case VLC_VAR_INTEGER:
+ printf( ": %d", p_var->val.i_int );
+ break;
+ case VLC_VAR_STRING:
+ printf( ": \"%s\"", p_var->val.psz_string );
+ break;
+ case VLC_VAR_FLOAT:
+ printf( ": %f", p_var->val.f_float );
+ break;
+ case VLC_VAR_TIME:
+ printf( ": " I64Fi, p_var->val.i_time );
+ break;
+ case VLC_VAR_ADDRESS:
+ printf( ": %p", p_var->val.p_address );
+ break;
+ case VLC_VAR_LIST:
+ printf( ": TODO" );
+ break;
+ }
+ printf( "\n" );
}
}
vlc_mutex_unlock( &structure_lock );
+
+ if( *newval.psz_string )
+ {
+ vlc_object_release( p_object );
+ }
}
return VLC_SUCCESS;
{
int i_index;
+ vlc_mutex_lock( &structure_lock );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- vlc_mutex_lock( &structure_lock );
-
p_list->p_values[i_index].p_object->i_refcount--;
-
- vlc_mutex_unlock( &structure_lock );
}
+ vlc_mutex_unlock( &structure_lock );
free( p_list->p_values );
free( p_list );
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;
static void PrintObject( vlc_object_t *p_this, const char *psz_prefix )
{
- char psz_children[20], psz_refcount[20], psz_thread[20], psz_name[50];
+ char psz_children[20], psz_refcount[20], psz_thread[30], psz_name[50],
+ psz_parent[20];
psz_name[0] = '\0';
if( p_this->psz_object_name )
{
- snprintf( psz_name, 50, " \"%s\"", p_this->psz_object_name );
- psz_name[48] = '\"';
- psz_name[49] = '\0';
+ snprintf( psz_name, 49, " \"%s\"", p_this->psz_object_name );
+ if( psz_name[48] )
+ psz_name[48] = '\"';
}
psz_children[0] = '\0';
strcpy( psz_children, ", 1 child" );
break;
default:
- snprintf( psz_children, 20,
- ", %i children", p_this->i_children );
- psz_children[19] = '\0';
+ snprintf( psz_children, 19, ", %i children", p_this->i_children );
break;
}
psz_refcount[0] = '\0';
if( p_this->i_refcount )
- {
- snprintf( psz_refcount, 20, ", refcount %i", p_this->i_refcount );
- psz_refcount[19] = '\0';
- }
+ snprintf( psz_refcount, 19, ", refcount %i", p_this->i_refcount );
psz_thread[0] = '\0';
if( p_this->b_thread )
- {
- snprintf( psz_thread, 20, " (thread %d)", (int)p_this->thread_id );
- psz_thread[19] = '\0';
- }
+ snprintf( psz_thread, 29, " (thread %d)", (int)p_this->thread_id );
+
+ psz_parent[0] = '\0';
+ if( p_this->p_parent )
+ snprintf( psz_parent, 19, ", parent %i", p_this->p_parent->i_object_id );
- printf( " %so %.8i %s%s%s%s%s\n", psz_prefix,
+ printf( " %so %.8i %s%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 );
+ psz_name, psz_thread, psz_refcount, psz_children,
+ psz_parent );
}
static void DumpStructure( vlc_object_t *p_this, int i_level, char *psz_foo )