TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from thoean/WaitUntilAllMesssagesAreProcessed

Browse Source 
UdpListener shutdown simplification
This commit is contained in:
Eric Fontana
2015-04-21 12:59:50 -04:00
parent dcd104e4f4 dcfdf73842
commit 1f3aaf90fd
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
TimberWinR/Inputs/UdpInputListener.cs
View File

@@ -15,7 +15,6 @@ namespace TimberWinR.Inputs
private IPEndPoint _udpEndpointV4;
private readonly BlockingCollection<byte[]> _unprocessedRawData;
private readonly Thread _rawDataProcessingThread;
public bool Stop { get; set; }
private readonly int _port;
private long _receivedMessages;
private long _parseErrors;
@@ -52,15 +51,11 @@ namespace TimberWinR.Inputs
public override void Shutdown()
{
Stop = true;
LogManager.GetCurrentClassLogger().Info("Shutting Down {0}", InputType);
// close UDP listeners, which will end the listener threads
_udpListenerV4.Close();
Finished();
base.Shutdown();
}
@@ -92,18 +87,22 @@ namespace TimberWinR.Inputs
return;
}
byte[] bytes;
try
{
bytes = _udpListenerV4.EndReceive(result, ref _udpEndpointV4);
byte[] bytes = _udpListenerV4.EndReceive(result, ref _udpEndpointV4);
Interlocked.Increment(ref _receivedMessages);
StartReceiving();
_unprocessedRawData.Add(bytes);
}
catch (SocketException)
{
LogManager.GetCurrentClassLogger().Info("Socked exception. Ending UDP Listener.");
_unprocessedRawData.CompleteAdding();
return;
}
catch (ObjectDisposedException)
{
LogManager.GetCurrentClassLogger().Info("Object disposed. Ending UDP Listener");
_unprocessedRawData.CompleteAdding();
}
catch (Exception ex)
{
@@ -111,16 +110,12 @@ namespace TimberWinR.Inputs
Interlocked.Increment(ref _receiveErrors);
StartReceiving();
return;
}
_unprocessedRawData.Add(bytes);
}
private void ProcessDataLoop()
{
while (!Stop && !_unprocessedRawData.IsCompleted)
while (!_unprocessedRawData.IsCompleted)
{
try
{
@@ -142,6 +137,8 @@ namespace TimberWinR.Inputs
Thread.Sleep(100);
}
}
Finished();
}
private void ProcessData(byte[] bytes)