/* Fill event with the sending object now */
p_event->p_obj = p_em->p_obj;
- /* Here a read/write lock would be nice */
-
+ vlc_mutex_lock( &p_em->event_sending_lock );
vlc_mutex_lock( &p_em->object_lock );
for( i = 0; i < vlc_array_count(&p_em->listeners_groups); i++)
{
if( !array_listeners_cached )
{
vlc_mutex_unlock( &p_em->object_lock );
+ vlc_mutex_unlock( &p_em->event_sending_lock );
fprintf(stderr, "Can't alloc memory in libvlc_event_send" );
return;
}
{
free( array_listeners_cached );
vlc_mutex_unlock( &p_em->object_lock );
+ vlc_mutex_unlock( &p_em->event_sending_lock );
return;
}
+ /* Track item removed from *this* thread, with a simple flag. Indeed
+ * event_sending_lock is a recursive lock. This has the advantage of
+ * allowing to remove an event listener from within a callback */
+ listeners_group->b_sublistener_removed = false;
+
vlc_mutex_unlock( &p_em->object_lock );
- vlc_mutex_lock( &p_em->event_sending_lock );
listener_cached = array_listeners_cached;
- listeners_group->b_sublistener_removed = false;
for( i = 0; i < i_cached_listeners; i++ )
{
if(listener_cached->is_asynchronous)
/* Mark this group as edited so that libvlc_event_send
* will recheck what listener to call */
- listeners_group->b_sublistener_removed = false;
+ listeners_group->b_sublistener_removed = true;
free( listener );
vlc_array_remove( &listeners_group->listeners, j );
/* Fill event with the sending object now */
p_event->p_obj = p_em->p_obj;
+ vlc_mutex_lock( &p_em->event_sending_lock ) ;
vlc_mutex_lock( &p_em->object_lock );
+
FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
if( listeners_group->event_type == p_event->type )
{
if( !array_of_cached_listeners )
{
vlc_mutex_unlock( &p_em->object_lock );
+ vlc_mutex_unlock( &p_em->event_sending_lock ) ;
return;
}
break;
}
FOREACH_END()
+
+ /* Track item removed from *this* thread, with a simple flag. Indeed
+ * event_sending_lock is a recursive lock. This has the advantage of
+ * allowing to remove an event listener from within a callback */
+ listeners_group->b_sublistener_removed = false;
+
vlc_mutex_unlock( &p_em->object_lock );
-
+
/* Call the function attached */
cached_listener = array_of_cached_listeners;
if( !listeners_group || !array_of_cached_listeners )
{
free( array_of_cached_listeners );
+ vlc_mutex_unlock( &p_em->event_sending_lock );
return;
}
- vlc_mutex_lock( &p_em->event_sending_lock ) ;
-
- /* Track item removed from *this* thread, with a simple flag */
- listeners_group->b_sublistener_removed = false;
for( i = 0; i < i_cached_listeners; i++ )
{
- /* No need to lock on listeners_group, a listener group can't be removed */
if( listeners_group->b_sublistener_removed )
{
- /* If a callback was removed, this gets called */
+ /* If a callback was removed inside one of our callback, this gets
+ * called */
bool valid_listener;
vlc_mutex_lock( &p_em->object_lock );
valid_listener = group_contains_listener( listeners_group, cached_listener );