/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h> /* realloc() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
+#include <vlc/vlc.h>
+
#include "../libvlc.h"
#include <vlc_vout.h>
#include <vlc_aout.h>
#include "vlc_meta.h"
#include "variables.h"
+#ifndef WIN32
+# include <unistd.h>
+#else
+# include <io.h>
+# include <fcntl.h>
+# include <errno.h> /* ENOSYS */
+#endif
+#include <assert.h>
/*****************************************************************************
* Local prototypes
static int CountChildren ( vlc_object_t *, int );
static void ListChildren ( vlc_list_t *, vlc_object_t *, int );
+static void vlc_object_destroy( vlc_object_t *p_this );
+
/*****************************************************************************
* Local structure lock
*****************************************************************************/
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_libvlc_global->i_objects = 1;
p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
p_libvlc_global->pp_objects[0] = p_new;
- p_new->b_attached = VLC_TRUE;
+ p_priv->b_attached = VLC_TRUE;
}
else
{
libvlc_global_data_t *p_libvlc_global = vlc_global();
- p_new->p_libvlc = ( i_type == VLC_OBJECT_LIBVLC ) ? (libvlc_int_t*)p_new
- : p_this->p_libvlc;
+ 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 );
vlc_mutex_unlock( &structure_lock );
}
- p_new->i_refcount = 0;
+ p_priv->i_refcount = 1;
p_new->p_parent = NULL;
p_new->pp_children = NULL;
p_new->i_children = 0;
vlc_mutex_init( p_new, &p_new->object_lock );
vlc_cond_init( p_new, &p_new->object_wait );
vlc_mutex_init( p_new, &p_priv->var_lock );
+ vlc_spin_init( &p_priv->spin );
+ p_priv->pipes[0] = p_priv->pipes[1] = -1;
if( i_type == VLC_OBJECT_GLOBAL )
{
vlc_mutex_init( p_new, &structure_lock );
+ }
+ if( i_type == VLC_OBJECT_LIBVLC )
+ {
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 );
i_size = sizeof( vod_t );
psz_type = "vod server";
break;
- case VLC_OBJECT_TLS:
- i_size = sizeof( tls_t );
- psz_type = "tls";
- break;
case VLC_OBJECT_XML:
i_size = sizeof( xml_t );
psz_type = "xml";
/**
****************************************************************************
- * Destroy a vlc object
+ * Destroy a vlc object (Internal)
*
* 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.
*****************************************************************************/
-void __vlc_object_destroy( vlc_object_t *p_this )
+static void vlc_object_destroy( vlc_object_t *p_this )
{
vlc_object_internals_t *p_priv = vlc_internals( p_this );
- int i_delay = 0;
+
+ /* FIXME: ugly hack - we cannot use the message queue after
+ * msg_Destroy(). */
+ vlc_object_t *logger = p_this;
+ if( p_this->p_libvlc == p_this )
+ logger = NULL;
if( p_this->i_children )
{
- msg_Err( p_this, "cannot delete object (%i, %s) with children" ,
+<<<<<<< .mine
+ fprintf( stderr,
+ "ERROR: cannot delete object (%i, %s) with children\n",
+ p_this->i_object_id, p_this->psz_object_name );
+ fflush(stderr);
+ abort();
+=======
+ msg_Err( logger, "cannot delete object (%i, %s) with children" ,
p_this->i_object_id, p_this->psz_object_name );
return;
+>>>>>>> .r25344
}
if( p_this->p_parent )
{
- msg_Err( p_this, "cannot delete object (%i, %s) with a parent",
+<<<<<<< .mine
+ fprintf( stderr,
+ "ERROR: cannot delete object (%i, %s) with a parent\n",
+ p_this->i_object_id, p_this->psz_object_name );
+ fflush(stderr);
+ abort();
+=======
+ msg_Err( logger, "cannot delete object (%i, %s) with a parent",
p_this->i_object_id, p_this->psz_object_name );
return;
+>>>>>>> .r25344
}
- while( p_this->i_refcount )
+<<<<<<< .mine
+=======
+ while( p_priv->i_refcount > 0 )
{
i_delay++;
/* Don't warn immediately ... 100ms seems OK */
if( i_delay == 2 )
{
- msg_Warn( p_this,
- "refcount is %i, delaying before deletion (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
+ msg_Warn( logger,
+ "refcount is %u, delaying before deletion (id=%d,type=%d)",
+ p_priv->i_refcount, p_this->i_object_id,
p_this->i_object_type );
}
else if( i_delay == 10 )
{
- msg_Err( p_this,
- "refcount is %i, delaying again (id=%d,type=%d)",
- p_this->i_refcount, p_this->i_object_id,
+ msg_Err( logger,
+ "refcount is %u, delaying again (id=%d,type=%d)",
+ p_priv->i_refcount, p_this->i_object_id,
p_this->i_object_type );
}
else if( i_delay == 20 )
{
- msg_Err( p_this,
+ msg_Err( logger,
"waited too long, cancelling destruction (id=%d,type=%d)",
p_this->i_object_id, p_this->i_object_type );
return;
msleep( 100000 );
}
+>>>>>>> .r25344
/* Destroy the associated variables, starting from the end so that
* no memmove calls have to be done. */
while( p_priv->i_vars )
if( p_this->i_object_type == VLC_OBJECT_GLOBAL )
{
libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
+
+ /* Remove ourselves */
+ int i_index = FindIndex( p_this, p_global->pp_objects,
+ p_global->i_objects );
+ REMOVE_ELEM( p_global->pp_objects,
+ p_global->i_objects, i_index );
+
+ /* Test for leaks */
+ if( p_global->i_objects > 0 )
+ {
+ int i;
+ for( i = 0; i < p_global->i_objects; i++ )
+ {
+ /* We are leaking this object */
+ fprintf( stderr,
+ "ERROR: We are leaking object (id:%i, type:%s, name:%s)\n",
+ p_global->pp_objects[i]->i_object_id,
+ p_global->pp_objects[i]->psz_object_type,
+ p_global->pp_objects[i]->psz_object_name );
+ fflush(stderr);
+ }
+ /* Strongly abort, cause we want these to be fixed */
+ abort();
+ }
+
/* We are the global object ... no need to lock. */
free( p_global->pp_objects );
p_global->pp_objects = NULL;
- p_global->i_objects--;
vlc_mutex_destroy( &structure_lock );
}
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
+ vlc_spin_destroy( &p_priv->spin );
+ if( p_priv->pipes[1] != -1 )
+ close( p_priv->pipes[1] );
+ if( p_priv->pipes[0] != -1 )
+ close( p_priv->pipes[0] );
/* global is not dynamically allocated by vlc_object_create */
if( p_this->i_object_type != VLC_OBJECT_GLOBAL )
}
-void __vlc_object_kill( vlc_object_t *p_this )
+/** Inter-object signaling */
+
+void __vlc_object_lock( vlc_object_t *obj )
{
- vlc_mutex_lock( &p_this->object_lock );
- p_this->b_die = VLC_TRUE;
- vlc_mutex_unlock( &p_this->object_lock );
+ vlc_mutex_lock( &obj->object_lock );
+}
+
+void __vlc_object_unlock( vlc_object_t *obj )
+{
+ vlc_assert_locked( &obj->object_lock );
+ vlc_mutex_unlock( &obj->object_lock );
+}
+
+#ifdef WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+
+/**
+ * select()-able pipes emulated using Winsock
+ */
+static int pipe (int fd[2])
+{
+ SOCKADDR_IN addr;
+ int addrlen = sizeof (addr);
+
+ SOCKET l = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP), a,
+ c = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if ((l == INVALID_SOCKET) || (c == INVALID_SOCKET))
+ goto error;
+
+ memset (&addr, 0, sizeof (addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+ if (bind (l, (PSOCKADDR)&addr, sizeof (addr))
+ || getsockname (l, (PSOCKADDR)&addr, &addrlen)
+ || listen (l, 1)
+ || connect (c, (PSOCKADDR)&addr, addrlen))
+ goto error;
+
+ a = accept (l, NULL, NULL);
+ if (a == INVALID_SOCKET)
+ goto error;
+
+ closesocket (l);
+ //shutdown (a, 0);
+ //shutdown (c, 1);
+ fd[0] = c;
+ fd[1] = a;
+ return 0;
+
+error:
+ if (l != INVALID_SOCKET)
+ closesocket (l);
+ if (c != INVALID_SOCKET)
+ closesocket (c);
+ return -1;
+}
+
+#undef read
+#define read( a, b, c ) recv (a, b, c, 0)
+#undef write
+#define write( a, b, c ) send (a, b, c, 0)
+#undef close
+#define close( a ) closesocket (a)
+#endif /* WIN32 */
+
+/**
+ * Returns the readable end of a pipe that becomes readable once termination
+ * of the object is requested (vlc_object_kill()).
+ * This can be used to wake-up out of a select() or poll() event loop, such
+ * typically when doing network I/O.
+ *
+ * Note that the pipe will remain the same for the lifetime of the object.
+ * DO NOT read the pipe nor close it yourself. Ever.
+ *
+ * @param obj object that would be "killed"
+ * @return a readable pipe descriptor, or -1 on error.
+ */
+int __vlc_object_waitpipe( vlc_object_t *obj )
+{
+ int pfd[2] = { -1, -1 };
+ struct vlc_object_internals_t *internals = obj->p_internals;
+ vlc_bool_t killed = VLC_FALSE;
+
+ vlc_spin_lock (&internals->spin);
+ if (internals->pipes[0] == -1)
+ {
+ /* This can only ever happen if someone killed us without locking: */
+ assert (internals->pipes[1] == -1);
+ vlc_spin_unlock (&internals->spin);
+
+ if (pipe (pfd))
+ return -1;
+
+ vlc_spin_lock (&internals->spin);
+ if (internals->pipes[0] == -1)
+ {
+ internals->pipes[0] = pfd[0];
+ internals->pipes[1] = pfd[1];
+ pfd[0] = pfd[1] = -1;
+ }
+ killed = obj->b_die;
+ }
+ vlc_spin_unlock (&internals->spin);
+
+ if (killed)
+ {
+ /* Race condition: vlc_object_kill() already invoked! */
+ int fd;
+
+ vlc_spin_lock (&internals->spin);
+ fd = internals->pipes[1];
+ internals->pipes[1] = -1;
+ vlc_spin_unlock (&internals->spin);
+
+ msg_Dbg (obj, "waitpipe: object already dying");
+ if (fd != -1)
+ close (fd);
+ }
+
+ /* Race condition: two threads call pipe() - unlikely */
+ if (pfd[0] != -1)
+ close (pfd[0]);
+ if (pfd[1] != -1)
+ close (pfd[1]);
+
+ return internals->pipes[0];
+}
+
+
+/**
+ * Waits for the object to be signaled (using vlc_object_signal()).
+ * If the object already has a signal pending, this function will return
+ * immediately. It is asserted that the caller holds the object lock.
+ *
+ * @return true if the object is dying and should terminate.
+ */
+vlc_bool_t __vlc_object_wait( vlc_object_t *obj )
+{
+ vlc_assert_locked( &obj->object_lock );
+ vlc_cond_wait( &obj->object_wait, &obj->object_lock );
+ return obj->b_die;
+}
+
+
+/**
+ * Waits for the object to be signaled (using vlc_object_signal()), or for
+ * a timer to expire.
+ * If the object already has a signal pending, this function will return
+ * immediately. It is asserted that the caller holds the object lock.
+ *
+ * @return negative if the object is dying and should terminate,
+ * positive if the the object has been signaled but is not dying,
+ * 0 if timeout has been reached.
+ */
+int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
+{
+ int v;
+
+ vlc_assert_locked( &obj->object_lock );
+ v = vlc_cond_timedwait( &obj->object_wait, &obj->object_lock, deadline );
+ if( v == 0 ) /* signaled */
+ return obj->b_die ? -1 : 1;
+ return 0;
+}
+
+
+/**
+ * Checks whether an object has been "killed".
+ * The object lock must be held.
+ *
+ * Typical code for an object thread could be:
+ *
+ vlc_object_lock (self);
+ ...initialization...
+ while (vlc_object_alive (self))
+ {
+ ...preprocessing...
+
+ if (vlc_object_wait (self))
+ continue;
+
+ ...postprocessing...
+ }
+ ...deinitialization...
+ vlc_object_unlock (self);
+ *
+ *
+ * @return true iff the object has not been killed yet
+ */
+vlc_bool_t __vlc_object_alive( vlc_object_t *obj )
+{
+ vlc_assert_locked( &obj->object_lock );
+ return !obj->b_die;
}
-vlc_bool_t __vlc_object_dying_unlocked( vlc_object_t *p_this )
+/**
+ * Signals an object for which the lock is held.
+ */
+void __vlc_object_signal_unlocked( vlc_object_t *obj )
{
- vlc_assert_locked( &p_this->object_lock );
- return p_this->b_die;
+ vlc_assert_locked (&obj->object_lock);
+ vlc_cond_signal( &obj->object_wait );
}
-vlc_bool_t __vlc_object_dying( vlc_object_t *p_this )
+/**
+ * Requests termination of an object.
+ * If the object is LibVLC, also request to terminate all its children.
+ */
+void __vlc_object_kill( 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;
+ struct vlc_object_internals_t *internals = p_this->p_internals;
+ int fd;
+
+ vlc_mutex_lock( &p_this->object_lock );
+ p_this->b_die = VLC_TRUE;
+
+ vlc_spin_lock (&internals->spin);
+ fd = internals->pipes[1];
+ internals->pipes[1] = -1;
+ vlc_spin_unlock (&internals->spin);
+
+ if( fd != -1 )
+ {
+ msg_Dbg (p_this, "waitpipe: object killed");
+ close (fd);
+ }
+
+ if( p_this->i_object_type == VLC_OBJECT_LIBVLC )
+ for( int i = 0; i < p_this->i_children ; i++ )
+ vlc_object_kill( p_this->pp_children[i] );
+
+ vlc_object_signal_unlocked( p_this );
+ vlc_mutex_unlock( &p_this->object_lock );
}
* 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 )
+void * vlc_object_get( int i_id )
{
int i_max, i_middle;
vlc_object_t **pp_objects;
if( pp_objects[i_middle+1]->i_object_id == i_id )
{
vlc_mutex_unlock( &structure_lock );
- pp_objects[i_middle+1]->i_refcount++;
+ pp_objects[i_middle+1]->p_internals->i_refcount++;
return pp_objects[i_middle+1];
}
break;
else
{
vlc_mutex_unlock( &structure_lock );
- pp_objects[i_middle]->i_refcount++;
+ pp_objects[i_middle]->p_internals->i_refcount++;
return pp_objects[i_middle];
}
/* 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++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
&& p_this->psz_object_name
&& !strcmp( p_this->psz_object_name, psz_name ) )
{
- p_this->i_refcount++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
return p_this;
}
void __vlc_object_yield( vlc_object_t *p_this )
{
vlc_mutex_lock( &structure_lock );
- p_this->i_refcount++;
+ p_this->p_internals->i_refcount++;
vlc_mutex_unlock( &structure_lock );
}
-/**
- ****************************************************************************
+/*****************************************************************************
* decrement an object refcount
+ * And destroy the object if its refcount reach zero.
*****************************************************************************/
void __vlc_object_release( vlc_object_t *p_this )
{
+ vlc_bool_t b_should_destroy;
+
vlc_mutex_lock( &structure_lock );
- p_this->i_refcount--;
+
+ assert( p_this->p_internals->i_refcount > 0 );
+ p_this->p_internals->i_refcount--;
+ b_should_destroy = (p_this->p_internals->i_refcount == 0);
+
vlc_mutex_unlock( &structure_lock );
+
+ if( b_should_destroy )
+ vlc_object_destroy( p_this );
+}
+
+/* Version without the lock */
+static void vlc_object_release_locked( vlc_object_t *p_this )
+{
+ vlc_bool_t b_should_destroy;
+
+ assert( p_this->p_internals->i_refcount > 0 );
+ p_this->p_internals->i_refcount--;
+ b_should_destroy = (p_this->p_internals->i_refcount == 0);
+
+ if( b_should_destroy )
+ vlc_object_destroy( p_this );
}
/**
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 );
}
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++;
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 );
for( ; pp_current < pp_end ; pp_current++ )
{
- if( (*pp_current)->b_attached )
+ if( (*pp_current)->p_internals->b_attached )
{
PrintObject( *pp_current, "" );
}
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 );
+ p_object = vlc_object_get( i_id );
else
{
/* try using the object's name to find it */
- vlc_object_t *p_libvlc = vlc_object_get( p_this, 1 );
+ vlc_object_t *p_libvlc = vlc_object_get( 1 );
if( p_libvlc )
{
/* Look in p_libvlc's children tree */
vlc_mutex_lock( &structure_lock );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- p_list->p_values[i_index].p_object->i_refcount--;
+ vlc_object_release_locked( p_list->p_values[i_index].p_object );
}
vlc_mutex_unlock( &structure_lock );
{
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else
p_tmp = p_this->pp_children[i];
if( p_tmp->i_object_type == i_type )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else
if( p_tmp->psz_object_name
&& !strcmp( p_tmp->psz_object_name, psz_name ) )
{
- p_tmp->i_refcount++;
+ p_tmp->p_internals->i_refcount++;
return p_tmp;
}
else if( p_tmp->i_children )
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 )
}
psz_refcount[0] = '\0';
- if( p_this->i_refcount )
- snprintf( psz_refcount, 19, ", refcount %i", p_this->i_refcount );
+ if( p_this->p_internals->i_refcount > 0 )
+ snprintf( psz_refcount, 19, ", refcount %u",
+ p_this->p_internals->i_refcount );
psz_thread[0] = '\0';
if( p_this->p_internals->b_thread )
return;
}
- p_object->i_refcount++;
+ p_object->p_internals->i_refcount++;
p_list->p_values[i_index].p_object = p_object;
return;
}
- p_object->i_refcount++;
+ p_object->p_internals->i_refcount++;
p_list->p_values[p_list->i_count].p_object = p_object;
p_list->i_count++;
projects / vlc / blobdiff