提交 a2848781 编写于 作者: cdy816's avatar cdy816

冗余更新

上级 4699d7fa
......@@ -109,6 +109,7 @@ namespace SimDriver
/// <returns></returns>
public bool Start(IRealTagProduct tagQuery)
{
mIsClosed = false;
mTagService = tagQuery;
InitTagCach(tagQuery);
mScanThread = new Thread(ScanThreadPro);
......
......@@ -172,6 +172,12 @@ namespace Cdy.Tag
resetEvent.Dispose();
closedEvent.Dispose();
foreach(var vv in mTargetMemorys)
{
while (vv.Value.IsBusy())
vv.Value.DecRef();
}
}
/// <summary>
......
......@@ -805,18 +805,18 @@ namespace Cdy.Tag
}
}
/// <summary>
///
/// </summary>
/// <param name="memory"></param>
private void CheckMemoryIsReady(MarshalMemoryBlock memory)
{
while (memory.IsBusy())
{
LoggerService.Service.Info("Record", "记录出现阻塞 " + memory.Name);
System.Threading.Thread.Sleep(1);
}
}
///// <summary>
/////
///// </summary>
///// <param name="memory"></param>
//private void CheckMemoryIsReady(MarshalMemoryBlock memory)
//{
// while (memory.IsBusy())
// {
// LoggerService.Service.Info("Record", "记录出现阻塞 " + memory.Name);
// System.Threading.Thread.Sleep(1);
// }
//}
/// <summary>
///
......@@ -1152,6 +1152,10 @@ namespace Cdy.Tag
}
SubmitLastDataToSave();
if (LogManager != null) LogManager.Stop();
mLastProcessTick = -1;
mForceSubmiteToCompress = false;
mNeedSnapAllTag = false;
}
/// <summary>
......
......@@ -43,6 +43,8 @@ namespace DBRuntime
private Thread mScanThread;
private int mNoValueCount = 0;
#endregion ...Variables...
#region ... Events ...
......@@ -195,8 +197,8 @@ namespace DBRuntime
{
if (mClient.NeedReConnected)
{
//mClient.Connect(RemoteIp,Port);
//Thread.Sleep(1000);
mClient.Connect(RemoteIp, Port);
Thread.Sleep(1000);
}
else if(mClient.IsConnected)
{
......@@ -213,6 +215,7 @@ namespace DBRuntime
var state = mClient.GetWorkState();
if (state.HasValue)
{
mNoValueCount = 0;
if (state.Value == WorkState.Primary && this.CurrentState == WorkState.Primary)
{
var time = mClient.GetStartTime();
......@@ -232,6 +235,10 @@ namespace DBRuntime
}
}
}
else
{
mNoValueCount++;
}
}
catch
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册