ogoun
/
Zero
mirror of https://github.com/ogoun/Zero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
pull/1/head
Ogoun 4 years ago
parent eff1deaaef
commit 4f77d66a06
7 changed files with 111 additions and 99 deletions
Show Stats Download Patch File Download Diff File

6
TestApp/Program.cs
Unescape View File

@ -1,12 +1,6 @@
using Newtonsoft.Json;
using System;
using System.IO;
using System.Text;
using ZeroLevel;
using ZeroLevel.Implementation.Semantic.Helpers;
using ZeroLevel.Logging;
using ZeroLevel.Services.Serialization;
using ZeroLevel.Services.Trees;
namespace TestApp
{

28
ZeroLevel/Services/Extensions/LinqExtension.cs
Unescape View File

@ -4,6 +4,34 @@ namespace System.Linq
{
public static class LinqExtension
{
public static IEnumerable<T[]> ZipLongest<T>(this IEnumerable<T> left, IEnumerable<T> right)
{
IEnumerator<T> leftEnumerator = left.GetEnumerator();
IEnumerator<T> rightEnumerator = right.GetEnumerator();
bool hasLeft = leftEnumerator.MoveNext();
bool hasRight = rightEnumerator.MoveNext();
while (hasLeft || hasRight)
{
if (hasLeft && hasRight)
{
yield return new T[] { leftEnumerator.Current, rightEnumerator.Current };
}
else if (hasLeft)
{
yield return new T[] { leftEnumerator.Current, default(T) };
}
else if (hasRight)
{
yield return new T[] { default(T), rightEnumerator.Current };
}
hasLeft = leftEnumerator.MoveNext();
hasRight = rightEnumerator.MoveNext();
}
}
public static IEnumerable<TSource> DistinctBy<TSource, TKey>
(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
{

2
ZeroLevel/Services/Network/Extensions/ExchangeExtension.cs
Unescape View File

@ -88,8 +88,6 @@ namespace ZeroLevel.Network
return response;
}
public static Tresponse Request<Tresponse>(this IClientSet exchange, string alias)
{
Tresponse response = default;

1
ZeroLevel/Services/Network/SocketClient.cs
Unescape View File

@ -23,6 +23,7 @@ namespace ZeroLevel.Network
public static IncomingFrame NewFrame() => new IncomingFrame();
}
private class SendFrame
{
private SendFrame() { }

1
ZeroLevel/Services/Network/Utils/NetworkPacketFactory.cs
Unescape View File

@ -60,7 +60,6 @@ namespace ZeroLevel.Network
packet[7] = id[2];
packet[8] = id[3];
packet[9] = (byte)(MAGIC ^ packet[1] ^ packet[2] ^ packet[3] ^ packet[4]);
HashData(data, packet[9]);

107
ZeroLevel/Services/Network/Utils/RequestBuffer.cs
Unescape View File

@ -1,51 +1,27 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using ZeroLevel.Services.Pools;
namespace ZeroLevel.Network
{
internal sealed class RequestBuffer
{
private SpinLock _reqeust_lock = new SpinLock();
private Dictionary<long, RequestInfo> _requests = new Dictionary<long, RequestInfo>();
private ConcurrentDictionary<long, RequestInfo> _requests = new ConcurrentDictionary<long, RequestInfo>();
private static ObjectPool<RequestInfo> _ri_pool = new ObjectPool<RequestInfo>(() => new RequestInfo());
public void RegisterForFrame(int identity, Action<byte[]> callback, Action<string> fail = null)
{
var ri = _ri_pool.Allocate();
bool take = false;
try
{
_reqeust_lock.Enter(ref take);
ri.Reset(callback, fail);
_requests.Add(identity, ri);
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
ri.Reset(callback, fail);
_requests[identity] = ri;
}
public void Fail(long frameId, string message)
{
RequestInfo ri = null;
bool take = false;
try
{
_reqeust_lock.Enter(ref take);
if (_requests.ContainsKey(frameId))
{
ri = _requests[frameId];
_requests.Remove(frameId);
}
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
if (ri != null)
RequestInfo ri;
if (_requests.TryRemove(frameId, out ri))
{
ri.Fail(message);
_ri_pool.Free(ri);
@ -54,22 +30,8 @@ namespace ZeroLevel.Network
public void Success(long frameId, byte[] data)
{
RequestInfo ri = null;
bool take = false;
try
{
_reqeust_lock.Enter(ref take);
if (_requests.ContainsKey(frameId))
{
ri = _requests[frameId];
_requests.Remove(frameId);
}
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
if (ri != null)
RequestInfo ri;
if (_requests.TryRemove(frameId, out ri))
{
ri.Success(data);
_ri_pool.Free(ri);
@ -78,21 +40,8 @@ namespace ZeroLevel.Network
public void StartSend(long frameId)
{
RequestInfo ri = null;
bool take = false;
try
{
_reqeust_lock.Enter(ref take);
if (_requests.ContainsKey(frameId))
{
ri = _requests[frameId];
}
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
if (ri != null)
RequestInfo ri;
if (_requests.TryGetValue(frameId, out ri))
{
ri.StartSend();
}
@ -100,47 +49,27 @@ namespace ZeroLevel.Network
public void Timeout(List<long> frameIds)
{
bool take = false;
try
RequestInfo ri;
for (int i = 0; i < frameIds.Count; i++)
{
_reqeust_lock.Enter(ref take);
for (int i = 0; i < frameIds.Count; i++)
if (_requests.TryRemove(frameIds[i], out ri))
{
if (_requests.ContainsKey(frameIds[i]))
{
_ri_pool.Free(_requests[frameIds[i]]);
_requests.Remove(frameIds[i]);
}
_ri_pool.Free(ri);
}
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
}
public void TestForTimeouts()
{
var now_ticks = DateTime.UtcNow.Ticks;
var to_remove = new List<long>();
KeyValuePair<long, RequestInfo>[] to_proceed;
bool take = false;
try
{
_reqeust_lock.Enter(ref take);
to_proceed = _requests.Select(x => x).ToArray();
}
finally
{
if (take) _reqeust_lock.Exit(false);
}
for (int i = 0; i < to_proceed.Length; i++)
foreach (var pair in _requests)
{
if (to_proceed[i].Value.Sended == false) continue;
var diff = now_ticks - to_proceed[i].Value.Timestamp;
if (pair.Value.Sended == false) continue;
var diff = now_ticks - pair.Value.Timestamp;
if (diff > BaseSocket.MAX_REQUEST_TIME_TICKS)
{
to_remove.Add(to_proceed[i].Key);
to_remove.Add(pair.Key);
}
}
Timeout(to_remove);

65
ZeroLevel/Services/Trees/DSA.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using ZeroLevel.Services.Serialization;
@ -77,6 +78,48 @@ namespace ZeroLevel.Services.Trees
this._is_teminate = reader.ReadBoolean();
this._transtions = reader.ReadDictionary<char, State>();
}
public void Reverse(State head)
{
var path = new Stack<Tuple<char, bool>>();
foreach (var s in _transtions)
{
s.Value.Forward(head, s.Key, path);
}
}
private void Forward(State head, char ch, Stack<Tuple<char, bool>> path)
{
path.Push(Tuple.Create(ch, _is_teminate));
if (_is_teminate)
{
Backward(head, path);
}
foreach (var s in _transtions)
{
s.Value.Forward(head, s.Key, path);
}
path.Pop();
}
private void Backward(State head, Stack<Tuple<char, bool>> path)
{
State current = head;
foreach (var pair in path)
{
if (false == current._transtions.ContainsKey(pair.Item1))
{
var next = new State();
current._transtions.Add(pair.Item1, next);
current = next;
}
else
{
current = current._transtions[pair.Item1];
}
}
current._is_teminate = true;
}
}
public class DSA
@ -124,5 +167,25 @@ namespace ZeroLevel.Services.Trees
{
return _initialState.Iterator(new StringBuilder());
}
public void Reverse()
{
var reverse_initial = new State();
_initialState.Reverse(reverse_initial);
_initialState = reverse_initial;
}
public void Optimize()
{
// merge
// reverse
// merge
// reverse
/*var reverse_initial = new State();
_initialState.Reverse(reverse_initial);
_initialState = new State();
reverse_initial.Reverse(_initialState);*/
}
}
}

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.