warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Core cleanup, adds event loop synchronization, and fixes gumps (#429)

Browse source 
- [X] Cleans up gump packets
- [X] Adds event loop task synchronization
- [X] Moves timer pause and cleans up the delay task timer class
- [X] Cleans up the conserve cpu
- [X] Renames variables to make them consistent with the new style
- [X] Removes process delta recursion checking.
- [X] Properly diposes net states. This fixes edge cases that may cause hanging connections to stay open longer than they should.
- [X] Fixes an issue with gump items not compiling properly

Users can now utilize `Timer.Pause()` since the code will be executed on the proper thread.

```cs
public void async void Talk()
{
    _canTalk = false;
    await Timer.Pause(Utility.RandomMinMax(5000, 8000)); // Talk after 5-8 seconds
    DoTalk();
    await Timer.Pause(Utility.RandomMinMax(12000, 25000)); // Reset ability to talk after 12-25 seconds
    _canTalk = true;
}
```
This commit is contained in:
Kamron Batman 2021-01-25 21:06:46 -08:00 • committed by GitHub
parent 07751654b7
commit 6f0e1a22f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 763 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Server/Timer/TimerDelayCalls.cs → Projects/Server/Timer/Timer.DelayCall.cs
View file

@ -1,8 +1,8 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Copyright (C) 2019-2021 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: TimerDelayCalls.cs *
* File: Timer.DelayCall.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *

53
Projects/Server/Timer/Timer.Pause.cs Normal file
View file

@ -0,0 +1,53 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: Timer.Pause.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Runtime.CompilerServices;
namespace Server
{
public partial class Timer
{
public class DelayTaskTimer : Timer, INotifyCompletion
{
private Action _continuation;
private bool _complete;
internal DelayTaskTimer(TimeSpan delay) : base(delay) => Start();
protected override void OnTick()
{
_complete = true;
_continuation?.Invoke();
}
public DelayTaskTimer GetAwaiter() => this;
public bool IsCompleted => _complete;
public void OnCompleted(Action continuation) => _continuation = continuation;
public void GetResult()
{
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static DelayTaskTimer Pause(TimeSpan ms) => new(ms);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static DelayTaskTimer Pause(int ms) => Pause(TimeSpan.FromMilliseconds(ms));
}
}

49
Projects/Server/Timer/Timer.cs
View file

@ -1,3 +1,18 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2021 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: Timer.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Collections.Generic;
using System.IO;
@ -136,14 +151,14 @@ namespace Server
return TimerProfile.Acquire(name);
}
public static void Slice()
public static int Slice()
{
var index = 0;
lock (m_Queue)
{
m_QueueCountAtSlice = m_Queue.Count;
var index = 0;
while (index < BreakCount && m_Queue.Count != 0)
{
var t = m_Queue.Dequeue();
@ -153,11 +168,13 @@ namespace Server
t.OnTick();
t.m_Queued = false;
++index;
index++;
prof?.Finish();
}
}
return index;
}
public void RegCreation()
@ -243,15 +260,6 @@ namespace Server
{
}
public static Task Pause(int ms) => Pause(TimeSpan.FromMilliseconds(ms));
public static Task Pause(TimeSpan ms)
{
var t = new DelayTaskTimer(ms);
t.Start();
return t.Task;
}
public class TimerThread
{
private static readonly Dictionary<Timer, TimerChangeEntry>
@ -495,20 +503,5 @@ namespace Server
}
}
}
private class DelayTaskTimer : Timer
{
private readonly TaskCompletionSource<DelayTaskTimer> m_TaskCompleter;
public DelayTaskTimer(TimeSpan delay) : base(delay) =>
m_TaskCompleter = new TaskCompletionSource<DelayTaskTimer>();
public Task Task => m_TaskCompleter.Task;
protected override void OnTick()
{
m_TaskCompleter.SetResult(this);
}
}
}
}