Changeset 259aca484038fd448c192134f8aa539f250ddf2e

Timestamp:

28/08/07 03:43:11 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1188265391 +0000

git-parent:

[2eb5e4cd2b063a299d2db9f90ff6937b26685f8c]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1188265391 +0000

Message:

control/event.c: Make detach-ing from an event safe: A detached callback can't be called after event_detached. Add an internal event_detach_lock_state, to bypass this feature.

Files:

• src/control/event.c (modified) (8 diffs)
• src/control/libvlc_internal.h (modified) (3 diffs)

src/control/event.c

@@ -78 +78 @@
-    ARRAY_INIT( p_em->listeners_groups );
-    vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock );
-
+
-    return p_em;
-}
@@ -92 +92 @@
-    libvlc_event_listener_t * listener;
-
+    vlc_mutex_destroy( &p_em->event_sending_lock );
-    vlc_mutex_destroy( &p_em->object_lock );
-
@@ -148 +149 @@
-    p_event->p_obj = p_em->p_obj;
-
+    /* Here a read/write lock would be nice */
+
-    vlc_mutex_lock( &p_em->object_lock );
-    FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
@@ -172 +175 @@
-        }
-    FOREACH_END()
+
-    vlc_mutex_unlock( &p_em->object_lock );
-
+    /* Here a read/write lock would be *especially* nice,
+     * We would be able to send event without blocking */
+    /* The only reason for this lock is to be able to wait the
+     * End of events sending with libvlc_event_manager_lock_event_sending.
+     * This can be useful to make sure a callback is completely detached. */
+    vlc_mutex_lock( &p_em->event_sending_lock );
-    listener_cached = array_listeners_cached;
-    for( i = 0; i < i_cached_listeners; i++ )
@@ -180 +190 @@
-        listener_cached++;
-    }
+    vlc_mutex_unlock( &p_em->event_sending_lock );
+
-    free( array_listeners_cached );
-}
@@ -239 +251 @@
-                          libvlc_exception_t *p_e )
-{
+    libvlc_event_detach_lock_state( p_event_manager, event_type, pf_callback,
+                                    p_user_data, libvlc_UnLocked, p_e );
+}
+
+/**************************************************************************
+ *       libvlc_event_detach_no_lock (internal) :
+ *
+ * Remove a callback for an event.
+ **************************************************************************/
+void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager,
+                                     libvlc_event_type_t event_type,
+                                     libvlc_callback_t pf_callback,
+                                     void *p_user_data,
+                                     libvlc_lock_state_t lockstate,
+                                     libvlc_exception_t *p_e )
+{
-    libvlc_event_listeners_group_t * listeners_group;
-    libvlc_event_listener_t * listener;
-
+    if( lockstate == libvlc_UnLocked )
+        vlc_mutex_lock( &p_event_manager->event_sending_lock );
-    vlc_mutex_lock( &p_event_manager->object_lock );
-    FOREACH_ARRAY( listeners_group, p_event_manager->listeners_groups )
@@ -257 +287 @@
-                                  I hate macro) */ );
-                    vlc_mutex_unlock( &p_event_manager->object_lock );
+                    if( lockstate == libvlc_UnLocked )
+                        vlc_mutex_unlock( &p_event_manager->event_sending_lock );
-                    return;
-                }
@@ -263 +295 @@
-    FOREACH_END()
-    vlc_mutex_unlock( &p_event_manager->object_lock );
+    if( lockstate == libvlc_UnLocked )
+        vlc_mutex_unlock( &p_event_manager->event_sending_lock );
-
-    libvlc_exception_raise( p_e,

src/control/libvlc_internal.h

@@ -53 +53 @@
- * Opaque structures for libvlc API
- ***************************************************************************/
+
+typedef enum libvlc_lock_state_t
+{
+    libvlc_Locked,
+    libvlc_UnLocked
+} libvlc_lock_state_t;
-
-struct libvlc_instance_t
@@ -225 +231 @@
-    DECL_ARRAY(libvlc_event_listeners_group_t *) listeners_groups;
-    vlc_mutex_t object_lock;
+    vlc_mutex_t event_sending_lock;
-} libvlc_event_sender_t;
-
@@ -261 +268 @@
-
-VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) );
+VLC_EXPORT (void, libvlc_event_detach_lock_state, ( libvlc_event_manager_t *p_event_manager, libvlc_event_type_t event_type, libvlc_callback_t pf_callback,
+                                                    void *p_user_data, libvlc_lock_state_t lockstate, libvlc_exception_t *p_e ) );
-
-VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );