huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[SignalR] Remove a few minor allocations (#13872)

This commit is contained in:
Brennan 2019-09-11 09:11:19 -07:00 committed by GitHub
parent be33a6f392
commit 9557630c0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
View File

@ -539,7 +539,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
/// </returns> /// </returns>
public IAsyncEnumerable<TResult> StreamAsyncCore<TResult>(string methodName, object[] args, CancellationToken cancellationToken = default) public IAsyncEnumerable<TResult> StreamAsyncCore<TResult>(string methodName, object[] args, CancellationToken cancellationToken = default)
{ {
var cts = cancellationToken.CanBeCanceled ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken) : new CancellationTokenSource(); var cts = cancellationToken.CanBeCanceled ? CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, default) : new CancellationTokenSource();
var stream = CastIAsyncEnumerable<TResult>(methodName, args, cts); var stream = CastIAsyncEnumerable<TResult>(methodName, args, cts);
var cancelableStream = AsyncEnumerableAdapters.MakeCancelableTypedAsyncEnumerable(stream, cts); var cancelableStream = AsyncEnumerableAdapters.MakeCancelableTypedAsyncEnumerable(stream, cts);
return cancelableStream; return cancelableStream;

22
src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs
View File

@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.SignalR
return SendToAllConnections(methodName, args, null); return SendToAllConnections(methodName, args, null);
} }
private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, bool> include) private Task SendToAllConnections(string methodName, object[] args, Func<HubConnectionContext, object, bool> include, object state = null)
{ {
List<Task> tasks = null; List<Task> tasks = null;
SerializedHubMessage message = null; SerializedHubMessage message = null;
@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.SignalR
// foreach over HubConnectionStore avoids allocating an enumerator // foreach over HubConnectionStore avoids allocating an enumerator
foreach (var connection in _connections) foreach (var connection in _connections)
{ {
if (include != null && !include(connection)) if (include != null && !include(connection, state))
{ {
continue; continue;
} }
@ -127,12 +127,12 @@ namespace Microsoft.AspNetCore.SignalR
// Tasks and message are passed by ref so they can be lazily created inside the method post-filtering, // Tasks and message are passed by ref so they can be lazily created inside the method post-filtering,
// while still being re-usable when sending to multiple groups // while still being re-usable when sending to multiple groups
private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary<string, HubConnectionContext> connections, Func<HubConnectionContext, bool> include, ref List<Task> tasks, ref SerializedHubMessage message) private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary<string, HubConnectionContext> connections, Func<HubConnectionContext, object, bool> include, object state, ref List<Task> tasks, ref SerializedHubMessage message)
{ {
// foreach over ConcurrentDictionary avoids allocating an enumerator // foreach over ConcurrentDictionary avoids allocating an enumerator
foreach (var connection in connections) foreach (var connection in connections)
{ {
if (include != null && !include(connection.Value)) if (include != null && !include(connection.Value, state))
{ {
continue; continue;
} }
@ -193,7 +193,7 @@ namespace Microsoft.AspNetCore.SignalR
// group might be modified inbetween checking and sending // group might be modified inbetween checking and sending
List<Task> tasks = null; List<Task> tasks = null;
SerializedHubMessage message = null; SerializedHubMessage message = null;
SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); SendToGroupConnections(methodName, args, group, null, null, ref tasks, ref message);
if (tasks != null) if (tasks != null)
{ {
@ -221,7 +221,7 @@ namespace Microsoft.AspNetCore.SignalR
var group = _groups[groupName]; var group = _groups[groupName];
if (group != null) if (group != null)
{ {
SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); SendToGroupConnections(methodName, args, group, null, null, ref tasks, ref message);
} }
} }
@ -247,7 +247,7 @@ namespace Microsoft.AspNetCore.SignalR
List<Task> tasks = null; List<Task> tasks = null;
SerializedHubMessage message = null; SerializedHubMessage message = null;
SendToGroupConnections(methodName, args, group, connection => !excludedConnectionIds.Contains(connection.ConnectionId), ref tasks, ref message); SendToGroupConnections(methodName, args, group, (connection, state) => !((IReadOnlyList<string>)state).Contains(connection.ConnectionId), excludedConnectionIds, ref tasks, ref message);
if (tasks != null) if (tasks != null)
{ {
@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.SignalR
/// <inheritdoc /> /// <inheritdoc />
public override Task SendUserAsync(string userId, string methodName, object[] args, CancellationToken cancellationToken = default) public override Task SendUserAsync(string userId, string methodName, object[] args, CancellationToken cancellationToken = default)
{ {
return SendToAllConnections(methodName, args, connection => string.Equals(connection.UserIdentifier, userId, StringComparison.Ordinal)); return SendToAllConnections(methodName, args, (connection, state) => string.Equals(connection.UserIdentifier, (string)state, StringComparison.Ordinal), userId);
} }
/// <inheritdoc /> /// <inheritdoc />
@ -292,19 +292,19 @@ namespace Microsoft.AspNetCore.SignalR
/// <inheritdoc /> /// <inheritdoc />
public override Task SendAllExceptAsync(string methodName, object[] args, IReadOnlyList<string> excludedConnectionIds, CancellationToken cancellationToken = default) public override Task SendAllExceptAsync(string methodName, object[] args, IReadOnlyList<string> excludedConnectionIds, CancellationToken cancellationToken = default)
{ {
return SendToAllConnections(methodName, args, connection => !excludedConnectionIds.Contains(connection.ConnectionId)); return SendToAllConnections(methodName, args, (connection, state) => !((IReadOnlyList<string>)state).Contains(connection.ConnectionId), excludedConnectionIds);
} }
/// <inheritdoc /> /// <inheritdoc />
public override Task SendConnectionsAsync(IReadOnlyList<string> connectionIds, string methodName, object[] args, CancellationToken cancellationToken = default) public override Task SendConnectionsAsync(IReadOnlyList<string> connectionIds, string methodName, object[] args, CancellationToken cancellationToken = default)
{ {
return SendToAllConnections(methodName, args, connection => connectionIds.Contains(connection.ConnectionId)); return SendToAllConnections(methodName, args, (connection, state) => ((IReadOnlyList<string>)state).Contains(connection.ConnectionId), connectionIds);
} }
/// <inheritdoc /> /// <inheritdoc />
public override Task SendUsersAsync(IReadOnlyList<string> userIds, string methodName, object[] args, CancellationToken cancellationToken = default) public override Task SendUsersAsync(IReadOnlyList<string> userIds, string methodName, object[] args, CancellationToken cancellationToken = default)
{ {
return SendToAllConnections(methodName, args, connection => userIds.Contains(connection.UserIdentifier)); return SendToAllConnections(methodName, args, (connection, state) => ((IReadOnlyList<string>)state).Contains(connection.UserIdentifier), userIds);
} }
} }
} }

4
src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs
View File

@ -275,7 +275,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
{ {
if (descriptor.OriginalParameterTypes[parameterPointer] == typeof(CancellationToken)) if (descriptor.OriginalParameterTypes[parameterPointer] == typeof(CancellationToken))
{ {
cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted); cts = CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted, default);
arguments[parameterPointer] = cts.Token; arguments[parameterPointer] = cts.Token;
} }
else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true)) else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true))
@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
return; return;
} }
cts = cts ?? CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted); cts = cts ?? CancellationTokenSource.CreateLinkedTokenSource(connection.ConnectionAborted, default);
connection.ActiveRequestCancellationSources.TryAdd(hubMethodInvocationMessage.InvocationId, cts); connection.ActiveRequestCancellationSources.TryAdd(hubMethodInvocationMessage.InvocationId, cts);
var enumerable = descriptor.FromReturnedStream(result, cts.Token); var enumerable = descriptor.FromReturnedStream(result, cts.Token);