From fbf8cc833c441de8890998600be044296acfc783 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 21 Aug 2012 22:50:59 -0400 Subject: a few more async optimizations --- .../Net/Handlers/StaticFileHandler.cs | 55 ++++++++++------------ 1 file changed, 26 insertions(+), 29 deletions(-) (limited to 'MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs') diff --git a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs index d8971dd97..799abea9b 100644 --- a/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs @@ -102,33 +102,30 @@ namespace MediaBrowser.Common.Net.Handlers protected override Task GetLastDateModified() { - return Task.Run(() => - { - EnsureSourceStream(); + DateTime? value = null; - if (SourceStream == null) - { - return null; - } + EnsureSourceStream(); - return File.GetLastWriteTime(Path); - }); + if (SourceStream != null) + { + value = File.GetLastWriteTime(Path); + } + + return Task.FromResult(value); } public override Task GetContentType() { - return Task.Run(() => - { - return MimeTypes.GetMimeType(Path); - }); + return Task.FromResult(MimeTypes.GetMimeType(Path)); } protected override Task PrepareResponse() { - return Task.Run(() => { EnsureSourceStream(); }); + EnsureSourceStream(); + return Task.FromResult(null); } - protected async override Task WriteResponseToOutputStream(Stream stream) + protected override Task WriteResponseToOutputStream(Stream stream) { if (IsRangeRequest) { @@ -137,22 +134,22 @@ namespace MediaBrowser.Common.Net.Handlers // If the requested range is "0-" and we know the total length, we can optimize by avoiding having to buffer the content into memory if (requestedRange.Value == null && TotalContentLength != null) { - await ServeCompleteRangeRequest(requestedRange, stream); + return ServeCompleteRangeRequest(requestedRange, stream); } else if (TotalContentLength.HasValue) { // This will have to buffer a portion of the content into memory - await ServePartialRangeRequestWithKnownTotalContentLength(requestedRange, stream); + return ServePartialRangeRequestWithKnownTotalContentLength(requestedRange, stream); } else { // This will have to buffer the entire content into memory - await ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream); + return ServePartialRangeRequestWithUnknownTotalContentLength(requestedRange, stream); } } else { - await SourceStream.CopyToAsync(stream); + return SourceStream.CopyToAsync(stream); } } @@ -170,7 +167,7 @@ namespace MediaBrowser.Common.Net.Handlers /// Handles a range request of "bytes=0-" /// This will serve the complete content and add the content-range header /// - private async Task ServeCompleteRangeRequest(KeyValuePair requestedRange, Stream responseStream) + private Task ServeCompleteRangeRequest(KeyValuePair requestedRange, Stream responseStream) { long totalContentLength = TotalContentLength.Value; @@ -187,7 +184,7 @@ namespace MediaBrowser.Common.Net.Handlers SourceStream.Position = rangeStart; } - await SourceStream.CopyToAsync(responseStream); + return SourceStream.CopyToAsync(responseStream); } /// @@ -196,7 +193,7 @@ namespace MediaBrowser.Common.Net.Handlers private async Task ServePartialRangeRequestWithUnknownTotalContentLength(KeyValuePair requestedRange, Stream responseStream) { // Read the entire stream so that we can determine the length - byte[] bytes = await ReadBytes(SourceStream, 0, null); + byte[] bytes = await ReadBytes(SourceStream, 0, null).ConfigureAwait(false); long totalContentLength = bytes.LongLength; @@ -208,7 +205,7 @@ namespace MediaBrowser.Common.Net.Handlers HttpListenerContext.Response.ContentLength64 = rangeLength; HttpListenerContext.Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength); - await responseStream.WriteAsync(bytes, Convert.ToInt32(rangeStart), Convert.ToInt32(rangeLength)); + await responseStream.WriteAsync(bytes, Convert.ToInt32(rangeStart), Convert.ToInt32(rangeLength)).ConfigureAwait(false); } /// @@ -222,14 +219,14 @@ namespace MediaBrowser.Common.Net.Handlers long rangeLength = 1 + rangeEnd - rangeStart; // Only read the bytes we need - byte[] bytes = await ReadBytes(SourceStream, Convert.ToInt32(rangeStart), Convert.ToInt32(rangeLength)); + byte[] bytes = await ReadBytes(SourceStream, Convert.ToInt32(rangeStart), Convert.ToInt32(rangeLength)).ConfigureAwait(false); // Content-Length is the length of what we're serving, not the original content HttpListenerContext.Response.ContentLength64 = rangeLength; HttpListenerContext.Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength); - await responseStream.WriteAsync(bytes, 0, Convert.ToInt32(rangeLength)); + await responseStream.WriteAsync(bytes, 0, Convert.ToInt32(rangeLength)).ConfigureAwait(false); } /// @@ -252,9 +249,9 @@ namespace MediaBrowser.Common.Net.Handlers using (MemoryStream ms = new MemoryStream()) { int read; - while ((read = await input.ReadAsync(buffer, 0, buffer.Length)) > 0) + while ((read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false)) > 0) { - await ms.WriteAsync(buffer, 0, read); + await ms.WriteAsync(buffer, 0, read).ConfigureAwait(false); } return ms.ToArray(); } @@ -265,9 +262,9 @@ namespace MediaBrowser.Common.Net.Handlers using (MemoryStream ms = new MemoryStream()) { - int read = await input.ReadAsync(buffer, 0, buffer.Length); + int read = await input.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false); - await ms.WriteAsync(buffer, 0, read); + await ms.WriteAsync(buffer, 0, read).ConfigureAwait(false); return ms.ToArray(); } -- cgit v1.2.3