flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-06-11 18:06:27 +00:00
Code Issues Releases Wiki Activity

Fix for socket connecting with a lot of tasks being created

Browse Source
This commit is contained in:
Jkorf 2021-08-20 14:07:58 +02:00
parent f33c87b4f2
commit 7e2f466ada
3 changed files with 16 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
CryptoExchange.Net/CryptoExchange.Net.xml
View File

@ -3818,148 +3818,5 @@
<member name="M:CryptoExchange.Net.Sockets.WebsocketFactory.CreateWebsocket(CryptoExchange.Net.Logging.Log,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String})"> <member name="M:CryptoExchange.Net.Sockets.WebsocketFactory.CreateWebsocket(CryptoExchange.Net.Logging.Log,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String})">
<inheritdoc /> <inheritdoc />
</member> </member>
<member name="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute">
<summary>
Specifies that <see langword="null"/> is allowed as an input even if the
corresponding type disallows it.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.AllowNullAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute"/> class.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.DisallowNullAttribute">
<summary>
Specifies that <see langword="null"/> is disallowed as an input even if the
corresponding type allows it.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.DisallowNullAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.DisallowNullAttribute"/> class.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute">
<summary>
Specifies that a method that will never return under any circumstance.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.DoesNotReturnAttribute"/> class.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute">
<summary>
Specifies that the method will not return if the associated <see cref="T:System.Boolean"/>
parameter is passed the specified value.
</summary>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.ParameterValue">
<summary>
Gets the condition parameter value.
Code after the method is considered unreachable by diagnostics if the argument
to the associated parameter matches this value.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.#ctor(System.Boolean)">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute"/>
class with the specified parameter value.
</summary>
<param name="parameterValue">
The condition parameter value.
Code after the method is considered unreachable by diagnostics if the argument
to the associated parameter matches this value.
</param>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.MaybeNullAttribute">
<summary>
Specifies that an output may be <see langword="null"/> even if the
corresponding type disallows it.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.MaybeNullAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.MaybeNullAttribute"/> class.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute">
<summary>
Specifies that when a method returns <see cref="P:System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute.ReturnValue"/>,
the parameter may be <see langword="null"/> even if the corresponding type disallows it.
</summary>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute.ReturnValue">
<summary>
Gets the return value condition.
If the method returns this value, the associated parameter may be <see langword="null"/>.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute.#ctor(System.Boolean)">
<summary>
Initializes the attribute with the specified return value condition.
</summary>
<param name="returnValue">
The return value condition.
If the method returns this value, the associated parameter may be <see langword="null"/>.
</param>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.NotNullAttribute">
<summary>
Specifies that an output is not <see langword="null"/> even if the
corresponding type allows it.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.NotNullAttribute.#ctor">
<summary>
Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.NotNullAttribute"/> class.
</summary>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute">
<summary>
Specifies that the output will be non-<see langword="null"/> if the
named parameter is non-<see langword="null"/>.
</summary>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute.ParameterName">
<summary>
Gets the associated parameter name.
The output will be non-<see langword="null"/> if the argument to the
parameter specified is non-<see langword="null"/>.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute.#ctor(System.String)">
<summary>
Initializes the attribute with the associated parameter name.
</summary>
<param name="parameterName">
The associated parameter name.
The output will be non-<see langword="null"/> if the argument to the
parameter specified is non-<see langword="null"/>.
</param>
</member>
<member name="T:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute">
<summary>
Specifies that when a method returns <see cref="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue"/>,
the parameter will not be <see langword="null"/> even if the corresponding type allows it.
</summary>
</member>
<member name="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue">
<summary>
Gets the return value condition.
If the method returns this value, the associated parameter will not be <see langword="null"/>.
</summary>
</member>
<member name="M:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.#ctor(System.Boolean)">
<summary>
Initializes the attribute with the specified return value condition.
</summary>
<param name="returnValue">
The return value condition.
If the method returns this value, the associated parameter will not be <see langword="null"/>.
</param>
</member>
</members> </members>
</doc> </doc>

3
CryptoExchange.Net/OrderBook/SymbolOrderBook.cs
View File

@ -237,7 +237,10 @@ namespace CryptoExchange.Net.OrderBook
var startResult = await DoStartAsync().ConfigureAwait(false); var startResult = await DoStartAsync().ConfigureAwait(false);
if (!startResult) if (!startResult)
{
Status = OrderBookStatus.Disconnected;
return new CallResult<bool>(false, startResult.Error); return new CallResult<bool>(false, startResult.Error);
}
subscription = startResult.Data; subscription = startResult.Data;
subscription.ConnectionLost += Reset; subscription.ConnectionLost += Reset;

15
CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
View File

@ -33,6 +33,8 @@ namespace CryptoExchange.Net.Sockets
private readonly IDictionary<string, string> headers; private readonly IDictionary<string, string> headers;
private CancellationTokenSource _ctsSource; private CancellationTokenSource _ctsSource;
private bool _closing; private bool _closing;
private bool _startedSent;
private bool _startedReceive;
/// <summary> /// <summary>
/// Log /// Log
@ -213,11 +215,15 @@ namespace CryptoExchange.Net.Sockets
return false; return false;
} }
log.Write(LogLevel.Debug, $"Socket {Id} connected"); _sendTask = Task.Run(SendLoopAsync);
_sendTask = Task.Run(async () => await SendLoopAsync().ConfigureAwait(false));
_receiveTask = Task.Run(ReceiveLoopAsync); _receiveTask = Task.Run(ReceiveLoopAsync);
if (Timeout != default) if (Timeout != default)
_timeoutTask = Task.Run(CheckTimeoutAsync); _timeoutTask = Task.Run(CheckTimeoutAsync);
while (!_startedSent || !_startedReceive)
// Wait for the tasks to have actually started
await Task.Delay(10).ConfigureAwait(false);
log.Write(LogLevel.Debug, $"Socket {Id} connected");
return true; return true;
} }
@ -256,6 +262,8 @@ namespace CryptoExchange.Net.Sockets
if (_closing) if (_closing)
return; return;
_startedSent = false;
_startedReceive = false;
_closing = true; _closing = true;
var tasksToAwait = new List<Task>(); var tasksToAwait = new List<Task>();
if (_socket.State == WebSocketState.Open) if (_socket.State == WebSocketState.Open)
@ -325,6 +333,7 @@ namespace CryptoExchange.Net.Sockets
/// <returns></returns> /// <returns></returns>
private async Task SendLoopAsync() private async Task SendLoopAsync()
{ {
_startedSent = true;
while (true) while (true)
{ {
_sendEvent.WaitOne(); _sendEvent.WaitOne();
@ -360,6 +369,8 @@ namespace CryptoExchange.Net.Sockets
/// <returns></returns> /// <returns></returns>
private async Task ReceiveLoopAsync() private async Task ReceiveLoopAsync()
{ {
_startedReceive = true;
var buffer = new ArraySegment<byte>(new byte[4096]); var buffer = new ArraySegment<byte>(new byte[4096]);
var received = 0; var received = 0;
while (true) while (true)