Skip to content

Clean up #if SILVERLIGHT #6907

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
iSazonov merged 2 commits into from
May 22, 2018
Merged

Clean up #if SILVERLIGHT #6907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bcd559
Clean up #if SILVERLIGHT
iSazonov May 17, 2018
50443a1
[Feature] Run full test site
iSazonov May 21, 2018
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
29 changes: 2 additions & 27 deletions src/System.Management.Automation/engine/interpreter/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,31 +754,6 @@ public T Update(T newValue)

#region Storage implementation

#if SILVERLIGHT
private static int _cfThreadIdDispenser = 1;

[ThreadStatic]
private static int _cfThreadId;

private static int GetCurrentThreadId() {
if (PlatformAdaptationLayer.IsCompactFramework) {
// CF doesn't index threads by small integers, so we need to do the indexing ourselves:
int id = _cfThreadId;
if (id == 0) {
_cfThreadId = id = Interlocked.Increment(ref _cfThreadIdDispenser);
}
return id;
} else {
return Thread.CurrentThread.ManagedThreadId;
}
}
#else
private static int GetCurrentThreadId()
{
return Thread.CurrentThread.ManagedThreadId;
}
#endif

/// <summary>
/// Gets the StorageInfo for the current thread.
/// </summary>
Expand All @@ -789,7 +764,7 @@ public StorageInfo GetStorageInfo()

private StorageInfo GetStorageInfo(StorageInfo[] curStorage)
{
int threadId = GetCurrentThreadId();
int threadId = Thread.CurrentThread.ManagedThreadId;

// fast path if we already have a value in the array
if (curStorage != null && curStorage.Length > threadId)
Expand Down Expand Up @@ -839,7 +814,7 @@ private StorageInfo CreateStorageInfo()
StorageInfo[] curStorage = s_updating;
try
{
int threadId = GetCurrentThreadId();
int threadId = Thread.CurrentThread.ManagedThreadId;
StorageInfo newInfo = new StorageInfo(Thread.CurrentThread);

// set to updating while potentially resizing/mutating, then we'll
Expand Down