Skip to content

T
Thick-Common
Commit 4e5817fa authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

添加 7E协议支持批量包发送，不等回复已经发送

parent 59014699
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 447 additions and 99 deletions
GeneralGommunication/Dev7E.cs
View file @ 4e5817fa
This diff is collapsed.
GeneralGommunication/GComm_SerialPort.cs
View file @ 4e5817fa
...@@ -190,7 +190,7 @@ namespace GeneralGommunication ...@@ -190,7 +190,7 @@ namespace GeneralGommunication
if (!IsRunning) if (!IsRunning)
return; return;
IsRunning = false; IsRunning = false;
IsConnected = false;
cancellation.Cancel(); cancellation.Cancel();
sp.Close(); sp.Close();
} }
......
GeneralGommunication/GComm_TcpClient.cs
View file @ 4e5817fa
...@@ -48,9 +48,9 @@ namespace GeneralGommunication ...@@ -48,9 +48,9 @@ namespace GeneralGommunication
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
Socket sock; Socket sock;
CancellationTokenSource cancellation; CancellationTokenSource cts_readTask;
CancellationTokenSource cancellation_waitforSend; CancellationTokenSource cts_waitForSend;
CancellationTokenSource cts_sendTask;
public GComm_TcpClient() public GComm_TcpClient()
{ {
...@@ -64,9 +64,9 @@ namespace GeneralGommunication ...@@ -64,9 +64,9 @@ namespace GeneralGommunication
if (IsRunning) if (IsRunning)
return; return;
IsRunning = true; IsRunning = true;
cancellation = new CancellationTokenSource(); cts_readTask = new CancellationTokenSource();
Task.Factory.StartNew(OnTask, cancellation.Token); Task.Factory.StartNew(OnTask, cts_readTask.Token);
} }
/// <summary> /// <summary>
...@@ -77,8 +77,8 @@ namespace GeneralGommunication ...@@ -77,8 +77,8 @@ namespace GeneralGommunication
if (!IsRunning) if (!IsRunning)
return; return;
IsRunning = false; IsRunning = false;
IsConnected = false;
cancellation.Cancel(); cts_readTask.Cancel();
if (sock != null && sock.Connected) if (sock != null && sock.Connected)
{ {
sock.Close(); sock.Close();
...@@ -88,7 +88,7 @@ namespace GeneralGommunication ...@@ -88,7 +88,7 @@ namespace GeneralGommunication
void OnTask() void OnTask()
{ {
while (!cancellation.IsCancellationRequested) while (!cts_readTask.IsCancellationRequested)
{ {
ConnectTask(); ConnectTask();
...@@ -96,17 +96,27 @@ namespace GeneralGommunication ...@@ -96,17 +96,27 @@ namespace GeneralGommunication
{ {
sendBuf.Clear(); sendBuf.Clear();
//启动发送task //启动发送task
Task.Factory.StartNew(SendTask, cancellation.Token); cts_sendTask = new CancellationTokenSource();
var sendtask = Task.Factory.StartNew(SendTask, cts_sendTask.Token);
//进入接收task //进入接收task
ReceiveTask(); ReceiveTask();
//退出了，肯定连接断开了 //退出了，肯定连接断开了
//需要等待 SendTask 也退出了
cts_sendTask.Cancel();
sendtask.Wait();
if (sock != null)
{
sock.Close();
}
} }
//休息一会儿，在重连 //休息一会儿，在重连
try try
{ {
Task.Delay(2000, cancellation.Token).Wait(); Task.Delay(2000, cts_readTask.Token).Wait();
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -126,14 +136,12 @@ namespace GeneralGommunication ...@@ -126,14 +136,12 @@ namespace GeneralGommunication
sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
sock.Blocking = true; sock.Blocking = true;
//1秒内，需要收到信息 //1秒内，需要收到信息
sock.ReceiveTimeout = 1000; sock.ReceiveTimeout = 1000;
//1秒内，必须发送完 //1秒内，必须发送完
sock.SendTimeout = 1000; sock.SendTimeout = 1000;
while (!cancellation.IsCancellationRequested) while (!cts_readTask.IsCancellationRequested)
{ {
try try
{ {
...@@ -150,7 +158,7 @@ namespace GeneralGommunication ...@@ -150,7 +158,7 @@ namespace GeneralGommunication
} }
try try
{ {
Task.Delay(2000, cancellation.Token).Wait(); Task.Delay(2000, cts_readTask.Token).Wait();
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -166,7 +174,7 @@ namespace GeneralGommunication ...@@ -166,7 +174,7 @@ namespace GeneralGommunication
void ReceiveTask() void ReceiveTask()
{ {
byte[] buf = new byte[0x10000]; byte[] buf = new byte[0x10000];
while (!cancellation.IsCancellationRequested) while (!cts_readTask.IsCancellationRequested)
{ {
int len; int len;
try try
...@@ -196,10 +204,7 @@ namespace GeneralGommunication ...@@ -196,10 +204,7 @@ namespace GeneralGommunication
DataReceived?.Invoke(this, buf.Take(len).ToArray()); DataReceived?.Invoke(this, buf.Take(len).ToArray());
} }
if (sock != null)
{
sock.Close();
}
IsConnected = false; IsConnected = false;
} }
...@@ -208,14 +213,24 @@ namespace GeneralGommunication ...@@ -208,14 +213,24 @@ namespace GeneralGommunication
/// </summary> /// </summary>
void SendTask() void SendTask()
{ {
while (!cancellation.IsCancellationRequested) while (!cts_sendTask.IsCancellationRequested)
{ {
while (sendBuf.Count > 0) CancellationTokenSource cts3;
while (true)
{ {
byte[] buffer;
lock (sendBuf)
{
if (sendBuf.Count <= 0)
break;
buffer = sendBuf.ToArray();
}
int slen; int slen;
try try
{ {
slen = sock.Send(sendBuf.ToArray()); slen = sock.Send(buffer);
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -223,26 +238,42 @@ namespace GeneralGommunication ...@@ -223,26 +238,42 @@ namespace GeneralGommunication
IsConnected = false; IsConnected = false;
break; break;
} }
if (slen > 0)
sendBuf.RemoveRange(0, slen); if (slen <= 0)
else if (slen <= 0)
{ {
//连接断开了 //连接断开了
IsConnected = false; IsConnected = false;
break; break;
} }
else
{
lock (sendBuf)
{
sendBuf.RemoveRange(0, slen);
}
}
} }
//重新等 下次被呼醒 //重新等 下次被呼醒
cancellation_waitforSend = new CancellationTokenSource(); lock (sendBuf)
{
// 呼醒 发送task
if (cts_waitForSend == null)
{
cts_waitForSend = new CancellationTokenSource();
}
//cts_waitForSend 与 cts_sendTask 合体, 任意一个都会呼醒 delay
cts3 = CancellationTokenSource.CreateLinkedTokenSource(cts_waitForSend.Token, cts_sendTask.Token);
}
try try
{ {
Task.Delay(-1, cancellation_waitforSend.Token).Wait(); Task.Delay(-1, cts3.Token).Wait();
} }
catch (Exception e) catch (Exception e)
{ {
//被打断， 有数据需要发送 //被打断， 有数据需要发送
} }
cts_waitForSend = null;
} }
} }
/// <summary> /// <summary>
...@@ -259,13 +290,19 @@ namespace GeneralGommunication ...@@ -259,13 +290,19 @@ namespace GeneralGommunication
if (!IsConnected) if (!IsConnected)
return; return;
lock (sendBuf)
{
//放入，发送缓存区
sendBuf.AddRange(buf);
//呼醒 发送task
//放入，发送缓存区 if (cts_waitForSend == null)
sendBuf.AddRange(buf); {
cts_waitForSend = new CancellationTokenSource();
//呼醒 发送task }
cancellation_waitforSend.Cancel(); cts_waitForSend.Cancel();
}
} }
/// <summary> /// <summary>
......
GeneralGommunication/IDev7E.cs
View file @ 4e5817fa
...@@ -9,7 +9,10 @@ namespace GeneralGommunication ...@@ -9,7 +9,10 @@ namespace GeneralGommunication
{ {
public interface IDev7E : INotifyPropertyChanged public interface IDev7E : INotifyPropertyChanged
{ {
#region 测量速度 #region 测量通讯速度
/// <summary>
/// 通讯速度 测量中
/// </summary>
bool IsMeasuring { get; } bool IsMeasuring { get; }
/// <summary> /// <summary>
...@@ -18,7 +21,7 @@ namespace GeneralGommunication ...@@ -18,7 +21,7 @@ namespace GeneralGommunication
double CommSpeed { get; } double CommSpeed { get; }
/// <summary> /// <summary>
/// 传输速度 单位 pack/s /// 通讯速度 单位 pack/s
/// </summary> /// </summary>
double PackSpeed { get; } double PackSpeed { get; }
...@@ -100,26 +103,31 @@ namespace GeneralGommunication ...@@ -100,26 +103,31 @@ namespace GeneralGommunication
/// </summary> /// </summary>
public class COMMREQ public class COMMREQ
{ {
private byte[] prefix;
/// <summary> /// <summary>
/// 指令 前缀 /// 指令 前缀
/// </summary> /// </summary>
public byte[] Prefix; public byte[] Prefix
public string PrefixString {
get { return prefix; }
set {
prefix = value;
updatePrefixString();
}
}
public string PrefixString { get; private set; }
void updatePrefixString()
{ {
get StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < Prefix.Count(); i++)
{ {
StringBuilder stringBuilder = new StringBuilder(); if (Prefix[i] >= 33 && Prefix[i] <= 126)
for (int i = 0; i < Prefix.Count(); i++) stringBuilder.Append((char)Prefix[i]);
{ else
if (Prefix[i] >= 33 || Prefix[i] <= 126) stringBuilder.Append($" 0x{Prefix[i]:X2} ");
stringBuilder.Append((char)Prefix[i]);
else
stringBuilder.Append($" 0x{Prefix[i]:X2} ");
}
return stringBuilder.ToString();
} }
PrefixString = stringBuilder.ToString();
} }
/// <summary> /// <summary>
/// 回复数据 长度, 不含前序 /// 回复数据 长度, 不含前序
/// </summary> /// </summary>
...@@ -133,9 +141,9 @@ namespace GeneralGommunication ...@@ -133,9 +141,9 @@ namespace GeneralGommunication
public delegate object ParseFuncPackHandler(byte[] pack, int dataIdx); public delegate object ParseFuncPackHandler(byte[] pack, int dataIdx);
public ParseFuncPackHandler ParseFuncPack; public ParseFuncPackHandler ParseFuncPack;
public delegate bool IsMatchHandler(COMMREQ commReq, byte[] pack, int dataIdx, object context, ref object retData);
public IsMatchHandler IsMatch;
public object IsMatchContext;
public static byte[] ToPrefix(params object[] commands) public static byte[] ToPrefix(params object[] commands)
{ {
List<byte> bytes = new List<byte>(); List<byte> bytes = new List<byte>();
...@@ -176,13 +184,9 @@ namespace GeneralGommunication ...@@ -176,13 +184,9 @@ namespace GeneralGommunication
} }
public class COMMREQ_Transaction
{
/// <summary>
/// 请求
/// </summary>
public COMMREQ commReq;
public abstract class COMMREQ_TransactionBase
{
/// <summary> /// <summary>
/// 回复 callback /// 回复 callback
/// </summary> /// </summary>
...@@ -192,6 +196,25 @@ namespace GeneralGommunication ...@@ -192,6 +196,25 @@ namespace GeneralGommunication
/// 上下文 /// 上下文
/// </summary> /// </summary>
public object asyncContext; public object asyncContext;
}
/// <summary>
/// 交易集合包
/// </summary>
public class COMMREQ_TransactionMulti : COMMREQ_TransactionBase
{
/// <summary>
/// 交易集合
/// </summary>
public List<COMMREQ_Transaction> transactions = new List<COMMREQ_Transaction>();
}
public class COMMREQ_Transaction: COMMREQ_TransactionBase
{
/// <summary>
/// 请求
/// </summary>
public COMMREQ commReq;
/// <summary> /// <summary>
/// 数据 /// 数据
...@@ -202,5 +225,15 @@ namespace GeneralGommunication ...@@ -202,5 +225,15 @@ namespace GeneralGommunication
/// 数据的object 表达，只用于调试而已 /// 数据的object 表达，只用于调试而已
/// </summary> /// </summary>
public object datasObj; public object datasObj;
/// <summary>
/// 数据已经回复
/// </summary>
public bool hasRet;
/// <summary>
/// 回复的数据，只用于调试而已
/// </summary>
public object retData;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment