prevent penalties from being lost in edge case alias linkage

small optimization with tasks
This commit is contained in:
RaidMax 2019-09-26 16:08:49 -05:00
parent fe6fe39800
commit 1e9a87d6fa
6 changed files with 40 additions and 9 deletions

View File

@ -1,8 +1,6 @@
using SharedLibraryCore; using SharedLibraryCore;
using SharedLibraryCore.Events; using SharedLibraryCore.Events;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using System.Collections.Generic;
using System.Linq;
using System.Threading; using System.Threading;
namespace IW4MAdmin.Application namespace IW4MAdmin.Application
@ -17,6 +15,11 @@ namespace IW4MAdmin.Application
public void AddEvent(GameEvent gameEvent) public void AddEvent(GameEvent gameEvent)
{ {
#if DEBUG
ThreadPool.GetMaxThreads(out int workerThreads, out int n);
ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
gameEvent.Owner.Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
#endif
Manager.OnServerEvent?.Invoke(gameEvent.Owner, new GameEventArgs(null, false, gameEvent)); Manager.OnServerEvent?.Invoke(gameEvent.Owner, new GameEventArgs(null, false, gameEvent));
} }
} }

View File

@ -72,7 +72,6 @@ namespace IW4MAdmin.Application.IO
foreach (var ev in events) foreach (var ev in events)
{ {
_server.Manager.GetEventHandler().AddEvent(ev); _server.Manager.GetEventHandler().AddEvent(ev);
await ev.WaitAsync(Utilities.DefaultCommandTimeout, ev.Owner.Manager.CancellationToken);
} }
previousFileSize = fileSize; previousFileSize = fileSize;

View File

@ -641,8 +641,12 @@ namespace IW4MAdmin
// because we don't want to try to fill up a slot that's not empty yet // because we don't want to try to fill up a slot that's not empty yet
waiterList.Add(e); waiterList.Add(e);
} }
// wait for all the disconnect tasks to finish // wait for all the disconnect tasks to finish
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken))); foreach (var waiter in waiterList)
{
waiter.Wait();
}
waiterList.Clear(); waiterList.Clear();
// this are our new connecting clients // this are our new connecting clients
@ -666,7 +670,10 @@ namespace IW4MAdmin
} }
// wait for all the connect tasks to finish // wait for all the connect tasks to finish
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken))); foreach (var waiter in waiterList)
{
waiter.Wait();
}
waiterList.Clear(); waiterList.Clear();
// these are the clients that have updated // these are the clients that have updated
@ -683,7 +690,10 @@ namespace IW4MAdmin
waiterList.Add(e); waiterList.Add(e);
} }
await Task.WhenAll(waiterList.Select(e => e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken))); foreach (var waiter in waiterList)
{
waiter.Wait();
}
if (ConnectionErrors > 0) if (ConnectionErrors > 0)
{ {

View File

@ -54,9 +54,9 @@ namespace IW4MAdmin.Application
} }
} }
async Task Write(string msg, LogType type) void Write(string msg, LogType type)
{ {
await OnLogWriting.WaitAsync(); OnLogWriting.Wait();
string stringType = type.ToString(); string stringType = type.ToString();
@ -73,7 +73,7 @@ namespace IW4MAdmin.Application
#if DEBUG #if DEBUG
// lets keep it simple and dispose of everything quickly as logging wont be that much (relatively) // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
Console.WriteLine(LogLine); Console.WriteLine(LogLine);
await File.AppendAllTextAsync(FileName, $"{LogLine}{Environment.NewLine}"); File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
//Debug.WriteLine(msg); //Debug.WriteLine(msg);
#else #else
if (type == LogType.Error || type == LogType.Verbose) if (type == LogType.Error || type == LogType.Verbose)

View File

@ -229,5 +229,11 @@ namespace SharedLibraryCore
return this; return this;
}); });
} }
public GameEvent Wait()
{
OnProcessed.Wait();
return this;
}
} }
} }

View File

@ -144,6 +144,19 @@ namespace SharedLibraryCore.Services
.Where(_client => _client.AliasLinkId == oldAliasLink.AliasLinkId) .Where(_client => _client.AliasLinkId == oldAliasLink.AliasLinkId)
.ForEachAsync(_client => _client.AliasLinkId = newAliasLink.AliasLinkId); .ForEachAsync(_client => _client.AliasLinkId = newAliasLink.AliasLinkId);
// we also need to update all the penalties or they get deleted
// scenario
// link1 joins with ip1
// link2 joins with ip2,
// link2 receives penalty
// link2 joins with ip1
// pre existing link for link2 detected
// link2 is deleted
// link2 penalties are orphaned
await context.Penalties
.Where(_penalty => _penalty.LinkId == oldAliasLink.AliasLinkId)
.ForEachAsync(_penalty => _penalty.LinkId = newAliasLink.AliasLinkId);
entity.AliasLink = newAliasLink; entity.AliasLink = newAliasLink;
entity.AliasLinkId = newAliasLink.AliasLinkId; entity.AliasLinkId = newAliasLink.AliasLinkId;