Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-29 01:07:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #715 from InvictusMB/cpu-load

Browse Source 
Fix high CPU load #708
This commit is contained in:
Charlie Kindel
2020-06-23 06:55:57 -07:00
committed by GitHub
parent d9856d6291 129f6403d8
commit bb3530348e
3 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Terminal.Gui/ConsoleDrivers/CursesDriver/UnixMainLoop.cs
View File

@@ -168,45 +168,38 @@ namespace Terminal.Gui {
bool IMainLoopDriver.EventsPending (bool wait)
{
int pollTimeout = 0;
int n;
if (CkeckTimeout (wait, ref pollTimeout))
if (CheckTimers (wait, out var pollTimeout)) {
return true;
}
UpdatePollMap ();
while (true) {
n = poll (pollmap, (uint)pollmap.Length, 0);
if (pollmap != null) {
break;
}
if (mainLoop.idleHandlers.Count > 0 || CkeckTimeout (wait, ref pollTimeout)) {
return true;
}
}
int ic;
lock (mainLoop.idleHandlers)
ic = mainLoop.idleHandlers.Count;
return n > 0 || mainLoop.timeouts.Count > 0 && ((mainLoop.timeouts.Keys [0] - DateTime.UtcNow.Ticks) < 0) || ic > 0;
var n = poll (pollmap, (uint)pollmap.Length, pollTimeout);
return n > 0 || CheckTimers (wait, out pollTimeout);
}
bool CkeckTimeout (bool wait, ref int pollTimeout)
bool CheckTimers (bool wait, out int pollTimeout)
{
long now = DateTime.UtcNow.Ticks;
if (mainLoop.timeouts.Count > 0) {
pollTimeout = (int)((mainLoop.timeouts.Keys [0] - now) / TimeSpan.TicksPerMillisecond);
if (pollTimeout < 0)
if (pollTimeout < 0) {
return true;
}
} else
pollTimeout = -1;
if (!wait)
pollTimeout = 0;
return false;
int ic;
lock (mainLoop.idleHandlers) {
ic = mainLoop.idleHandlers.Count;
}
return ic > 0;
}
void IMainLoopDriver.MainIteration ()

30
Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
View File

@@ -615,24 +615,16 @@ namespace Terminal.Gui {
bool IMainLoopDriver.EventsPending (bool wait)
{
int waitTimeout = 0;
if (CkeckTimeout (wait, ref waitTimeout))
if (CheckTimers (wait, out var waitTimeout)) {
return true;
}
result = null;
waitForProbe.Set ();
try {
while (result == null) {
if (!tokenSource.IsCancellationRequested)
eventReady.Wait (0, tokenSource.Token);
if (result != null) {
break;
}
if (mainLoop.idleHandlers.Count > 0 || CkeckTimeout (wait, ref waitTimeout)) {
return true;
}
if (!tokenSource.IsCancellationRequested) {
eventReady.Wait (waitTimeout, tokenSource.Token);
}
} catch (OperationCanceledException) {
return true;
@@ -640,15 +632,16 @@ namespace Terminal.Gui {
eventReady.Reset ();
}
if (!tokenSource.IsCancellationRequested)
return result != null;
if (!tokenSource.IsCancellationRequested) {
return result != null || CheckTimers (wait, out waitTimeout);
}
tokenSource.Dispose ();
tokenSource = new CancellationTokenSource ();
return true;
}
bool CkeckTimeout (bool wait, ref int waitTimeout)
bool CheckTimers (bool wait, out int waitTimeout)
{
long now = DateTime.UtcNow.Ticks;
@@ -663,7 +656,12 @@ namespace Terminal.Gui {
if (!wait)
waitTimeout = 0;
return false;
int ic;
lock (mainLoop.idleHandlers) {
ic = mainLoop.idleHandlers.Count;
}
return ic > 0;
}
Action<KeyEvent> keyHandler;

4
Terminal.Gui/Core/MainLoop.cs
View File

@@ -95,9 +95,11 @@ namespace Terminal.Gui {
/// <param name="idleHandler">Token that can be used to remove the idle handler with <see cref="RemoveIdle(Func{bool})"/> .</param>
public Func<bool> AddIdle (Func<bool> idleHandler)
{
lock (idleHandlers)
lock (idleHandlers) {
idleHandlers.Add (idleHandler);
}
Driver.Wakeup ();
return idleHandler;
}