Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid WriteBarrier assign for nulling struct #7659

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/Http/Http.Features/src/FeatureReferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ public FeatureReferences(IFeatureCollection collection)
Revision = collection.Revision;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Initalize(IFeatureCollection collection)
{
Revision = collection.Revision;
Collection = collection;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Initalize(IFeatureCollection collection, int revision)
{
Revision = revision;
Collection = collection;
}

public IFeatureCollection Collection { get; private set; }
public int Revision { get; private set; }

Expand Down
13 changes: 7 additions & 6 deletions src/Http/Http/src/DefaultHttpContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,19 @@ public DefaultHttpContext()

public DefaultHttpContext(IFeatureCollection features)
{
_features = new FeatureReferences<FeatureInterfaces>(features);
_features.Initalize(features);
_request = new DefaultHttpRequest(this);
_response = new DefaultHttpResponse(this);
}

public void Initialize(IFeatureCollection features)
{
_features = new FeatureReferences<FeatureInterfaces>(features);
_request.Initialize();
_response.Initialize();
_connection?.Initialize(features);
_websockets?.Initialize(features);
var revision = features.Revision;
_features.Initalize(features, revision);
_request.Initialize(revision);
_response.Initialize(revision);
_connection?.Initialize(features, revision);
_websockets?.Initialize(features, revision);
}

public void Uninitialize()
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Http/src/Features/QueryFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public QueryFeature(IFeatureCollection features)
throw new ArgumentNullException(nameof(features));
}

_features = new FeatureReferences<IHttpRequestFeature>(features);
_features.Initalize(features);
}

private IHttpRequestFeature HttpRequestFeature =>
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Http/src/Features/RequestCookiesFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public RequestCookiesFeature(IFeatureCollection features)
throw new ArgumentNullException(nameof(features));
}

_features = new FeatureReferences<IHttpRequestFeature>(features);
_features.Initalize(features);
}

private IHttpRequestFeature HttpRequestFeature =>
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Http/src/Features/ResponseCookiesFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ResponseCookiesFeature(IFeatureCollection features, ObjectPool<StringBuil
throw new ArgumentNullException(nameof(features));
}

_features = new FeatureReferences<IHttpResponseFeature>(features);
_features.Initalize(features);
}

private IHttpResponseFeature HttpResponseFeature => _features.Fetch(ref _features.Cache, _nullResponseFeature);
Expand Down
7 changes: 6 additions & 1 deletion src/Http/Http/src/Internal/DefaultConnectionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ public DefaultConnectionInfo(IFeatureCollection features)

public void Initialize( IFeatureCollection features)
{
_features = new FeatureReferences<FeatureInterfaces>(features);
_features.Initalize(features);
}

public void Initialize(IFeatureCollection features, int revision)
{
_features.Initalize(features, revision);
}

public void Uninitialize()
Expand Down
9 changes: 7 additions & 2 deletions src/Http/Http/src/Internal/DefaultHttpRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,17 @@ public sealed class DefaultHttpRequest : HttpRequest
public DefaultHttpRequest(DefaultHttpContext context)
{
_context = context;
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
_features.Initalize(context.Features);
}

public void Initialize()
{
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
_features.Initalize(_context.Features);
}

public void Initialize(int revision)
{
_features.Initalize(_context.Features, revision);
}

public void Uninitialize()
Expand Down
9 changes: 7 additions & 2 deletions src/Http/Http/src/Internal/DefaultHttpResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ public sealed class DefaultHttpResponse : HttpResponse
public DefaultHttpResponse(DefaultHttpContext context)
{
_context = context;
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
_features.Initalize(context.Features);
}

public void Initialize()
{
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
_features.Initalize(_context.Features);
}

public void Initialize(int revision)
{
_features.Initalize(_context.Features, revision);
}

public void Uninitialize()
Expand Down
7 changes: 6 additions & 1 deletion src/Http/Http/src/Internal/DefaultWebSocketManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ public DefaultWebSocketManager(IFeatureCollection features)

public void Initialize(IFeatureCollection features)
{
_features = new FeatureReferences<FeatureInterfaces>(features);
_features.Initalize(features);
}

public void Initialize(IFeatureCollection features, int revision)
{
_features.Initalize(features, revision);
}

public void Uninitialize()
Expand Down