Changeset 496a54201d383dc056767a10b79e2a0354512e53

Timestamp:

10/12/06 15:00:54 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[dbcaeb30c2a9ec5ab42c7a708d873b8e9a2228de]

git-author:

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

Message:

* Do not take and release the structure lock for each element of the list while

releasing it. mutex locks /= 20 on a standard preparse run

* Only create absolutely necessary variables while preparsing
--> Preparse speed *= 4 (with item in disk cache of course)

* Do not rebuild playlist too much while adding a directory. Add a new flag

to NodeCreate? and Add to control this behaviour

Files:

• include/vlc/vlc.h (modified) (1 diff)
• include/vlc_playlist.h (modified) (1 diff)
• modules/access/directory.c (modified) (3 diffs)
• modules/gui/macosx/playlist.m (modified) (1 diff)
• modules/gui/wxwidgets/dialogs/playlist.cpp (modified) (1 diff)
• modules/services_discovery/bonjour.c (modified) (1 diff)
• modules/services_discovery/podcast.c (modified) (1 diff)
• modules/services_discovery/sap.c (modified) (1 diff)
• modules/services_discovery/upnp_cc.cpp (modified) (2 diffs)
• modules/services_discovery/upnp_intel.cpp (modified) (2 diffs)
• src/input/es_out.c (modified) (1 diff)
• src/input/input.c (modified) (2 diffs)
• src/input/var.c (modified) (2 diffs)
• src/libvlc-common.c (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/playlist/engine.c (modified) (3 diffs)
• src/playlist/item.c (modified) (12 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/playlist/tree.c (modified) (3 diffs)

include/vlc/vlc.h

@@ -143 +143 @@
-#define PLAYLIST_PREPARSE        0x0008
-#define PLAYLIST_SPREPARSE       0x0010
+#define PLAYLIST_NO_REBUILD      0x0020
-
-#define PLAYLIST_END           -666

include/vlc_playlist.h

@@ -395 +395 @@
-
-/* Node management */
-
+, int i_flags
-VLC_EXPORT( int, playlist_NodeAppend, (playlist_t *,playlist_item_t*,playlist_item_t *) );
-VLC_EXPORT( int, playlist_NodeInsert, (playlist_t *,playlist_item_t*,playlist_item_t *, int) );

modules/access/directory.c

@@ -238 +238 @@
-                    DIRECTORY_ACTIVITY );
-
+    playlist_Signal( p_playlist );
+
-    if( psz_name ) free( psz_name );
-    vlc_object_release( p_playlist );
@@ -434 +436 @@
-                    msg_Dbg(p_playlist, "creading subdirectory %s", psz_uri );
-
-
-
+
+
+
-
-                    /* If we had the parent in category, the it is now node.
@@ -483 +486 @@
-                    playlist_BothAddInput( p_playlist, p_input,
-                                           p_parent_category,
-
+
+
-                                           PLAYLIST_END, NULL, NULL );
-                }

modules/gui/macosx/playlist.m

@@ -1344 +1344 @@
-    if( psz_name != NULL && psz_name != "" )
-        p_item = playlist_NodeCreate( p_playlist, psz_name, 
-
+, 0
-    else
-        p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), 
-
+, 0
-
-    if(! p_item )

modules/gui/wxwidgets/dialogs/playlist.cpp

@@ -1637 +1637 @@
-    p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id, VLC_TRUE );
-
-
+, 0
-
-    UnlockPlaylist( p_intf->p_sys, p_playlist );

modules/services_discovery/bonjour.c

@@ -308 +308 @@
-
-    p_sys->p_node_cat = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
-      p_sys->p_playlist->p_root_category
+p_sys->p_playlist->p_root_category, 0
-    p_sys->p_node_one = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
-      p_sys->p_playlist->p_root_onelevel
+p_sys->p_playlist->p_root_onelevel, 0
-    p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id;
-

modules/services_discovery/podcast.c

@@ -150 +150 @@
-
-    p_sys->p_node_cat = playlist_NodeCreate( p_playlist, _("Podcast"),
-
+, 0
-    p_sys->p_node_one = playlist_NodeCreate( p_playlist, _("Podcast"),
-
+, 0
-    p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id;
-

modules/services_discovery/sap.c

@@ -803 +803 @@
-        {
-            p_child = playlist_NodeCreate( pl_Get( p_sd ), psz_value,
-
+, 0
-            p_child->i_flags &= ~PLAYLIST_SKIP_FLAG;
-        }

modules/services_discovery/upnp_cc.cpp

@@ -207 +207 @@
-    char *str = strdup( dev->getFriendlyName( ) );
-
-
+,0
-    p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-    msg_Dbg( p_sd, "device %s added", str );
@@ -248 +248 @@
-        char* p_name = strdup(title); /* See other comment on strdup */
-        playlist_item_t* p_node = playlist_NodeCreate( p_sys->p_playlist,
-
+, 0
-        free(p_name);
-

modules/services_discovery/upnp_intel.cpp

@@ -855 +855 @@
-
-        char* title = strdup( container->getTitle() );
-
+, 0
-        free( title );
-
@@ -917 +917 @@
-    playlist_item_t* node = playlist_NodeCreate( pl_Get( _cookie->serviceDiscovery ),
-                                                 name,
-
+, 0
-    free( name );
-    s->setPlaylistNode( node );

src/input/es_out.c

@@ -178 +178 @@
-    p_sys->i_sub_last = val.i_int;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    var_Get( p_input, "audio-track-id", &val );

src/input/input.c

@@ -198 +198 @@
-
-    /* Create Objects variables for public Get and Set */
-
+
+
+
-    p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
-
@@ -1148 +1150 @@
-
-    /* Clean control variables */
-
+
+
-
-    /* Clean up master */

src/input/var.c

@@ -387 +387 @@
-
-    /* Create Object Variables for private use only */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    var_Create( p_input, "demuxed-id3", VLC_VAR_BOOL ); /* FIXME beurk */
@@ -426 +445 @@
-    var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL );
-
-    var_Create( p_input, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
-    var_Create( p_input, "cr-average", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "clock-synchro", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
-    var_Create( p_input, "seekable", VLC_VAR_BOOL );
-    val.b_bool = VLC_TRUE; /* Fixed later*/
-    var_Change( p_input, "seekable", VLC_VAR_SETVALUE, &val, NULL );
-
-    var_Create( p_input, "input-slave", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-
-    /* */

src/libvlc-common.c

@@ -580 +580 @@
-        DBusConnection  *p_conn;
-        DBusError       dbus_error;
-        int             i_dbus_service;
-
-        dbus_threads_init_default();

src/misc/objects.c

@@ -853 +853 @@
-    int i_index;
-
+    vlc_mutex_lock( &structure_lock );
-    for( i_index = 0; i_index < p_list->i_count; i_index++ )
-    {
-        vlc_mutex_lock( &structure_lock );
-
-        p_list->p_values[i_index].p_object->i_refcount--;
-
-
-
+
+
-
-    free( p_list->p_values );

src/playlist/engine.c

@@ -95 +95 @@
-                        var_CreateGetBool( p_playlist, "auto-preparse") ;
-
-
-
+
+
+
+
-
-    if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
@@ -103 +105 @@
-    /* Create playlist and media library */
-    p_playlist->p_local_category = playlist_NodeCreate( p_playlist,
-   _( "Playlist" ),p_playlist->p_root_category
+_( "Playlist" ),p_playlist->p_root_category, 0
-    p_playlist->p_local_onelevel =  playlist_NodeCreate( p_playlist,
-  _( "Playlist" ), p_playlist->p_root_onelevel
+_( "Playlist" ), p_playlist->p_root_onelevel, 0
-    p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
-    p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
@@ -121 +123 @@
-    {
-        p_playlist->p_ml_category =   playlist_NodeCreate( p_playlist,
-  _( "Media Library" ), p_playlist->p_root_category
+_( "Media Library" ), p_playlist->p_root_category, 0
-        p_playlist->p_ml_onelevel =  playlist_NodeCreate( p_playlist,
-  _( "Media Library" ), p_playlist->p_root_onelevel
+_( "Media Library" ), p_playlist->p_root_onelevel, 0
-
-        if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)

src/playlist/item.c

@@ -27 +27 @@
-#include "playlist_internal.h"
-
-
-playlist_item_t *p_n
-
-
-
-
-  
+static 
+       playlist_item_t *p_node, int i_m
+static 
+       
+static 
+static 
+
-
-/*****************************************************************************
@@ -207 +207 @@
-    AddItem( p_playlist, p_item_one,
-             b_playlist ? p_playlist->p_local_onelevel :
-
+mode, i_
-
-    /* Add to CATEGORY */
@@ -214 +214 @@
-    AddItem( p_playlist, p_item_cat,
-             b_playlist ? p_playlist->p_local_category :
-
+mode, i_
-
-    GoAndPreparse( p_playlist, i_mode, p_item_cat, p_item_one );
@@ -238 +238 @@
-    p_item_cat = playlist_ItemNewFromInput( p_playlist, p_input );
-    if( p_item_cat == NULL ) return VLC_EGENERIC;
-
+mode, i_
-
-    /* Add to onelevel */
@@ -256 +256 @@
-        {
-            AddItem( p_playlist, p_item_one,
-
+
+
-            break;
-        }
@@ -283 +284 @@
-    p_item = playlist_ItemNewFromInput( p_playlist, p_input );
-    if( p_item == NULL ) return NULL;
-
+mode, i_
-
-    vlc_mutex_unlock( &p_playlist->object_lock );
@@ -476 +477 @@
-/** Send a notification that an item has been added to a node */
-void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id,
-
+, vlc_bool_t b_signal
-{
-    vlc_value_t val;
@@ -484 +485 @@
-    val.p_address = p_add;
-    p_playlist->b_reset_currently_playing = VLC_TRUE;
-
+
+
-    var_Set( p_playlist, "item-append", val );
-    free( p_add );
@@ -510 +512 @@
-
-/* Enqueue an item for preparsing, and play it, if needed */
-
-
+
+
+
-{
-    if( (i_mode & PLAYLIST_GO ) )
@@ -557 +560 @@
-
-/* Add the playlist item to the requested node and fire a notification */
-
-playlist_item_t *p_n
+static 
+       playlist_item_t *p_node, int i_m
-{
-    ARRAY_APPEND(p_playlist->items, p_item);
@@ -570 +573 @@
-
-    if( !p_playlist->b_doing_ml )
-
+
+
-}
-
-/* Actually convert an item to a node */
-
+static 
-{
-    int i;
@@ -587 +591 @@
-
-/* Do the actual removal */
-
-
+static 
+        
-{
-    int i;

src/playlist/playlist_internal.h

@@ -92 +92 @@
- **********************************************************************/
-
-
+
+
-
-/* Tree walking */

src/playlist/tree.c

@@ -47 +47 @@
- * \paam psz_name the name of the node
- * \param p_parent the parent node to attach to or NULL if no attach
+ * \param p_flags miscellaneous flags
- * \return the new node
- */
-
-
+
+
+
-{
-    input_item_t *p_input;
@@ -69 +71 @@
-        playlist_NodeAppend( p_playlist, p_item, p_parent );
-    playlist_SendAddNotify( p_playlist, p_item->i_id,
-
+
+
-    return p_item;
-}
@@ -290 +293 @@
-{
-    *pp_node_cat = playlist_NodeCreate( p_playlist, psz_name,
-
+, 0
-    *pp_node_one = playlist_NodeCreate( p_playlist, psz_name,
-
+, 0
-    (*pp_node_one)->p_input->i_id = (*pp_node_cat)->p_input->i_id;
-    if( b_for_sd )