Changeset 91d93983e61dbc6cc7392fdfc71fede68dec7a5b

Timestamp:

14/12/04 12:40:09 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1103024409 +0000

git-parent:

[5d3edb82f37d177671789808248251bfdeaf7fd1]

git-author:

Clément Stenac <zorglub@videolan.org> 1103024409 +0000

Message:

* Provide playlist_LockFoo functions for some functions
* Fix deadlock with preparse

Files:

• include/vlc_playlist.h (modified) (3 diffs)
• modules/access/cdda/info.c (modified) (1 diff)
• modules/access/directory.c (modified) (1 diff)
• modules/access/vcdx/access.c (modified) (1 diff)
• modules/control/http.c (modified) (3 diffs)
• modules/demux/m3u.c (modified) (1 diff)
• modules/demux/mp4/mp4.c (modified) (1 diff)
• modules/demux/playlist/playlist.c (modified) (1 diff)
• modules/gui/gtk/playlist.c (modified) (1 diff)
• modules/gui/macosx/playlist.m (modified) (1 diff)
• modules/gui/ncurses.c (modified) (1 diff)
• modules/gui/pda/pda_callbacks.c (modified) (3 diffs)
• modules/gui/skins2/vars/playlist.cpp (modified) (1 diff)
• modules/gui/wxwindows/dialogs.cpp (modified) (1 diff)
• modules/gui/wxwindows/playlist.cpp (modified) (3 diffs)
• modules/services_discovery/sap.c (modified) (1 diff)
• modules/visualization/xosd.c (modified) (1 diff)
• src/playlist/item-ext.c (modified) (9 diffs)
• src/playlist/playlist.c (modified) (4 diffs)
• src/playlist/view.c (modified) (4 diffs)

include/vlc_playlist.h

@@ -80 +80 @@
-};
-
-
-
-
-
+
+
+
+
+
-
-/**
@@ -248 +249 @@
-
-VLC_EXPORT( int,  playlist_Clear, ( playlist_t * ) );
+VLC_EXPORT( int,  playlist_LockClear, ( playlist_t * ) );
-
-VLC_EXPORT( int, playlist_PreparseEnqueue, (playlist_t *, input_item_t *) );
@@ -312 +314 @@
-/* Misc item operations (act on item+playlist) */
-VLC_EXPORT( int,  playlist_Delete, ( playlist_t *, int ) );
+VLC_EXPORT( int,  playlist_LockDelete, ( playlist_t *, int ) );
-VLC_EXPORT( int,  playlist_Disable, ( playlist_t *, playlist_item_t * ) );
-VLC_EXPORT( int,  playlist_Enable, ( playlist_t *, playlist_item_t * ) );
-VLC_EXPORT( int, playlist_ItemToNode, (playlist_t *,playlist_item_t *) );
+VLC_EXPORT( int, playlist_LockItemToNode, (playlist_t *,playlist_item_t *) );
-VLC_EXPORT( int, playlist_Replace, (playlist_t *,playlist_item_t *, input_item_t*) );
+VLC_EXPORT( int, playlist_LockReplace, (playlist_t *,playlist_item_t *, input_item_t*) );
-
-
-/* Item search functions */
-VLC_EXPORT( playlist_item_t *, playlist_ItemGetById, (playlist_t *, int) );
+VLC_EXPORT( playlist_item_t *, playlist_LockItemGetById, (playlist_t *, int) );
-VLC_EXPORT( playlist_item_t *, playlist_ItemGetByPos, (playlist_t *, int) );
+VLC_EXPORT( playlist_item_t *, playlist_LockItemGetByPos, (playlist_t *, int) );
+VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t * ) );
+VLC_EXPORT( playlist_item_t *, playlist_LockItemGetByInput, (playlist_t *,input_item_t * ) );
-VLC_EXPORT( int, playlist_GetPositionById, (playlist_t *,int ) );
-VLC_EXPORT( playlist_item_t *, playlist_ItemGetByInput, (playlist_t *,input_item_t * ) );
-
-/* Info functions */

modules/access/cdda/info.c

@@ -921 +921 @@
-    }
-
-
+Lock
-                        ((input_thread_t *)p_access->p_parent)->input.p_item );
-

modules/access/directory.c

@@ -229 +229 @@
-        input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)->
-                                                        input.p_item;
-
+Lock
-        msg_Dbg( p_access, "not starting directory playback");
-        if( !p_item )

modules/access/vcdx/access.c

@@ -1365 +1365 @@
-                          p_playlist->i_index);
-
- 
- 
+
+
-    {
-    vcdinfo_itemid_t list_itemid;
-    list_itemid.type=VCDINFO_ITEM_TYPE_ENTRY;
-
-
+Lock
-
-    for( i = 0 ; i < p_vcd->num_entries ; i++ )

modules/control/http.c

@@ -1891 +1891 @@
-                            }
-
-
+Lock
-                                             p_items[i_index] );
-                            msg_Dbg( p_intf, "requested playlist delete: %d",
@@ -1931 +1931 @@
-                        if( j == i_nb_items )
-                        {
-
+Lock
-                            msg_Dbg( p_intf, "requested playlist delete: %d",
-                                     i );
@@ -1942 +1942 @@
-                case MVLC_EMPTY:
-                {
-
-
-
-
+
-                    msg_Dbg( p_intf, "requested playlist empty" );
-                    break;

modules/demux/m3u.c

@@ -653 +653 @@
-         input_item_t *p_current =
-             ((input_thread_t*)p_demux->p_parent)->input.p_item;
-
+Lock
-
-         if( !*pp_item )

modules/demux/mp4/mp4.c

@@ -339 +339 @@
-        if( p_playlist )
-        {
-
+Lock
-                      ((input_thread_t *)p_demux->p_parent)->input.p_item );
-            playlist_ItemToNode( p_playlist, p_item );

modules/demux/playlist/playlist.c

@@ -128 +128 @@
-         input_item_t *p_current = ( (input_thread_t*)p_demux->p_parent)->
-                                                        input.p_item;
-
+Lock
-         if( !*pp_item )
-         {

modules/gui/gtk/playlist.c

@@ -507 +507 @@
-    playlist_t * p_playlist = param;
-
-
+Lock
-}
-

modules/gui/macosx/playlist.m

@@ -315 +315 @@
-                playlist_Stop( p_playlist );
-            }
-
+Lock
-        }
-        [self playlistUpdated];

modules/gui/ncurses.c

@@ -420 +420 @@
-                int i_item = p_sys->p_playlist->i_index;
-
-
-
+
+
+
-                {
-                    playlist_Goto( p_sys->p_playlist, i_item );

modules/gui/pda/pda_callbacks.c

@@ -874 +874 @@
-                p_rows = g_list_reverse( p_rows );
-            }
-
+
-            for (p_node=p_rows; p_node!=NULL; p_node = p_node->next)
-            {
@@ -888 +888 @@
-
-                        gtk_tree_model_get(p_model, &iter, 2, &item, -1);
-
+Lock
-                    }
-                }
@@ -930 +930 @@
-    for(item = p_playlist->i_size - 1; item >= 0 ;item-- )
-    {
-
+Lock
-    }
-    vlc_object_release( p_playlist );

modules/gui/skins2/vars/playlist.cpp

@@ -65 +65 @@
-        if( (*it).m_selected )
-        {
-
-
-
+Lock
+    
+Lock
-        }
-        else

modules/gui/wxwindows/dialogs.cpp

@@ -391 +391 @@
-                                             (const char *)path.mb_str(),
-                                             PLAYLIST_APPEND, PLAYLIST_END );
-
+Lock
-        if( p_item )
-        {

modules/gui/wxwindows/playlist.cpp

@@ -620 +620 @@
-    }
-
-
+Lock
-
-    wxTreeItemId item = FindItem( treectrl->GetRootItem(), p_item);
@@ -924 +924 @@
-    }
-
-
+Lock
-
-    vlc_object_release( p_playlist );
@@ -1481 +1481 @@
-        if( p_popup_item->i_children == -1 )
-        {
+            wxMutexGuiLeave();
-            playlist_PreparseEnqueue( p_playlist, &p_popup_item->input );
+            wxMutexGuiEnter();
-        }
-        else

modules/services_discovery/sap.c

@@ -1376 +1376 @@
-    if( p_announce->p_item )
-    {
-
+Lock
-    }
-

modules/visualization/xosd.c

@@ -241 +241 @@
-            {
-    //           vlc_mutex_lock(&p_playlist->object_lock );
-
-
+
-                item = p_item->input;
-                if( !p_item )

src/playlist/item-ext.c

@@ -437 +437 @@
-}
-
+playlist_item_t *playlist_LockItemGetByPos( playlist_t *p_playlist, int i_pos )
+{
+    playlist_item_t *p_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    p_ret = playlist_ItemGetByPos( p_playlist, i_pos );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return p_ret;
+}
+
-/**
- * Search an item by its id
@@ -457 +466 @@
-}
-
+playlist_item_t *playlist_LockItemGetById( playlist_t *p_playlist, int i_id)
+{
+    playlist_item_t *p_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    p_ret = playlist_ItemGetById( p_playlist, i_id );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return p_ret;
+}
+
-/**
- * Search an item by its input_item_t
@@ -483 +501 @@
-}
-
+playlist_item_t *playlist_LockItemGetByInput( playlist_t *p_playlist,
+                                               input_item_t *p_item )
+{
+    playlist_item_t *p_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    p_ret = playlist_ItemGetByInput( p_playlist, p_item );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return p_ret;
+}
-
-
@@ -506 +533 @@
-    }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    /* Remove it from the array of available items */
-    for( i = 0 ; i < p_playlist->i_size ; i++ )
@@ -516 +541 @@
-        }
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
-    var_SetInteger( p_playlist, "item-change", p_item->input.i_id );
-
-    return VLC_SUCCESS;
+}
+
+int playlist_LockItemToNode( playlist_t *p_playlist, playlist_item_t *p_item )
+{
+    int i_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    i_ret = playlist_ItemToNode( p_playlist, p_item );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return i_ret;
-}
-
@@ -528 +561 @@
- * \see playlist_Replace
- */
-And
+
-                             playlist_item_t *p_olditem,
-                             input_item_t *p_new )
@@ -605 +638 @@
-    if( p_playlist->status.p_item == p_item )
-    {
-
+
+
+
-        p_playlist->status.p_item = NULL;
-    }
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    msg_Dbg( p_playlist, "deleting playlist item `%s'",
@@ -629 +662 @@
-    playlist_ItemDelete( p_item );
-
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    return VLC_SUCCESS;
+}
+
+int playlist_LockDelete( playlist_t * p_playlist, int i_id )
+{
+    int i_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    i_ret = playlist_Delete( p_playlist, i_id );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return i_ret;
-}
-
@@ -653 +693 @@
-    }
-    return VLC_SUCCESS;
+}
+
+int playlist_LockClear( playlist_t *p_playlist )
+{
+    int i_ret;
+    vlc_mutex_lock( &p_playlist->object_lock );
+    playlist_Clear( p_playlist );
+    vlc_mutex_unlock( &p_playlist->object_lock );
+    return i_ret;
-}
-

src/playlist/playlist.c

@@ -128 +128 @@
-    p_playlist->p_general = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
-                                        _( "General" ), p_view->p_root );
+    p_playlist->p_general->i_flags |= PLAYLIST_RO_FLAG;
-
-    /* Set startup status
@@ -573 +574 @@
-                if( p_autodelete_item )
-                {
-                    vlc_mutex_unlock( &p_playlist->object_lock );
-                    playlist_Delete( p_playlist,
-                                     p_autodelete_item->input.i_id );
-                    vlc_mutex_lock( &p_playlist->object_lock );
-                    p_autodelete_item = NULL;
-                }
@@ -588 +587 @@
-            if( p_autodelete_item )
-            {
-                vlc_mutex_unlock( &p_playlist->object_lock );
-                playlist_Delete( p_playlist, p_autodelete_item->input.i_id );
-                vlc_mutex_lock( &p_playlist->object_lock );
-                p_autodelete_item = NULL;
-            }
@@ -771 +768 @@
-    }
-
- 
+
-        !(p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG) )
-    {

src/playlist/view.c

@@ -87 +87 @@
- * Creates a new view and add it to the list
- *
+ * This function must be entered without the playlist lock
+ *
- * \param p_playlist a playlist object
- * \param i_id the view identifier
@@ -114 +116 @@
- * Deletes a view
- *
+ * This function must be entered wit the playlist lock
+ *
- * \param p_view the view to delete
- * \return nothing
@@ -122 +126 @@
-    return VLC_SUCCESS;
-}
-
-
-/**
@@ -367 +370 @@
-        }
-    }
-    var_SetInteger( p_playlist, "item-deleted", p_root->input.i_id );    
-    /* Delete the node */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-