Changeset ace44bc9f59e2ced98bb8534aa225fce9a479d8b

Timestamp:

15/07/08 09:40:39 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1216107639 +0200

git-parent:

[4d0721f0d1dcafd37dc6116e6b6e44a2d1b500f7]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1216107639 +0200

Message:

playlist: Use PL_LOCK_IF and PL_UNLOCK_IF to perform some more checks on lock state. And fix a unlocked usage of get_current_status_item().

Files:

• src/playlist/control.c (modified) (1 diff)
• src/playlist/engine.c (modified) (1 diff)
• src/playlist/item.c (modified) (12 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/playlist/search.c (modified) (3 diffs)

src/playlist/control.c

@@ -66 +66 @@
-    int i_result;
-    va_start( args, b_locked );
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    i_result = PlaylistVAControl( p_playlist, i_query, args );
-    va_end( args );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-
-    return i_result;

src/playlist/engine.c

@@ -272 +272 @@
-    return p_input;
-}
-
-
-/**

src/playlist/item.c

@@ -257 +257 @@
-{
-    int i_ret;
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    i_ret = DeleteFromInput( p_playlist, i_input_id,
-                             p_root, true );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return i_ret;
-}
@@ -277 +277 @@
-{
-    int i_ret1, i_ret2;
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    i_ret1 = DeleteFromInput( p_playlist, i_input_id,
-                             p_playlist->p_root_category, true );
-    i_ret2 = DeleteFromInput( p_playlist, i_input_id,
-                     p_playlist->p_root_onelevel, true );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return ( i_ret1 == VLC_SUCCESS || i_ret2 == VLC_SUCCESS ) ?
-                            VLC_SUCCESS : VLC_ENOITEM;
@@ -296 +296 @@
-void playlist_Clear( playlist_t * p_playlist, bool b_locked )
-{
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    playlist_NodeEmpty( p_playlist, p_playlist->p_local_category, true );
-    playlist_NodeEmpty( p_playlist, p_playlist->p_local_onelevel, true );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-}
-
@@ -404 +404 @@
-                                             p_input->psz_uri );
-
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-
-    /* Add to ONELEVEL */
@@ -422 +422 @@
-    GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
-
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return VLC_SUCCESS;
-}
@@ -453 +453 @@
-    assert( p_input );
-
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-
-    if( !vlc_object_alive( p_playlist ) )
-    {
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-        return VLC_EGENERIC;
-    }
@@ -492 +492 @@
-    if( i_one ) *i_one = p_item_one->i_id;
-
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return VLC_SUCCESS;
-}
@@ -521 +521 @@
-    if( p_playlist->b_die )
-        return NULL;
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-
-    p_item = playlist_ItemNewFromInput( p_playlist, p_input );
@@ -527 +527 @@
-    AddItem( p_playlist, p_item, p_parent, i_mode, i_pos );
-
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-
-    return p_item;
@@ -567 +567 @@
-     */
-
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-
-    /* Fast track the media library, no time to loose */
-    if( p_item == p_playlist->p_ml_category ) {
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-        return p_item;
-    }
@@ -604 +604 @@
-        var_SetInteger( p_playlist, "item-change", p_item_in_category->
-                                                        p_input->i_id );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-        return p_item_in_category;
-    }
@@ -610 +610 @@
-    {
-        ChangeToNode( p_playlist, p_item );
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-        return NULL;
-    }

src/playlist/playlist_internal.h

@@ -144 +144 @@
-#define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null"
-
-;
+
-
+#define PL_LOCK_IF( cond ) pl_lock_if( p_playlist, cond )
+static inline void pl_lock_if( playlist_t * p_playlist, bool cond )
+{
+    if( cond ) PL_LOCK; else PL_ASSERT_LOCKED;
+}
+
+#define PL_UNLOCK_IF( cond ) pl_unlock_if( p_playlist, cond )
+static inline void pl_unlock_if( playlist_t * p_playlist, bool cond )
+{
+    if( cond ) PL_UNLOCK;
+}
-
-#endif /* !__LIBVLC_PLAYLIST_INTERNAL_H */

src/playlist/search.c

@@ -45 +45 @@
-{
-    int i;
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    ARRAY_BSEARCH( p_playlist->all_items,->i_id, int, i_id, i );
-    if( i != -1 )
-    {
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-        return ARRAY_VAL( p_playlist->all_items, i );
-    }
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return NULL;
-}
@@ -68 +68 @@
-{
-    int i;
-if( !b_locked ) PL_LOCK
+PL_LOCK_IF( !b_locked )
-    if( get_current_status_item( p_playlist ) &&
-        get_current_status_item( p_playlist )->p_input == p_item )
-    {
-
-
+
+
+
+
+
-    }
-    /** \todo Check if this is always incremental and whether we can bsearch */
@@ -80 +83 @@
-        if( ARRAY_VAL(p_playlist->all_items, i)->p_input->i_id == p_item->i_id )
-        {
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-            return ARRAY_VAL(p_playlist->all_items, i);
-        }
-    }
-if( !b_locked ) PL_UNLOCK
+PL_UNLOCK_IF( !b_locked )
-    return NULL;
-}