mirror of
https://github.com/RaidMax/IW4M-Admin.git
synced 2025-06-10 07:13:58 -05:00
fixed broken broadcast events
events don't get out of order when a invalid event line throws exception handle the stats history update with no change throwing DBConcurrencyException
This commit is contained in:
@ -15,14 +15,11 @@ namespace IW4MAdmin.Application
|
||||
private readonly IManager Manager;
|
||||
static long NextEventId = 1;
|
||||
private readonly SortedList<long, GameEvent> OutOfOrderEvents;
|
||||
private readonly SemaphoreSlim ProcessingEvent;
|
||||
|
||||
public GameEventHandler(IManager mgr)
|
||||
{
|
||||
Manager = mgr;
|
||||
OutOfOrderEvents = new SortedList<long, GameEvent>();
|
||||
ProcessingEvent = new SemaphoreSlim(0);
|
||||
ProcessingEvent.Release();
|
||||
}
|
||||
|
||||
public bool AddEvent(GameEvent gameEvent)
|
||||
@ -30,13 +27,23 @@ namespace IW4MAdmin.Application
|
||||
#if DEBUG
|
||||
Manager.GetLogger().WriteDebug($"Got new event of type {gameEvent.Type} for {gameEvent.Owner} with id {gameEvent.Id}");
|
||||
#endif
|
||||
while (OutOfOrderEvents.Values.FirstOrDefault()?.Id == Interlocked.Read(ref NextEventId))
|
||||
GameEvent sortedEvent = null;
|
||||
lock (OutOfOrderEvents)
|
||||
{
|
||||
sortedEvent = OutOfOrderEvents.Values.FirstOrDefault();
|
||||
}
|
||||
|
||||
while (sortedEvent?.Id == Interlocked.Read(ref NextEventId))
|
||||
{
|
||||
lock (OutOfOrderEvents)
|
||||
{
|
||||
var fixedEvent = OutOfOrderEvents.Values[0];
|
||||
OutOfOrderEvents.RemoveAt(0);
|
||||
AddEvent(fixedEvent);
|
||||
}
|
||||
AddEvent(sortedEvent);
|
||||
|
||||
lock (OutOfOrderEvents)
|
||||
{
|
||||
sortedEvent = OutOfOrderEvents.Values.FirstOrDefault();
|
||||
}
|
||||
}
|
||||
|
||||
@ -44,9 +51,10 @@ namespace IW4MAdmin.Application
|
||||
// event occurs
|
||||
if (gameEvent.Id == Interlocked.Read(ref NextEventId))
|
||||
{
|
||||
Manager.GetLogger().WriteDebug($"Starting to wait for event with id {gameEvent.Id}");
|
||||
#if DEBUG == true
|
||||
Manager.GetLogger().WriteDebug($"sent event with id {gameEvent.Id} to be processed");
|
||||
#endif
|
||||
((Manager as ApplicationManager).OnServerEvent)(this, new GameEventArgs(null, false, gameEvent));
|
||||
Manager.GetLogger().WriteDebug($"Finished waiting for event with id {gameEvent.Id}");
|
||||
Interlocked.Increment(ref NextEventId);
|
||||
}
|
||||
|
||||
@ -54,8 +62,10 @@ namespace IW4MAdmin.Application
|
||||
// so me must wait until the next expected one arrives
|
||||
else
|
||||
{
|
||||
#if DEBUG == true
|
||||
Manager.GetLogger().WriteWarning("Incoming event is out of order");
|
||||
Manager.GetLogger().WriteDebug($"Expected event Id is {Interlocked.Read(ref NextEventId)}, but got {gameEvent.Id} instead");
|
||||
#endif
|
||||
|
||||
// this prevents multiple threads from adding simultaneously
|
||||
lock (OutOfOrderEvents)
|
||||
|
Reference in New Issue
Block a user