lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ease up on artist task concurrency

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-25 18:36:48 -04:00
parent fca5a40601
commit 262dc6d8cd
1 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@ -185,7 +185,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param> /// <param name="progress">The progress.</param>
/// <returns>Task{Artist[]}.</returns> /// <returns>Task{Artist[]}.</returns>
private async Task<ConcurrentBag<Artist>> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress) private async Task<List<Artist>> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress)
{ {
var allArtists = allSongs var allArtists = allSongs
.SelectMany(i => .SelectMany(i =>
@ -203,36 +203,18 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.ToList(); .ToList();
const int maxTasks = 3; var returnArtists = new List<Artist>(allArtists.Count);
var tasks = new List<Task>();
var returnArtists = new ConcurrentBag<Artist>();
var numComplete = 0; var numComplete = 0;
var numArtists = allArtists.Count; var numArtists = allArtists.Count;
foreach (var artist in allArtists) foreach (var artist in allArtists)
{
if (tasks.Count > maxTasks)
{
await Task.WhenAll(tasks).ConfigureAwait(false);
tasks.Clear();
// Safe cancellation point, when there are no pending tasks
cancellationToken.ThrowIfCancellationRequested();
}
// Avoid accessing the foreach variable within the closure
var currentArtist = artist;
tasks.Add(Task.Run(async () =>
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
try try
{ {
var artistItem = _libraryManager.GetArtist(currentArtist); var artistItem = _libraryManager.GetArtist(artist);
await artistItem.RefreshMetadata(cancellationToken).ConfigureAwait(false); await artistItem.RefreshMetadata(cancellationToken).ConfigureAwait(false);
@ -240,22 +222,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
} }
catch (IOException ex) catch (IOException ex)
{ {
_logger.ErrorException("Error validating Artist {0}", ex, currentArtist); _logger.ErrorException("Error validating Artist {0}", ex, artist);
} }
// Update progress // Update progress
lock (progress)
{
numComplete++; numComplete++;
double percent = numComplete; double percent = numComplete;
percent /= numArtists; percent /= numArtists;
progress.Report(100 * percent); progress.Report(100 * percent);
} }
}));
}
await Task.WhenAll(tasks).ConfigureAwait(false);
return returnArtists; return returnArtists;
} }