Nowadays, it can only deadlock (threads>0) or do nothing (threads==0)
vlc_mutex_init( &priv->timer_lock );
vlc_mutex_init( &priv->config_lock );
vlc_mutex_init( &priv->timer_lock );
vlc_mutex_init( &priv->config_lock );
- priv->threads_count = 0;
- vlc_mutex_init (&priv->threads_lock);
- vlc_cond_init (NULL, &priv->threads_wait);
-
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
- /* Make sure all threads are completed before we start looking for
- * reference leaks and deinitializing core LibVLC subsytems. */
- vlc_mutex_lock (&priv->threads_lock);
- while (priv->threads_count)
- {
- msg_Dbg (p_libvlc, "waiting for %u remaining threads",
- priv->threads_count);
- vlc_cond_wait (&priv->threads_wait, &priv->threads_lock);
- }
- vlc_mutex_unlock (&priv->threads_lock);
-
bool b_clean = true;
FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
bool b_clean = true;
FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
/* Destroy mutexes */
vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock );
/* Destroy mutexes */
vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock );
- vlc_cond_destroy (&priv->threads_wait);
- vlc_mutex_destroy (&priv->threads_lock);
vlc_object_release( p_libvlc );
p_libvlc = NULL;
vlc_object_release( p_libvlc );
p_libvlc = NULL;
/* Private playlist data (FIXME - playlist_t is too public...) */
sout_instance_t *p_sout; ///< kept sout instance (for playlist)
/* Private playlist data (FIXME - playlist_t is too public...) */
sout_instance_t *p_sout; ///< kept sout instance (for playlist)
-
- /* Thread support */
- unsigned threads_count;
- vlc_mutex_t threads_lock;
- vlc_cond_t threads_wait;
} libvlc_priv_t;
static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
} libvlc_priv_t;
static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
{
int i_ret;
vlc_object_internals_t *p_priv = vlc_internals( p_this );
{
int i_ret;
vlc_object_internals_t *p_priv = vlc_internals( p_this );
- libvlc_priv_t *libpriv = libvlc_priv (p_this->p_libvlc);
struct vlc_thread_boot *boot = malloc (sizeof (*boot));
if (boot == NULL)
struct vlc_thread_boot *boot = malloc (sizeof (*boot));
if (boot == NULL)
boot->entry = func;
boot->object = p_this;
boot->entry = func;
boot->object = p_this;
- vlc_mutex_lock (&libpriv->threads_lock);
- libpriv->threads_count++;
- vlc_mutex_unlock (&libpriv->threads_lock);
-
vlc_object_lock( p_this );
/* Make sure we don't re-create a thread if the object has already one */
vlc_object_lock( p_this );
/* Make sure we don't re-create a thread if the object has already one */
}
vlc_object_unlock( p_this );
}
vlc_object_unlock( p_this );
-
- if (i_ret)
- {
- vlc_mutex_lock (&libpriv->threads_lock);
- if (--libpriv->threads_count == 0)
- vlc_cond_signal (&libpriv->threads_wait);
- vlc_mutex_unlock (&libpriv->threads_lock);
- }
(unsigned long)p_priv->thread_id, psz_file, i_line );
}
else
(unsigned long)p_priv->thread_id, psz_file, i_line );
}
else
- {
- libvlc_priv_t *libpriv = libvlc_priv (p_this->p_libvlc);
msg_Dbg( p_this, "thread %lu joined (%s:%d)",
(unsigned long)p_priv->thread_id, psz_file, i_line );
msg_Dbg( p_this, "thread %lu joined (%s:%d)",
(unsigned long)p_priv->thread_id, psz_file, i_line );
- vlc_mutex_lock (&libpriv->threads_lock);
-#ifndef NDEBUG
- libpriv->threads_count--;
-#else
- if (--libpriv->threads_count == 0)
-#endif
- vlc_cond_signal (&libpriv->threads_wait);
- vlc_mutex_unlock (&libpriv->threads_lock);
- }
p_priv->b_thread = false;
}
p_priv->b_thread = false;
}