Commit 823b0568 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

preparser: shut threat down when not needed

parent 032f1e34
...@@ -44,7 +44,7 @@ struct playlist_preparser_t ...@@ -44,7 +44,7 @@ struct playlist_preparser_t
vlc_thread_t thread; vlc_thread_t thread;
vlc_mutex_t lock; vlc_mutex_t lock;
vlc_cond_t wait; bool b_live, b_zombie;
input_item_t **pp_waiting; input_item_t **pp_waiting;
int i_waiting; int i_waiting;
...@@ -65,18 +65,11 @@ playlist_preparser_t *playlist_preparser_New( playlist_t *p_playlist, playlist_f ...@@ -65,18 +65,11 @@ playlist_preparser_t *playlist_preparser_New( playlist_t *p_playlist, playlist_f
p_preparser->p_playlist = p_playlist; p_preparser->p_playlist = p_playlist;
p_preparser->p_fetcher = p_fetcher; p_preparser->p_fetcher = p_fetcher;
vlc_mutex_init( &p_preparser->lock ); vlc_mutex_init( &p_preparser->lock );
vlc_cond_init( &p_preparser->wait ); p_preparser->b_zombie = p_preparser->b_live = false;
p_preparser->i_art_policy = var_GetInteger( p_playlist, "album-art" ); p_preparser->i_art_policy = var_GetInteger( p_playlist, "album-art" );
p_preparser->i_waiting = 0; p_preparser->i_waiting = 0;
p_preparser->pp_waiting = NULL; p_preparser->pp_waiting = NULL;
if( vlc_clone( &p_preparser->thread, Thread, p_preparser,
VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_playlist, "cannot spawn preparse thread" );
free( p_preparser );
return NULL;
}
return p_preparser; return p_preparser;
} }
...@@ -85,24 +78,43 @@ void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p ...@@ -85,24 +78,43 @@ void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p
vlc_gc_incref( p_item ); vlc_gc_incref( p_item );
vlc_mutex_lock( &p_preparser->lock ); vlc_mutex_lock( &p_preparser->lock );
if( p_preparser->b_zombie )
{
vlc_join( p_preparser->thread, NULL );
p_preparser->b_zombie = false;
}
INSERT_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, INSERT_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting,
p_preparser->i_waiting, p_item ); p_preparser->i_waiting, p_item );
vlc_cond_signal( &p_preparser->wait ); if( !p_preparser->b_live )
{
if( vlc_clone( &p_preparser->thread, Thread, p_preparser,
VLC_THREAD_PRIORITY_LOW ) )
msg_Warn( p_preparser->p_playlist,
"cannot spawn pre-parser thread" );
else
p_preparser->b_live = true;
}
vlc_mutex_unlock( &p_preparser->lock ); vlc_mutex_unlock( &p_preparser->lock );
} }
void playlist_preparser_Delete( playlist_preparser_t *p_preparser ) void playlist_preparser_Delete( playlist_preparser_t *p_preparser )
{ {
bool b_join;
/* Destroy the item preparser */ /* Destroy the item preparser */
vlc_cancel( p_preparser->thread ); vlc_mutex_lock( &p_preparser->lock );
vlc_join( p_preparser->thread, NULL ); if( p_preparser->b_live )
vlc_cancel( p_preparser->thread );
b_join = p_preparser->b_live || p_preparser->b_zombie;
vlc_mutex_unlock( &p_preparser->lock );
if( b_join )
vlc_join( p_preparser->thread, NULL );
while( p_preparser->i_waiting > 0 ) while( p_preparser->i_waiting > 0 )
{ /* Any left-over unparsed item? */ { /* Any left-over unparsed item? */
vlc_gc_decref( p_preparser->pp_waiting[0] ); vlc_gc_decref( p_preparser->pp_waiting[0] );
REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 ); REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 );
} }
vlc_cond_destroy( &p_preparser->wait );
vlc_mutex_destroy( &p_preparser->lock ); vlc_mutex_destroy( &p_preparser->lock );
free( p_preparser ); free( p_preparser );
} }
...@@ -187,22 +199,23 @@ static void *Thread( void *data ) ...@@ -187,22 +199,23 @@ static void *Thread( void *data )
{ {
input_item_t *p_current; input_item_t *p_current;
/* Be sure to be cancellable before our queue is empty */
vlc_testcancel();
/* */ /* */
vlc_mutex_lock( &p_preparser->lock ); vlc_mutex_lock( &p_preparser->lock );
mutex_cleanup_push( &p_preparser->lock ); if( p_preparser->i_waiting > 0 )
{
while( p_preparser->i_waiting == 0 ) p_current = p_preparser->pp_waiting[0];
vlc_cond_wait( &p_preparser->wait, &p_preparser->lock ); REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 );
}
p_current = p_preparser->pp_waiting[0]; else
REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 ); {
vlc_cleanup_run( ); p_current = NULL;
p_preparser->b_live = false;
p_preparser->b_zombie = true;
}
vlc_mutex_unlock( &p_preparser->lock );
if( !p_current ) if( !p_current )
continue; break;
int canc = vlc_savecancel(); int canc = vlc_savecancel();
...@@ -217,7 +230,7 @@ static void *Thread( void *data ) ...@@ -217,7 +230,7 @@ static void *Thread( void *data )
if( i_activity < 0 ) if( i_activity < 0 )
i_activity = 0; i_activity = 0;
/* Sleep at least 1ms */ /* Sleep at least 1ms and cancel thread if needed */
msleep( (i_activity+1) * 1000 ); msleep( (i_activity+1) * 1000 );
} }
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment