Skip to content

Improve a progress pane performance (one thread) #2822

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
daxian-dbw merged 5 commits into from
Mar 17, 2017
Merged

Improve a progress pane performance (one thread) #2822

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1136635
Improve a progress pane performance (one thread)
iSazonov Dec 1, 2016
0a494c1
Return the lock to ConsoleHostUserInterface.cs
iSazonov Mar 13, 2017
1b6d784
Remove redundent
iSazonov Mar 17, 2017
144b28e
Move to Interlocked.CompareExchange
iSazonov Mar 17, 2017
51c8ade
Correct comments, timer, initializations and lock
iSazonov Mar 17, 2017
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
Prev Previous commit
Correct comments, timer, initializations and lock
  • Loading branch information
@iSazonov
iSazonov committed Mar 17, 2017
commit 51c8adeba0c30b8763d2728f38abc19de87f852f
49 changes: 25 additions & 24 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 @@ -29,26 +29,30 @@ 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)
// If we have multiple runspaces on the host then any finished pipeline in any runspace will lead to call 'ResetProgress'
// so we need the lock
lock (_instanceLock)
{
// Stop update a progress pane and destroy timer
_progPaneUpdateTimer.Dispose();
_progPaneUpdateTimer = null;
}
// We don't reset 'progPaneUpdateFlag = false' here
// because `HandleIncomingProgressRecord` will be init 'progPaneUpdateFlag' in any way.
// (Also the timer callback can still set it to 'true' accidentally)

if (_progPaneUpdateTimer != null)
{
// Stop update a progress pane and destroy timer
_progPaneUpdateTimer.Dispose();
_progPaneUpdateTimer = null;
}
// We don't set 'progPaneUpdateFlag = 0' here, because:
// 1. According to MSDN, the timer callback can occur after the Dispose() method has been called.
// So we cannot guarantee the flag is truly set to 0.
// 2. When creating a new timer in 'HandleIncomingProgressRecord', we will set the flag to 1 anyway

if (_progPane != null)
{
Dbg.Assert(_pendingProgress != null, "How can you have a progress pane and no backing data structure?");
if (_progPane != null)
{
Dbg.Assert(_pendingProgress != null, "How can you have a progress pane and no backing data structure?");

// lock (_instanceLock) is not needed here because lock is done at global level
_progPane.Hide();
_progPane = null;
_progPane.Hide();
_progPane = null;
}
_pendingProgress = null;
}
_pendingProgress = null;
}


Expand Down Expand Up @@ -89,9 +93,8 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
// Show a progress pane at the first time we've received a progress record
progPaneUpdateFlag = 1;

// Invoke the timer only once to exclude overlaps
// The timer will be restarted in 'ProgressPaneUpdateTimerElapsed'
_progPaneUpdateTimer = new Timer( new TimerCallback(ProgressPaneUpdateTimerElapsed), null, UpdateTimerThreshold, Timeout.Infinite);
// The timer will be auto restarted every 'UpdateTimerThreshold' ms
_progPaneUpdateTimer = new Timer( new TimerCallback(ProgressPaneUpdateTimerElapsed), null, UpdateTimerThreshold, UpdateTimerThreshold);
}
}

Expand All @@ -107,7 +110,7 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt

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

Expand All @@ -116,8 +119,6 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
ProgressPaneUpdateTimerElapsed(object sender)
{
Interlocked.CompareExchange(ref progPaneUpdateFlag, 1, 0);

_progPaneUpdateTimer?.Change(UpdateTimerThreshold, Timeout.Infinite);
}

private
Expand Down Expand Up @@ -214,9 +215,9 @@ class ConsoleHostUserInterface : System.Management.Automation.Host.PSHostUserInt
private ProgressPane _progPane = null;
private PendingProgress _pendingProgress = null;
// The timer set up 'progPaneUpdateFlag' every 'UpdateTimerThreshold' milliseconds to update 'ProgressPane'
private Timer _progPaneUpdateTimer;
private Timer _progPaneUpdateTimer = null;
private const int UpdateTimerThreshold = 200;
private int progPaneUpdateFlag;
private int progPaneUpdateFlag = 0;
}
} // namespace

Expand Down