Skip to content

Commit 33ca249

Browse files
sokolovsasokolovsa
committed
.net standard 2.0
1 parent 642705f commit 33ca249

20 files changed

+130
-131
lines changed

‎Algo/BasketMessageAdapter.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected override bool OnInserting(int index, IMessageAdapter item)
9191
protected override bool OnRemoving(IMessageAdapter item)
9292
{
9393
_enables.Remove(item);
94-
94+
9595
if (item.Parent == _parent)
9696
item.Parent = null;
9797

@@ -185,7 +185,7 @@ public IDictionary<long, IMessageAdapter> GetChild(long parentId)
185185
{
186186
if (!_childToParentIds.TryGetValue(childId, out var tuple))
187187
return null;
188-
188+
189189
var parentId = tuple.First;
190190
tuple.Second = error == null ? SubscriptionStates.Active : SubscriptionStates.Error;
191191
tuple.Fourth = error;
@@ -202,7 +202,7 @@ public IDictionary<long, IMessageAdapter> GetChild(long parentId)
202202
needParentResponse = false;
203203
break;
204204
}
205-
205+
206206
if (t.Second != SubscriptionStates.Error)
207207
allError = false;
208208
else if (t.Fourth != null)
@@ -228,7 +228,7 @@ public IDictionary<long, IMessageAdapter> GetChild(long parentId)
228228
{
229229
if (!_childToParentIds.TryGetValue(childId, out var tuple))
230230
return null;
231-
231+
232232
var parentId = tuple.First;
233233
tuple.Second = state;
234234

@@ -456,7 +456,7 @@ private IPositionManager GetManager(string strategyId)
456456
private readonly SyncObject _connectedResponseLock = new SyncObject();
457457
private readonly Dictionary<MessageTypes, CachedSynchronizedSet<IMessageAdapter>> _messageTypeAdapters = new Dictionary<MessageTypes, CachedSynchronizedSet<IMessageAdapter>>();
458458
private readonly List<Message> _pendingMessages = new List<Message>();
459-
459+
460460
private readonly Dictionary<IMessageAdapter, Tuple<ConnectionStates, Exception>> _adapterStates = new Dictionary<IMessageAdapter, Tuple<ConnectionStates, Exception>>();
461461
private ConnectionStates _currState = ConnectionStates.Disconnected;
462462

@@ -633,7 +633,7 @@ IEnumerable<MessageTypes> IMessageAdapter.SupportedInMessages
633633
MessageAdapterCategories IMessageAdapter.Categories => GetSortedAdapters().Select(a => a.Categories).JoinMask();
634634

635635
Type IMessageAdapter.OrderConditionType => null;
636-
636+
637637
bool IMessageAdapter.HeartbeatBeforConnect => false;
638638

639639
Uri IMessageAdapter.Icon => GetType().GetIconUrl();
@@ -674,7 +674,7 @@ TimeSpan IMessageAdapter.GetHistoryStepSize(DataType dataType, out TimeSpan iter
674674
}
675675

676676
bool IMessageAdapter.IsAllDownloadingSupported(DataType dataType) => GetSortedAdapters().Any(a => a.IsAllDownloadingSupported(dataType));
677-
677+
678678
bool IMessageAdapter.IsSecurityRequired(DataType dataType) => GetSortedAdapters().Any(a => a.IsSecurityRequired(dataType));
679679

680680
bool IMessageAdapter.EnqueueSubscriptions
@@ -849,7 +849,7 @@ IMessageAdapter ApplyOwnInner(MessageAdapterWrapper a)
849849
if (UseChannels && adapter.UseChannels)
850850
{
851851
adapter = ApplyOwnInner(new ChannelMessageAdapter(adapter,
852-
new InMemoryMessageChannel(new MessageByOrderQueue(), $"{adapter} In", SendOutError),
852+
new InMemoryMessageChannel(new MessageByOrderQueue(), $"{adapter} In", SendOutError),
853853
new InMemoryMessageChannel(new MessageByOrderQueue(), $"{adapter} Out", SendOutError)));
854854
}
855855

@@ -1058,7 +1058,7 @@ private bool InternalSendInMessage(Message message)
10581058
else
10591059
{
10601060
ProcessAdapterMessage(adapter, message);
1061-
return true;
1061+
return true;
10621062
}
10631063
}
10641064

@@ -1084,10 +1084,10 @@ private bool InternalSendInMessage(Message message)
10841084
adapter = CreateWrappers(adapter);
10851085

10861086
adapter.NewOutMessage += m => OnInnerAdapterNewOutMessage(adapter, m);
1087-
1087+
10881088
return adapter;
10891089
}));
1090-
1090+
10911091
if (Wrappers.Length == 0)
10921092
throw new InvalidOperationException(LocalizedStrings.Str3650);
10931093

@@ -1207,7 +1207,7 @@ private void ProcessAdapterMessage(IMessageAdapter adapter, Message message)
12071207

12081208
if (message is ISubscriptionMessage subscrMsg)
12091209
{
1210-
_subscription.TryAdd(subscrMsg.TransactionId, Tuple.Create(subscrMsg.TypedClone(), new[] { adapter }, subscrMsg.DataType));
1210+
_subscription.TryAdd2(subscrMsg.TransactionId, Tuple.Create(subscrMsg.TypedClone(), new[] { adapter }, subscrMsg.DataType));
12111211
SendRequest(subscrMsg.TypedClone(), adapter);
12121212
}
12131213
else
@@ -1239,7 +1239,7 @@ private void ProcessOtherMessage(Message message)
12391239
return;
12401240
}
12411241

1242-
_subscription.TryAdd(subscrMsg.TransactionId, Tuple.Create(subscrMsg.TypedClone(), adapters, subscrMsg.DataType));
1242+
_subscription.TryAdd2(subscrMsg.TransactionId, Tuple.Create(subscrMsg.TypedClone(), adapters, subscrMsg.DataType));
12431243
}
12441244
else
12451245
adapters = null;
@@ -1473,7 +1473,7 @@ private IDictionary<ISubscriptionMessage, IMessageAdapter> ToChild(ISubscription
14731473
private void SendRequest(ISubscriptionMessage subscrMsg, IMessageAdapter adapter)
14741474
{
14751475
// if the message was looped back via IsBack=true
1476-
_requestsById.TryAdd(subscrMsg.TransactionId, Tuple.Create(subscrMsg, GetUnderlyingAdapter(adapter)));
1476+
_requestsById.TryAdd2(subscrMsg.TransactionId, Tuple.Create(subscrMsg, GetUnderlyingAdapter(adapter)));
14771477
this.AddInfoLog("Send to {0}: {1}", adapter, subscrMsg);
14781478
adapter.SendInMessage((Message)subscrMsg);
14791479
}
@@ -1508,9 +1508,9 @@ IMessageAdapter[] GetAdapters()
15081508
if (adapters == null)
15091509
return;
15101510

1511-
_subscription.TryAdd(mdMsg.TransactionId, Tuple.Create((ISubscriptionMessage)mdMsg.Clone(), adapters, mdMsg.DataType2));
1511+
_subscription.TryAdd2(mdMsg.TransactionId, Tuple.Create((ISubscriptionMessage)mdMsg.Clone(), adapters, mdMsg.DataType2));
15121512
}
1513-
1513+
15141514
foreach (var pair in ToChild(mdMsg, adapters))
15151515
SendRequest(pair.Key, pair.Value);
15161516
}
@@ -1526,7 +1526,7 @@ IMessageAdapter[] GetAdapters()
15261526
return;
15271527

15281528
mdMsg = mdMsg.TypedClone();
1529-
_subscription.TryAdd(mdMsg.TransactionId, Tuple.Create((ISubscriptionMessage)mdMsg.Clone(), new[] { adapter }, mdMsg.DataType2));
1529+
_subscription.TryAdd2(mdMsg.TransactionId, Tuple.Create((ISubscriptionMessage)mdMsg.Clone(), new[] { adapter }, mdMsg.DataType2));
15301530
}
15311531
else
15321532
{
@@ -1580,8 +1580,8 @@ private void ProcessPortfolioMessage(string portfolioName, OrderMessage message)
15801580
}
15811581

15821582
if (message is OrderRegisterMessage regMsg)
1583-
_orderAdapters.TryAdd(regMsg.TransactionId, adapter);
1584-
1583+
_orderAdapters.TryAdd2(regMsg.TransactionId, adapter);
1584+
15851585
adapter.SendInMessage(message);
15861586
}
15871587

@@ -1613,12 +1613,12 @@ private void ProcessOrderMessage(long transId, long originId, Message message)
16131613
{
16141614
if (message is OrderReplaceMessage replace)
16151615
{
1616-
_orderAdapters.TryAdd(replace.TransactionId, adapter);
1616+
_orderAdapters.TryAdd2(replace.TransactionId, adapter);
16171617
}
16181618
else if (message is OrderPairReplaceMessage pairReplace)
16191619
{
1620-
_orderAdapters.TryAdd(pairReplace.Message1.TransactionId, adapter);
1621-
_orderAdapters.TryAdd(pairReplace.Message2.TransactionId, adapter);
1620+
_orderAdapters.TryAdd2(pairReplace.Message1.TransactionId, adapter);
1621+
_orderAdapters.TryAdd2(pairReplace.Message2.TransactionId, adapter);
16221622
}
16231623
}
16241624

@@ -1642,7 +1642,7 @@ private void ProcessPortfolioMessage(PortfolioMessage message)
16421642
}
16431643
else
16441644
{
1645-
_portfolioAdapters.TryAdd(message.PortfolioName, GetUnderlyingAdapter(adapter));
1645+
_portfolioAdapters.TryAdd2(message.PortfolioName, GetUnderlyingAdapter(adapter));
16461646
SendRequest(message.TypedClone(), adapter);
16471647
}
16481648
}
@@ -1694,7 +1694,7 @@ private IMessageAdapter GetAdapter(string portfolioName, Message message, out bo
16941694

16951695
if (a == null)
16961696
throw new InvalidOperationException(LocalizedStrings.ConnectionIsNotConnected.Put(adapter));
1697-
1697+
16981698
return a;
16991699
}
17001700
}
@@ -1771,7 +1771,7 @@ protected virtual void OnInnerAdapterNewOutMessage(IMessageAdapter innerAdapter,
17711771
if (execMsg.TransactionId != default)
17721772
{
17731773
if (execMsg.HasOrderInfo)
1774-
_orderAdapters.TryAdd(execMsg.TransactionId, innerAdapter);
1774+
_orderAdapters.TryAdd2(execMsg.TransactionId, innerAdapter);
17751775
}
17761776

17771777
break;
@@ -1793,7 +1793,7 @@ protected virtual void OnInnerAdapterNewOutMessage(IMessageAdapter innerAdapter,
17931793
if (extra != null)
17941794
{
17951795
foreach (var m in extra)
1796-
SendOutMessage(m);
1796+
SendOutMessage(m);
17971797
}
17981798
}
17991799

@@ -2085,7 +2085,7 @@ private Message ProcessSubscriptionResponse(IMessageAdapter adapter, Subscriptio
20852085

20862086
return (Message)subscrMsg;
20872087
}
2088-
2088+
20892089
return message;
20902090
}
20912091

‎Algo/CollectionSecurityProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ event Action ISecurityProvider.Cleared
6969
/// <param name="security">Security.</param>
7070
public void Add(Security security)
7171
{
72-
if (_inner.TryAdd(security.ToSecurityId(), security))
72+
if (_inner.TryAdd2(security.ToSecurityId(), security))
7373
_added?.Invoke(new[] { security });
7474
}
7575

@@ -100,7 +100,7 @@ public void AddRange(IEnumerable<Security> securities)
100100

101101
foreach (var security in securities)
102102
{
103-
if (!_inner.TryAdd(security.ToSecurityId(), security))
103+
if (!_inner.TryAdd2(security.ToSecurityId(), security))
104104
added.Remove(security);
105105
}
106106

‎Algo/EntityCache.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public IEnumerable<OrderChangeInfo> ApplyChanges(ExecutionMessage message, Order
135135
if (order.Time == DateTimeOffset.MinValue)
136136
order.Time = message.ServerTime;
137137

138-
// для новых заявок используем серверное время,
138+
// для новых заявок используем серверное время,
139139
// т.к. заявка получена первый раз и не менялась
140140
// ServerTime для заявки - это время регистрации
141141
order.LastChangeTime = _raiseNewOrder ? message.ServerTime : message.LocalTime;
@@ -338,7 +338,7 @@ private void AddOrder(Order order)
338338
private readonly HashSet<long> _massCancelationTransactions = new HashSet<long>();
339339

340340
public IEntityFactory EntityFactory { get; }
341-
341+
342342
public IExchangeInfoProvider ExchangeInfoProvider { get; }
343343

344344
private readonly CachedSynchronizedDictionary<Order, IMessageAdapter> _orders = new CachedSynchronizedDictionary<Order, IMessageAdapter>();
@@ -452,7 +452,7 @@ public void AddOrderByEditionId(Order order, long transactionId)
452452

453453
public void AddOrderFailById(OrderFail fail, OrderOperations operation, long transactionId)
454454
{
455-
_allOrdersByFailedId.TryAdd(Tuple.Create(transactionId, operation), fail);
455+
_allOrdersByFailedId.TryAdd2(Tuple.Create(transactionId, operation), fail);
456456
}
457457

458458
private void AddOrderByTransactionId(Order order, long transactionId, OrderOperations operation)
@@ -565,7 +565,7 @@ public IEnumerable<OrderChangeInfo> ProcessOrderMessage(Order order, Security se
565565
if (registeredInfo == null)
566566
{
567567
_logReceiver.AddDebugLog("Сancel '{0}': {1}", cancellationOrder.TransactionId, message);
568-
568+
569569
foreach (var i in cancelledInfo.ApplyChanges(message, OrderOperations.Cancel, o => UpdateOrderIds(o, securityData)))
570570
yield return i;
571571

@@ -577,9 +577,9 @@ public IEnumerable<OrderChangeInfo> ProcessOrderMessage(Order order, Security se
577577
if ((newOrderState == OrderStates.Active || newOrderState == OrderStates.Done) && cancellationOrder.State != OrderStates.Done)
578578
{
579579
_logReceiver.AddDebugLog("Replace-cancel '{0}': {1}", cancellationOrder.TransactionId, message);
580-
580+
581581
cancellationOrder.ApplyNewState(OrderStates.Done, _logReceiver);
582-
582+
583583
if (message.Latency != null)
584584
cancellationOrder.LatencyCancellation = message.Latency.Value;
585585

@@ -653,7 +653,7 @@ public IEnumerable<OrderChangeInfo> ProcessOrderMessage(Order order, Security se
653653

654654
o.Balance = message.Balance.Value;
655655
}
656-
656+
657657
o.Portfolio = getPortfolio(message.PortfolioName);
658658

659659
//if (o.ExtensionInfo == null)
@@ -1149,7 +1149,7 @@ private void RecycleOrders()
11491149
{
11501150
var toRemove = _orders.SyncGet(d =>
11511151
{
1152-
var tmp = d.Where(o => o.Key.State.IsFinal()).Take(countToRemove).Select(p => p.Key).ToHashSet();
1152+
var tmp = d.Where(o => o.Key.State.IsFinal()).Take(countToRemove).Select(p => p.Key).ToHashSet2();
11531153

11541154
foreach (var order in tmp)
11551155
d.Remove(order);

‎Algo/LookupTrackingMessageAdapter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private bool ProcessLookupMessage(ISubscriptionMessage message)
141141
var queue = _queue.SafeAdd(message.Type);
142142

143143
// not prev queued lookup
144-
if (queue.TryAdd(transId, message.TypedClone()))
144+
if (queue.TryAdd2(transId, message.TypedClone()))
145145
{
146146
if (queue.Count > 1)
147147
{
@@ -150,15 +150,15 @@ private bool ProcessLookupMessage(ISubscriptionMessage message)
150150
}
151151
}
152152
}
153-
153+
154154
if (!this.IsResultMessageSupported(message.Type) && TimeOut > TimeSpan.Zero)
155155
{
156156
_lookups.Add(transId, new LookupInfo(message.TypedClone(), TimeOut));
157157
isStarted = true;
158158
}
159159
}
160160
}
161-
161+
162162
return true;
163163
}
164164
finally
@@ -186,7 +186,7 @@ Message TryInitNextLookup(MessageTypes type, long removingId)
186186
_queue.Remove(type);
187187
return null;
188188
}
189-
189+
190190
return (Message)queue.First().Value;
191191
}
192192

@@ -224,7 +224,7 @@ originIdMsg is SubscriptionOnlineMessage ||
224224
else if (message is ISubscriptionIdMessage subscrMsg)
225225
{
226226
ignoreIds = subscrMsg.GetSubscriptionIds();
227-
227+
228228
lock (_lookups.SyncRoot)
229229
{
230230
foreach (var id in ignoreIds)
@@ -285,7 +285,7 @@ originIdMsg is SubscriptionOnlineMessage ||
285285
foreach (var lookup in nextLookups)
286286
{
287287
lookup.LoopBack(this);
288-
base.OnInnerAdapterNewOutMessage(lookup);
288+
base.OnInnerAdapterNewOutMessage(lookup);
289289
}
290290
}
291291

‎Algo/PnL/PnLManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public PnLInfo ProcessMessage(Message message, ICollection<PortfolioPnLManager>
129129
var manager = _managersByPf.SafeAdd(regMsg.PortfolioName, pf => new PortfolioPnLManager(pf));
130130
_managersByTransId.Add(regMsg.TransactionId, manager);
131131
}
132-
132+
133133
return null;
134134
}
135135

@@ -165,9 +165,9 @@ public PnLInfo ProcessMessage(Message message, ICollection<PortfolioPnLManager>
165165
return null;
166166

167167
if (execMsg.OrderId != null)
168-
_managersByOrderId.TryAdd(execMsg.OrderId.Value, manager);
168+
_managersByOrderId.TryAdd2(execMsg.OrderId.Value, manager);
169169
else if (!execMsg.OrderStringId.IsEmpty())
170-
_managersByOrderStringId.TryAdd(execMsg.OrderStringId, manager);
170+
_managersByOrderStringId.TryAdd2(execMsg.OrderStringId, manager);
171171
}
172172
}
173173

0 commit comments

Comments
 (0)