Skip to content

Use AddOrUpdate() to register runspace #10007

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
Jul 3, 2019
Merged

Use AddOrUpdate() to register runspace #10007

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4911fb2
Use AddOrUpdate() to register runspace
iSazonov Jun 26, 2019
db3eb76
Revert "Use AddOrUpdate() to register runspace"
iSazonov Jun 27, 2019
b74573e
Replace Remove() and Add() with AddOrUpdate()
iSazonov Jun 27, 2019
d7c3055
Rename variables to fix CodeFactor issues
iSazonov Jun 27, 2019
e603560
Correct compare
iSazonov Jun 27, 2019
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
15 changes: 7 additions & 8 deletions src/System.Management.Automation/engine/runtime/Operations/ClassOps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,23 @@ internal SessionStateKeeper()

internal void RegisterRunspace()
{
SessionStateInternal ssInMap = null;
Runspace rsToUse = Runspace.DefaultRunspace;
SessionStateInternal ssToUse = rsToUse.ExecutionContext.EngineSessionState;
SessionStateInternal sessionStateInMap = null;
Runspace runspaceToUse = Runspace.DefaultRunspace;
SessionStateInternal sessionStateToUse = runspaceToUse.ExecutionContext.EngineSessionState;

// Different threads will operate on different key/value pairs (default-runspace/session-state pairs),
// and a ConditionalWeakTable itself is thread safe, so there won't be race condition here.
if (!_stateMap.TryGetValue(rsToUse, out ssInMap))
if (!_stateMap.TryGetValue(runspaceToUse, out sessionStateInMap))
{
// If the key doesn't exist yet, add it
_stateMap.Add(rsToUse, ssToUse);
_stateMap.Add(runspaceToUse, sessionStateToUse);
}
else if (!ssInMap.Equals(ssToUse))
else if (sessionStateInMap != sessionStateToUse)
{
// If the key exists but the corresponding value is not what we should use, then remove the key/value pair and add the new pair.
// This could happen when a powershell class is defined in a module and the module gets reloaded. In such case, the same TypeDefinitionAst
// instance will get reused, but should be associated with the SessionState from the new module, instead of the one from the old module.
_stateMap.Remove(rsToUse);
_stateMap.Add(rsToUse, ssToUse);
_stateMap.AddOrUpdate(runspaceToUse, sessionStateToUse);
}
// If the key exists and the corresponding value is the one we should use, then do nothing.
}
Expand Down