Skip to content

Improve a progress pane performance #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzybkr merged 2 commits into from
Nov 8, 2016
Merged

Improve a progress pane performance #2640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d951d9d
Improve a progress pane performance
iSazonov Nov 7, 2016
09de2db
Update every 100ms instead of 200ms
lzybkr Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfaceProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System;
using System.Management.Automation;
using Dbg = System.Management.Automation.Diagnostics;
using System.Threading;


namespace Microsoft.PowerShell
Expand All @@ -28,6 +29,12 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
// destroy the data structures representing outstanding progress records
// take down and destroy the progress display

if (_progPaneUpdateTimer != null)
{
// Stop update 'ProgressPane' and destroy timer
_progPaneUpdateTimer.Dispose();
_progPaneUpdateTimer = null;
}
if (_progPane != null)
{
Dbg.Assert(_pendingProgress != null, "How can you have a progress pane and no backing data structure?");
Expand Down Expand Up @@ -64,16 +71,44 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt

if (_progPane == null)
{
// This is the first time we've received a progress record. Create a pane to show it, and
// then show it.
// This is the first time we've received a progress record.
// Create a progress pane,
// then show it,
// then create and start timer to update it.

_progPane = new ProgressPane(this);

if (_progPaneUpdateTimer == null && _progPane != null)
{
_progPane.Show(_pendingProgress);
_progPaneUpdateTimer = new Timer( new TimerCallback(ProgressPaneUpdateTimerElapsed), null, UpdateTimerThreshold, Timeout.Infinite);
}
}
_progPane.Show(_pendingProgress);
}



/// <summary>
///
/// TimerCallback for _progPaneUpdateTimer to update 'ProgressPane' and restart the timer.
///
/// </summary>

private
void
ProgressPaneUpdateTimerElapsed(object sender)
{
if (_progPane != null)
{
_progPane.Show(_pendingProgress);
}
if (_progPaneUpdateTimer != null)
{
_progPaneUpdateTimer.Change(UpdateTimerThreshold, Timeout.Infinite);
}
}



private
void
Expand Down Expand Up @@ -170,6 +205,9 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt

private ProgressPane _progPane = null;
private PendingProgress _pendingProgress = null;
// The timer update 'ProgressPane' every 'UpdateTimerThreshold' milliseconds
private Timer _progPaneUpdateTimer;
private const int UpdateTimerThreshold = 100;
}
} // namespace

Expand Down