This repository has been archived by the owner on Nov 20, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 194
Allow DefaultHttpContext to be pooled [Design] #404
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// Copyright (c) .NET Foundation. All rights reserved. | ||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
||
namespace Microsoft.AspNet.Http | ||
{ | ||
public interface IReusable | ||
{ | ||
void Reset(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,10 +16,10 @@ namespace Microsoft.AspNet.Http.Internal | |
{ | ||
public class DefaultHttpContext : HttpContext | ||
{ | ||
private readonly HttpRequest _request; | ||
private readonly HttpResponse _response; | ||
private readonly ConnectionInfo _connection; | ||
private readonly AuthenticationManager _authenticationManager; | ||
private readonly DefaultHttpRequest _request; | ||
private readonly DefaultHttpResponse _response; | ||
private readonly DefaultConnectionInfo _connection; | ||
private readonly DefaultAuthenticationManager _authenticationManager; | ||
|
||
private FeatureReference<IItemsFeature> _items; | ||
private FeatureReference<IServiceProvidersFeature> _serviceProviders; | ||
|
@@ -28,6 +28,7 @@ public class DefaultHttpContext : HttpContext | |
private FeatureReference<ISessionFeature> _session; | ||
private WebSocketManager _websockets; | ||
private IFeatureCollection _features; | ||
private Action<DefaultHttpContext> _onDisposing; | ||
|
||
public DefaultHttpContext() | ||
: this(new FeatureCollection()) | ||
|
@@ -36,6 +37,12 @@ public DefaultHttpContext() | |
_features.Set<IHttpResponseFeature>(new HttpResponseFeature()); | ||
} | ||
|
||
public DefaultHttpContext(IFeatureCollection features, Action<DefaultHttpContext> onDisposing) | ||
: this(features) | ||
{ | ||
_onDisposing = onDisposing; | ||
} | ||
|
||
public DefaultHttpContext(IFeatureCollection features) | ||
{ | ||
_features = features; | ||
|
@@ -51,6 +58,16 @@ public DefaultHttpContext(IFeatureCollection features) | |
_session = FeatureReference<ISessionFeature>.Default; | ||
} | ||
|
||
public void Initalize(IFeatureCollection features) | ||
{ | ||
_features = features; | ||
|
||
_request.Initalize(this, features); | ||
_response.Initalize(this, features); | ||
_connection.Initalize(features); | ||
_authenticationManager.Initalize(features); | ||
} | ||
|
||
IItemsFeature ItemsFeature | ||
{ | ||
get { return _items.Fetch(_features) ?? _items.Update(_features, new ItemsFeature()); } | ||
|
@@ -168,8 +185,26 @@ public override void Abort() | |
|
||
public override void Dispose() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reset There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only one that doesn't fit as is already Disposable? |
||
{ | ||
// REVIEW: is this necessary? is the environment "owned" by the context? | ||
_features.Dispose(); | ||
_features = null; | ||
|
||
_request.Reset(); | ||
_response.Reset(); | ||
_connection.Reset(); | ||
_authenticationManager.Reset(); | ||
|
||
_items.Reset(); | ||
_serviceProviders.Reset(); | ||
_authentication.Reset(); | ||
_lifetime.Reset(); | ||
_session.Reset(); | ||
|
||
_websockets = null; | ||
|
||
if(_onDisposing != null) | ||
{ | ||
_onDisposing(this); | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,14 +10,19 @@ | |
|
||
namespace Microsoft.AspNet.Http.Internal | ||
{ | ||
public class DefaultHttpResponse : HttpResponse | ||
public class DefaultHttpResponse : HttpResponse, IReusable | ||
{ | ||
private readonly DefaultHttpContext _context; | ||
private readonly IFeatureCollection _features; | ||
private DefaultHttpContext _context; | ||
private IFeatureCollection _features; | ||
private FeatureReference<IHttpResponseFeature> _response = FeatureReference<IHttpResponseFeature>.Default; | ||
private FeatureReference<IResponseCookiesFeature> _cookies = FeatureReference<IResponseCookiesFeature>.Default; | ||
|
||
public DefaultHttpResponse(DefaultHttpContext context, IFeatureCollection features) | ||
{ | ||
Initalize(context, features); | ||
} | ||
|
||
internal void Initalize(DefaultHttpContext context, IFeatureCollection features) | ||
{ | ||
_context = context; | ||
_features = features; | ||
|
@@ -116,5 +121,14 @@ public override void Redirect(string location, bool permanent) | |
|
||
Headers[HeaderNames.Location] = location; | ||
} | ||
|
||
public void Reset() | ||
{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reset |
||
_context = null; | ||
_features = null; | ||
|
||
_response.Reset(); | ||
_cookies.Reset(); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you really need to hold onto FeatureReference structs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to check; they are heap allocated - so would be another chunk of memory but they are only a pointer and an int...